fix(oms):出库单号/预约单生成修改,预约确认生成单号修改

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java

@@ -3,7 +3,6 @@ package com.mhd.system.api;
 import com.mhd.common.core.constant.ServiceNameConstants;
 import com.mhd.common.core.domain.dto.BusinessDataPushDTO;
 import com.mhd.common.core.web.domain.AjaxResult;
-import com.mhd.system.api.domain.BusinessDocumentFeign;
 import com.mhd.system.api.factory.RemoteBmsFeignFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -19,8 +18,7 @@ import java.util.Set;
 /**
  * bms财务结算系统feign调用接口
  */
-// 目标地址由 nacos 配置项 feign.url.mhd-bms-service 指定，未配置时按服务名走服务发现
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface BmsServiceFeign {
 
 
@@ -70,17 +68,4 @@ public interface BmsServiceFeign {
      */
     @PostMapping("/businessDocumentApi/wholeRentSynchronizationZXF")
     public AjaxResult wholeRentSynchronizationZXF(@RequestBody BusinessDataPushDTO businessDataPushDTO);
-
-    @PostMapping("/businessDocumentApi/feignSave")
-    public AjaxResult feignSaveBusinessDocument(@RequestBody BusinessDocumentFeign businessDocumentFeign);
-
-    /**
-     * 根据结算对象id查询结算对象参数列表
-     */
-    @GetMapping("/settlementCustomersParametersApi/getListBySettlementCustomersId")
-    AjaxResult getListBySettlementCustomersId(@RequestParam("settlementCustomersId") Long settlementCustomersId);
-
-    @PostMapping("/settlementCustomersApi/updatePushContractManageJobId")
-    AjaxResult updatePushContractManageJobId(@RequestParam("settlementCustomersId") Long settlementCustomersId,
-                                             @RequestParam("jobId") Integer jobId);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java

@@ -12,13 +12,11 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-// 目标地址由 nacos 配置项 feign.url.mhd-oms-service 指定，未配置时按服务名走服务发现
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017",fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface OmsServiceFeign {
 
 
@@ -30,10 +28,6 @@ public interface OmsServiceFeign {
     @PostMapping(value = "/reservationStockInOrderApi/pushInOrderDetail")
     public AjaxResult pushInOrderDetail(@RequestBody InMaterialDetailTZPD inMaterialDetail);
 
-    @ApiOperation("wms回传入库结果：按入库单号同步入库状态(3-收货中 4-上架中 5-已入库)到OMS入库业务单，type非1为入库")
-    @GetMapping(value = "/executionStockInOrderApi/returnResult")
-    public AjaxResult returnInResult(@RequestParam("orderNumber") String orderNumber, @RequestParam("status") Long status, @RequestParam("type") String type);
-
 
     @ApiOperation("wms推送入库单")
     @PostMapping(value = "/reservationStockOutOrderApi/pushOutOrder")
@@ -72,8 +66,4 @@ public interface OmsServiceFeign {
     @ApiOperation("批量推送")
     @PostMapping("/reservationStockOutOrderApi/batchPushByNumber")
     public AjaxResult batchPushByNumber(@RequestBody List<String> numberList);
-
-    @ApiOperation("保存电子签名记录")
-    @PostMapping("/electronicSignatureApi/saveSignature")
-    public AjaxResult saveSignature(@RequestBody ElectronicSignatureSyncDTO saveDTO);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/SystemServiceFeign.java

@@ -12,8 +12,6 @@ import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.domain.po.SysMultistageDictPo;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.domain.ContainerFeignPO;
-import com.mhd.system.api.domain.ContractManageFeignDTO;
-import com.mhd.system.api.domain.ContractManageParametersFeign;
 import com.mhd.system.api.domain.SysDictData;
 import com.mhd.system.api.factory.RemoteSystemFeignFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
@@ -239,12 +237,6 @@ public interface SystemServiceFeign {
     @GetMapping("/warehouseApi/getInfo/{warehouseId}")
     public AjaxResult getWarehouseInfoByWarehouseId(@PathVariable("warehouseId") Long warehouseId);
 
-    /**
-     * 根据warehouseId获取仓库及下库区及库位树（与前端 warehouseApi/getWarehouseChildren 一致，用于PC上架页默认库位回显）
-     */
-    @GetMapping("/warehouseApi/getWarehouseChildren")
-    public AjaxResult getWarehouseChildren(@RequestParam("warehouseId") Long warehouseId);
-
     /**
      * 根据storageSectionId获取对应库区信息
      */
@@ -392,13 +384,4 @@ public interface SystemServiceFeign {
     public AjaxResult matchForMaterialImport(@RequestParam("keyword") String keyword,
                                             @RequestParam("organizationId") Long organizationId);
 
-
-    @ApiOperation("保存临时合同管理")
-    @PostMapping("/contractManageApi/feignSave")
-    public AjaxResult feignSave(@RequestBody ContractManageFeignDTO contractManageFeignDTO);
-
-    @ApiOperation("Feign保存合约信息规则维护")
-    @PostMapping("/contractManageParametersApi/feignSave")
-    public AjaxResult feignSaveContractParameters(@RequestBody ContractManageParametersFeign contractManageParametersFeign);
-
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java

@@ -165,10 +165,6 @@ public interface UserServiceFeign {
     @GetMapping("/userShipperApi/userShipperListAll")
     public AjaxResult<?> userShipperListAll();
 
-    @ApiOperation("查询租户下全部托运人")
-    @GetMapping("/userShipperApi/userShipperListAllByOrg")
-    public AjaxResult<?> userShipperListAllByOrg(@RequestParam("orgCode") Long orgCode);
-
     @ApiOperation("查询租户下全部承运人")
     @GetMapping("/userDriverApi/userDriverListAll")
     public AjaxResult<?> userDriverListAll();

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java

@@ -26,8 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-// 目标地址由 nacos 配置项 feign.url.mhd-wlhy-service 指定，未配置时按服务名走服务发现
+@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class)
-@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class)
 public interface WlhyServiceFeign {
 
     /**
@@ -536,12 +535,7 @@ public interface WlhyServiceFeign {
      */
     @PostMapping("/feign/order/add")
     public AjaxResult add(@RequestBody TmsOrderAddDTO tmsOrderAddDTO);
-    /**
+
-     * 修改运单(OMS调整业务单后同步修改TMS订单)
-     * @param tmsOrderAddDTO 需携带 TMS 订单 id 定位
-     */
-    @PostMapping("/feign/order/update")
-    public AjaxResult update(@RequestBody TmsOrderAddDTO tmsOrderAddDTO);
     @GetMapping("/feign/order/cancelIssueDocuments")
     public AjaxResult cancelIssueDocuments(@RequestParam(name="executeOrderId") String executeOrderId);
 

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java

@@ -21,8 +21,7 @@ import java.util.Map;
  * @description: TODO
  * @date 2024/5/10 8:58
  **/
-// 目标地址由 nacos 配置项 feign.url.mhd-wms-service 指定，未配置时按服务名走服务发现
+@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
-@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE,url = "http://10.102.192.32:8016",fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface WmsServiceFeign {
 
     /**
@@ -93,15 +92,15 @@ public interface WmsServiceFeign {
 
 
     /**
-     * oms下发单保存（返回执行结果，失败时OMS据此回滚下发标记，避免"OMS已下发/WMS无数据"的阻断）
+     * oms下发单保存
      */
     @ApiOperation("oms下发单保存")
     @PostMapping(value = "/stockInOrderApi/omsInOrderAdd")
-    public AjaxResult omsInOrderAdd(@RequestBody StockInOrder stockInOrder);
+    public void omsInOrderAdd(@RequestBody StockInOrder stockInOrder);
 
     @ApiOperation("oms取消下发单保存")
     @PostMapping(value = "/stockOutOrderApi/cancelExecutionOrder")
-    public AjaxResult omsCancelExecutionOrder(@RequestBody StockOutOrder stockOutOrder);
+    public void omsCancelExecutionOrder(@RequestBody StockOutOrder stockOutOrder);
 
     @ApiOperation("oms取消下发单自动分配")
     @PostMapping(value = "/stockOutOrderApi/omsAutoAssign")
@@ -112,27 +111,11 @@ public interface WmsServiceFeign {
     public AjaxResult execution(@RequestBody com.mhd.system.api.domain.StockOutOrderDTO stockOutOrderDTO);
 
     /**
-     * oms下发前库存校验：可用库存不足时返回错误，OMS据此在推送前拦截下发，
+     * oms下发单明细保存
-     * 避免单据先落库、分配才失败而在WMS残留"已审核"状态的垃圾单
-     */
-    @ApiOperation("oms下发前库存校验")
-    @PostMapping(value = "/stockOutOrderApi/checkOmsAssignInventory")
-    public AjaxResult checkOmsAssignInventory(@RequestBody List<OutMaterialDetail> outMaterialDetails);
-
-    /**
-     * oms下发单明细保存（返回执行结果，明细保存含自动审核链路，失败时OMS据此回滚）
      */
     @ApiOperation("oms下发单明细保存")
     @PostMapping(value = "/stockInOrderApi/omsInOrderAddDetail")
-    public AjaxResult omsInOrderAddDetail(@RequestBody List<InMaterialDetail> inMaterialDetails);
+    public void omsInOrderAddDetail(@RequestBody List<InMaterialDetail> inMaterialDetails);
-
-    /**
-     * oms取消下发入库执行单：WMS侧一个事务内逻辑删除下发链路产生的全部数据
-     * （入库单/明细、收货单/明细、收货任务、收货作业单/明细、质检单），已开始收货则报错拦截
-     */
-    @ApiOperation("oms取消下发入库单清理")
-    @PostMapping(value = "/stockInOrderApi/omsCancelInOrder")
-    public AjaxResult omsCancelInOrder(@RequestBody StockInOrder stockInOrder);
 
     @ApiOperation("oms查询物料列表")
     @GetMapping("/materialBaseInfoApi/queryList")
@@ -158,22 +141,4 @@ public interface WmsServiceFeign {
     @ApiOperation("生成拣货单")
     @PostMapping("/stockOutOrderApi/genPickingOrderByOms")
     public AjaxResult genPickingOrderByOms(@RequestBody com.mhd.system.api.domain.StockOutOrderDTO stockOutOrderDTO);
-
-    /**
-     * OMS批量签名：更新WMS入/出库单签名字段
-     *
-     * <p>OMS端勾选记录批量签名后，通过此Feign调用WMS的 /stockSignatureApi/batchSign 接口，
-     * 同步更新WMS stock_in_order / stock_out_order 表的签名状态、签名时间、签名图片、签名备注。</p>
-     */
-    @ApiOperation("OMS批量签名-同步WMS入/出库单签名字段")
-    @PostMapping("/stockSignatureApi/batchSign")
-    public AjaxResult batchSignWms(@RequestBody SignatureBatchFeignDTO dto);
-
-    /**
-     * OMS查询WMS线路管理列表(按线路编码模糊查,OMS侧自行精确匹配),
-     * 出库导入时校验送貨線號/車次并回填线路名称
-     */
-    @ApiOperation("OMS查询WMS线路管理列表")
-    @GetMapping("/lineManagementApi/listByApp")
-    public AjaxResult listLineManagement(@RequestParam("routeCode") String routeCode);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/XxlJobServiceFeign.java

@@ -1,24 +0,0 @@
-package com.mhd.system.api;
-
-
-import com.mhd.common.core.constant.ServiceNameConstants;
-import com.mhd.common.core.domain.entity.R;
-import com.mhd.common.core.domain.dto.YmsSysUserDTO;
-import com.mhd.system.api.domain.YmsLoginUser;
-import com.mhd.system.api.factory.RemoteBmsFeignFallbackFactory;
-import com.mhd.system.api.factory.RemoteXxlJobFeignFallbackFactory;
-import com.mhd.system.api.feign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-// 目标地址由 nacos 配置项 feign.url.xxl-job-service 指定，未配置时按服务名走服务发现
-@FeignClient(contextId = "XxlJobService", value = ServiceNameConstants.XXL_JOB_SERVICE,url = "http://127.0.0.1:8020",fallbackFactory = RemoteXxlJobFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
-public interface XxlJobServiceFeign {
-
-
-    @GetMapping("/user/openFeignTest")
-    public R<Map<String, Object>> openFeignTest(@RequestParam("param") String string);
-
-}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java

@@ -9,8 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-// 目标地址由 nacos 配置项 feign.url.mhd-yms-service 指定，未配置时按服务名走服务发现
+@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class)
-@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,url = "http://10.102.192.33:8018",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface YmsServiceFeign {
 
     /**

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/BusinessDocumentFeign.java

@@ -1,203 +0,0 @@
-package com.mhd.system.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mhd.common.core.annotation.Excel;
-import com.mhd.common.core.web.domain.BaseVOEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-/**
- * 业务单据对象 business_document
- *
- * @author gen
- * @date 2024-06-21
- */
-
-@Data
-public class BusinessDocumentFeign extends BaseVOEntity{
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("业务单据记录id")
-    @TableId(type = IdType.AUTO)
-    private Long businessDocumentId;
-
-    @ApiModelProperty("一级组织表ID")
-    @Excel(name = "一级组织表ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("组织表ID")
-    @Excel(name = "组织表ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("业务流水")
-    @Excel(name = "业务流水")
-    private String businessFlow;
-
-    @ApiModelProperty("状态（1-未生效，2-已生效，3-已计费，4-已驳回，5-已作废")
-    @Excel(name = "状态", readConverterExp = "状态（1-未生效，2-已生效，3-已计费，4-已驳回，5-已作废")
-    private Integer businessState;
-
-    @ApiModelProperty("来源模块")
-    @Excel(name = "来源模块")
-    private String belongModule;
-
-    @ApiModelProperty("来源模块code")
-    @Excel(name = "来源模块code")
-    private String belongModuleCode;
-
-    @ApiModelProperty("数据来源（1-系统生成，2-手工录入）")
-    @Excel(name = "数据来源", readConverterExp = "1=-系统生成，2-手工录入")
-    private Integer dataSources;
-
-    @ApiModelProperty("单据类型id")
-    @Excel(name = "单据类型id")
-    private Long documentTypeId;
-
-    @ApiModelProperty("单据类型code")
-    @Excel(name = "单据类型code")
-    private String documentTypeCode;
-
-    @ApiModelProperty("单据类型")
-    @Excel(name = "单据类型")
-    private String documentType;
-
-    @ApiModelProperty("原始业务单号")
-    @Excel(name = "原始业务单号")
-    private String originalBusinessNum;
-
-    @ApiModelProperty("项目编码")
-    @Excel(name = "项目编码")
-    private String projectCode;
-
-    @ApiModelProperty("项目名称")
-    @Excel(name = "项目名称")
-    private String projectName;
-
-    @ApiModelProperty("合同编号")
-    @Excel(name = "合同编号")
-    private String contractNumber;
-
-    @ApiModelProperty("合同名称")
-    @Excel(name = "合同名称")
-    private String contractName;
-
-    @ApiModelProperty("账单金额")
-    @Excel(name = "账单金额")
-    private BigDecimal billAmount;
-
-    @ApiModelProperty("预计费金额")
-    @Excel(name = "预计费金额")
-    private BigDecimal estimatedCost;
-
-    @ApiModelProperty("一级费用科目code")
-    @Excel(name = "一级费用科目code")
-    private String firstSubjectCode;
-
-    @ApiModelProperty("一级费用科目（结算项）")
-    @Excel(name = "一级费用科目")
-    private String firstSubjectName;
-
-    @ApiModelProperty("二级费用科目code")
-    @Excel(name = "二级费用科目code")
-    private String secondSubjectCode;
-
-    @ApiModelProperty("二级费用科目（结算项）")
-    @Excel(name = "二级费用科目")
-    private String secondSubjectName;
-
-    @ApiModelProperty("结算对象id")
-    @Excel(name = "结算对象id")
-    private Long settlementCustomersId;
-
-    @ApiModelProperty("结算对象code")
-    @Excel(name = "结算对象code")
-    private String settlementCustomersCode;
-
-    @ApiModelProperty("结算对象")
-    @Excel(name = "结算对象")
-    private String settlementEntity;
-
-    @ApiModelProperty("计费时间")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "计费时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date billingTime;
-
-    @ApiModelProperty("单据表单json数据")
-    @Excel(name = "单据表单json数据")
-    private String documentFormJson;
-
-    @ApiModelProperty("合同管理id")
-    @Excel(name = "合同管理id", readConverterExp = "合同管理id")
-    private Long contractManageId;
-
-    @ApiModelProperty("项目管理id")
-    @Excel(name = "项目管理id", readConverterExp = "项目管理id")
-    private Long projectManageId;
-
-    @ApiModelProperty("原始流水号")
-    @Excel(name = "原始流水号")
-    private String originalSerialNumber;
-
-    @ApiModelProperty("费用类型code（服务项）")
-    @Excel(name = "费用类型code（服务项）")
-    private String serviceItemsCode;
-
-    @ApiModelProperty("费用类型")
-    @Excel(name = "费用类型")
-    private String serviceItemsName;
-
-    @ApiModelProperty("费用类型id（服务项）")
-    @Excel(name = "费用类型id（服务项）")
-    private Long serviceItemsManageId;
-
-    @ApiModelProperty("单据备注")
-    @Excel(name = "单据备注")
-    private String remark;
-
-    @ApiModelProperty("审核备注")
-    @Excel(name = "审核备注")
-    private String reviewRemarks;
-
-    @ApiModelProperty("结算方式(1-现金，2-油卡)")
-    private Integer settlementWay;
-
-    @ApiModelProperty("结算币种")
-    private String settlementCurrency;
-    @ApiModelProperty("业务员ID")
-    private String salesmanId;
-    @ApiModelProperty("业务员名称")
-    private String salesmanName;
-    @ApiModelProperty("税率")
-    private Double taxRate;
-    @ApiModelProperty("收款帐户")
-    private String paymentAccountId;
-    @ApiModelProperty("收款帐户名称")
-    private String paymentAccountName;
-
-    @ApiModelProperty("计费单位")
-    private String billingUnit;
-    @ApiModelProperty("计费单位2")
-    private String billingUnit2;
-    @ApiModelProperty("计费数量")
-    private BigDecimal billingNum;
-    @ApiModelProperty("计费单价")
-    private BigDecimal billingUnitPrice;
-    @ApiModelProperty("nc科目编码")
-    private String ncSubjectCode;
-
-    @ApiModelProperty("是否推送")
-    private Integer isPush;
-
-    @ApiModelProperty("仓库类型")
-    private String warehouseType;
-}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ContractManageDetailFeignDTO.java

@@ -1,110 +0,0 @@
-package com.mhd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mhd.common.core.annotation.Excel;
-import com.mhd.common.core.web.domain.BaseVOEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 合同管理详情对象 contract_manage_detail
- *
- * @author gen
- * @date 2024-06-07
- */
-
-@Data
-public class ContractManageDetailFeignDTO extends BaseVOEntity{
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("合同管理详情id")
-    private Long contractManageDetailId;
-
-    @ApiModelProperty("合同管理id")
-    @Excel(name = "合同管理id")
-    private Long contractManageId;
-
-    @ApiModelProperty("一级组织表ID")
-    @Excel(name = "一级组织表ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("组织表ID")
-    @Excel(name = "组织表ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("结算科目类型（1-通用，2-临时）")
-    @Excel(name = "结算科目类型", readConverterExp = "1=-通用，2-临时")
-    private Integer subjectType;
-
-    @ApiModelProperty("一级费用科目code")
-    @Excel(name = "一级费用科目code")
-    private String firstSubjectCode;
-
-    @ApiModelProperty("一级费用科目")
-    @Excel(name = "一级费用科目")
-    private String firstSubjectName;
-
-    @ApiModelProperty("二级费用科目code")
-    @Excel(name = "二级费用科目code")
-    private String secondSubjectCode;
-
-    @ApiModelProperty("二级费用科目")
-    @Excel(name = "二级费用科目")
-    private String secondSubjectName;
-
-    @ApiModelProperty("计费策略id")
-    @Excel(name = "计费策略id")
-    private Long accountingStrategyId;
-
-    @ApiModelProperty("计费策略")
-    @Excel(name = "计费策略")
-    private String accountingStrategy;
-
-    @ApiModelProperty("计费策略编码")
-    @Excel(name = "计费策略编码")
-    private String accountingStrategyCode;
-
-    @ApiModelProperty("计费周期")
-    @Excel(name = "计费周期")
-    private String billingAttributes;
-
-    @ApiModelProperty("计费周期编码")
-    @Excel(name = "计费周期编码")
-    private String billingAttributesCode;
-
-    @ApiModelProperty("合同有效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "合同有效日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date subjectEffectiveDate;
-
-    @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date subjectExpirationDate;
-
-
-    @ApiModelProperty(name = "组织ID集合")
-    private List<Long> organizationIdList;
-
-    @ApiModelProperty(name = "权限菜单ID")
-    private Long permissionMenuId;
-
-    @ApiModelProperty("单据类型code")
-    private String documentTypeCode;
-
-    @ApiModelProperty("单据类型")
-    private String documentType;
-
-    @ApiModelProperty("费用类别编码")
-    private String serviceItemsCode;
-
-    @ApiModelProperty("费用类别名称")
-    private String serviceItemsName;
-}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ContractManageFeignDTO.java

@@ -1,228 +0,0 @@
-package com.mhd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mhd.common.core.annotation.Excel;
-import com.mhd.common.core.web.domain.BaseVOEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 合同管理对象 contract_manage
- *
- * @author gen
- * @date 2024-06-07
- */
-
-@Data
-public class ContractManageFeignDTO extends BaseVOEntity{
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("合同管理id")
-    private Long contractManageId;
-
-    @ApiModelProperty("一级组织表ID")
-    @Excel(name = "一级组织表ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("组织表ID")
-    @Excel(name = "组织表ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("原始合同编号")
-    @Excel(name = "原始合同编号")
-    private String originalContractNumber;
-
-    @ApiModelProperty("合同编号")
-    @Excel(name = "合同编号")
-    private String contractNumber;
-
-    @ApiModelProperty("合同名称")
-    @Excel(name = "合同名称")
-    private String contractName;
-
-    @ApiModelProperty("是否通用合同（1-是，2-否）")
-    @Excel(name = "是否通用合同", readConverterExp = "1=-是，2-否")
-    private Integer commonContractFlag;
-
-    @ApiModelProperty("合同类型（1-仓储，2-运输，3-其他）")
-    @Excel(name = "合同类型", readConverterExp = "1=-仓储，2-运输，3=-其他")
-    private Integer contractType;
-
-    @ApiModelProperty("合同状态（1-未生效，2-使用中，3-已过期，4-已作废）")
-    @Excel(name = "合同状态", readConverterExp = "1=-未生效，2-使用中，3-已过期，4-已作废")
-    private Integer contractState;
-
-    @ApiModelProperty("签订单位")
-    @Excel(name = "签订单位")
-    private String signingUnit;
-
-    @ApiModelProperty("结算主体")
-    @Excel(name = "结算主体")
-    private String settlementCustomers;
-
-    @ApiModelProperty("结算主体id")
-    @Excel(name = "结算主体id")
-    private Long settlementCustomersId;
-
-    @ApiModelProperty("结算主体code")
-    @Excel(name = "结算主体code")
-    private String settlementCustomersCode;
-
-    @ApiModelProperty("我司身份（1-甲方，2-乙方）")
-    @Excel(name = "我司身份", readConverterExp = "1=-甲方，2-乙方")
-    private Integer ourIdentity;
-
-    @ApiModelProperty("账期（1-每月，2-双月，3-季度）")
-    @Excel(name = "账期", readConverterExp = "1=-每月，2-双月，3-季度")
-    private Integer accountingPeriod;
-
-    @ApiModelProperty("合同签订日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "合同签订日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date signingDate;
-
-    @ApiModelProperty("合同生效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "合同生效日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date effectiveDate;
-
-    @ApiModelProperty("合同到期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "合同到期日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date expirationDate;
-
-    @ApiModelProperty("备注")
-    @Excel(name = "备注")
-    private String remark;
-
-    @ApiModelProperty("合同正本附件地址")
-    @Excel(name = "合同正本附件地址")
-    private String contractOriginalUrl;
-
-    @ApiModelProperty("廉政协议附件地址")
-    @Excel(name = "廉政协议附件地址")
-    private String integrityAgreementUrl;
-
-    @ApiModelProperty("安全协议附件地址")
-    @Excel(name = "安全协议附件地址")
-    private String securityProtocolUrl;
-
-    @ApiModelProperty("其他附件地址")
-    @Excel(name = "其他附件地址")
-    private String otherAttachmentsUrl;
-
-    @ApiModelProperty("合同正本附件原始文件名")
-    private String contractOriginalName;
-
-    @ApiModelProperty("廉政协议附件原始文件名")
-    private String integrityAgreementName;
-
-    @ApiModelProperty("安全协议附件原始文件名")
-    private String securityProtocolName;
-
-    @ApiModelProperty("其他附件原始文件名(多文件时与 otherAttachmentsUrl 同分隔符、同顺序)")
-    private String otherAttachmentsName;
-
-    @ApiModelProperty("我司签订人")
-    @Excel(name = "我司签订人")
-    private String ourSinged;
-
-    @ApiModelProperty("我司签订人联系方式")
-    @Excel(name = "我司签订人联系方式")
-    private String ourSingedPhone;
-
-    @ApiModelProperty("我司经办人")
-    @Excel(name = "我司经办人")
-    private String ourOperator;
-
-    @ApiModelProperty("我司经办人联系方式")
-    @Excel(name = "我司经办人联系方式")
-    private String ourOperatorPhone;
-
-    @ApiModelProperty("对方签订人")
-    @Excel(name = "对方签订人")
-    private String theySinged;
-
-    @ApiModelProperty("对方签订人联系方式")
-    @Excel(name = "对方签订人联系方式")
-    private String theySingedPhone;
-
-    @ApiModelProperty("对方经办人")
-    @Excel(name = "对方经办人")
-    private String theyOperator;
-
-    @ApiModelProperty("对方经办人联系方式")
-    @Excel(name = "对方经办人联系方式")
-    private String theyOperatorPhone;
-
-    @ApiModelProperty(name = "组织ID集合")
-    private List<Long> organizationIdList;
-
-    @ApiModelProperty(name = "权限菜单ID")
-    private Long permissionMenuId;
-
-    @ApiModelProperty(name = "合同科目详情列表")
-    private List<ContractManageDetailFeignDTO> contractManageDetailDTOList;
-
-    @ApiModelProperty("合同管理ids")
-    private String contractManageIds;
-
-    @ApiModelProperty(name = "合同签订查询条件开始日期")
-    private String signingDateStart;
-    @ApiModelProperty(name = "合同签订查询条件结束日期")
-    private String signingDateEnd;
-
-    @ApiModelProperty(name = "合同生效查询条件开始日期")
-    private String effectiveDateStart;
-    @ApiModelProperty(name = "合同生效查询条件结束日期")
-    private String effectiveDateEnd;
-
-    @ApiModelProperty(name = "合同到期查询条件开始日期")
-    private String expirationDateStart;
-    @ApiModelProperty(name = "合同到期查询条件结束日期")
-    private String expirationDateEnd;
-
-    @ApiModelProperty(name = "结算主体基础数据id（可以是用户id也可以是企业id）")
-    private String settlementId;
-
-    @ApiModelProperty(name = "是否自动出账（1-是，2-否）")
-    private Integer automaticFlag;
-
-    @ApiModelProperty("出账日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date paymentDate;
-
-    @ApiModelProperty(name = "出账天数")
-    private Integer billDays;
-
-    @ApiModelProperty(name = "主体类型(1-货主，2-客户，3-承运商)")
-    private Integer principalType;
-
-    @ApiModelProperty("客户类型")
-    private String customerType;
-
-    @ApiModelProperty("客户类型编码")
-    private String customerTypeCode;
-
-    @ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)")
-    private Integer transportationCosts;
-
-    @ApiModelProperty("客户类型")
-    private String contractRentType;
-
-    @ApiModelProperty("客户类型编码")
-    private String contractRentTypeName;
-
-    @ApiModelProperty("仓库温层类型")
-    private String warehouseTempLayerType;
-
-    @ApiModelProperty("仓库温层类型编码")
-    private String warehouseTempLayerTypeName;
-}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ContractManageParametersFeign.java

@@ -1,52 +0,0 @@
-package com.mhd.system.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.mhd.common.core.annotation.Excel;
-import com.mhd.common.core.web.domain.BaseVOEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-
-/**
- * 合约信息规则维护表
- *
- * @author gen
- * @date 2024-06-07
- */
-
-@Data
-public class ContractManageParametersFeign extends BaseVOEntity {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("合同管理id")
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty("合同管理id")
-    private Long contractManageId;
-
-    @ApiModelProperty("一级组织表ID")
-    @Excel(name = "一级组织表ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("组织表ID")
-    @Excel(name = "组织表ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("合同编号")
-    @Excel(name = "合同编号")
-    private String contractNumber;
-
-    @ApiModelProperty("合同名称")
-    @Excel(name = "合同名称")
-    private String contractName;
-
-    @ApiModelProperty("合约信息规则维护")
-    @Excel(name = "合约信息规则维护表")
-    private String parametersJson;
-}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/ElectronicSignatureSyncDTO.java

@@ -1,108 +0,0 @@
-package com.mhd.system.api.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 电子签名同步DTO（WMS端通过Feign调用OMS）
- */
-@Data
-public class ElectronicSignatureSyncDTO {
-
-    @ApiModelProperty("订单ID")
-    private Long orderId;
-
-    @ApiModelProperty("订单号")
-    private String orderNumber;
-
-    @ApiModelProperty("订单类型：IN-入库 OUT-出库")
-    private String orderType;
-
-    @ApiModelProperty("组织ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("一级组织ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("仓库ID")
-    private Long warehouseId;
-
-    @ApiModelProperty("仓库编码")
-    private String warehouseCode;
-
-    @ApiModelProperty("仓库名称")
-    private String warehouseName;
-
-    @ApiModelProperty("创建人")
-    private Long createBy;
-
-    @ApiModelProperty("创建人姓名")
-    private String createByName;
-
-    @ApiModelProperty("物料明细列表")
-    private List<MaterialDetailItem> materialDetailList;
-
-    @Data
-    public static class MaterialDetailItem {
-
-        @ApiModelProperty("物料基础信息ID")
-        private Long materialBaseInfoId;
-
-        @ApiModelProperty("物料编码")
-        private String materialCode;
-
-        @ApiModelProperty("物料名称")
-        private String materialName;
-
-        @ApiModelProperty("数量")
-        private BigDecimal quantity;
-
-        @ApiModelProperty("单位代码")
-        private String unitCode;
-
-        @ApiModelProperty("单位名称")
-        private String unitName;
-
-        @ApiModelProperty("批次号")
-        private String batchNumber;
-
-        @ApiModelProperty("LOT编号")
-        private String lotNumber;
-
-        @ApiModelProperty("仓库ID")
-        private Long warehouseId;
-
-        @ApiModelProperty("仓库编码")
-        private String warehouseCode;
-
-        @ApiModelProperty("仓库名称")
-        private String warehouseName;
-
-        @ApiModelProperty("库区ID")
-        private Long storageSectionId;
-
-        @ApiModelProperty("库区编码")
-        private String storageSectionCode;
-
-        @ApiModelProperty("库区名称")
-        private String storageSectionName;
-
-        @ApiModelProperty("库位ID")
-        private Long storageLocationId;
-
-        @ApiModelProperty("库位编码")
-        private String storageLocationCode;
-
-        @ApiModelProperty("库位名称")
-        private String storageLocationName;
-
-        @ApiModelProperty("业务唯一ID")
-        private Long uniqueId;
-    }
-}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/InMaterialDetail.java

@@ -240,7 +240,9 @@ public class InMaterialDetail extends BaseVOEntity {
     @ApiModelProperty("父级唯一Id")
     private Long parentUniqueId;
 
-
+    @ApiModelProperty("备注")
+    @Excel(name = "备注")
+    private String remark;
 
     @ApiModelProperty("越库单id")
     private Long overStockId;
@@ -374,29 +376,4 @@ public class InMaterialDetail extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date drinkDate;
-
-    @ApiModelProperty("过期日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date expiryDate;
-
-    @ApiModelProperty("来货验收是否合格；1 合格，0 不合格")
-    @Excel(name = "来货验收是否合格；1 合格，0 不合格")
-    private String arrivalAcceptQualified;
-
-    @ApiModelProperty("包装是否破损；1 破损，0 完好")
-    @Excel(name = "包装是否破损；1 破损，0 完好")
-    private String packageDamaged;
-
-    @ApiModelProperty("是否解冻 / 水渍；1 是，0 否")
-    @Excel(name = "是否解冻 / 水渍；1 是，0 否")
-    private String isThawWaterstain;
-
-    @ApiModelProperty("问题货是否已通知客户；1 已通知，0 未通知")
-    @Excel(name = "问题货是否已通知客户；1 已通知，0 未通知")
-    private String notifyCustomerAbnormal;
-
-    @ApiModelProperty("备注")
-    @Excel(name = "备注")
-    private String remark;
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java

@@ -244,26 +244,4 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{
 
     @ApiModelProperty(name = "单位")
     private String unit;
-
-    @ApiModelProperty(name = "组织(多个用,分开)")
-    private String orgId;
-
-    @ApiModelProperty(name = "是否正常物料: 0-是 1-否")
-    private Integer isNormalMaterial;
-
-    @ApiModelProperty("每月仓租")
-    @Excel(name = "每月仓租")
-    private BigDecimal monthlyWarehouseRent;
-
-    @ApiModelProperty("半月仓租")
-    @Excel(name = "半月仓租")
-    private BigDecimal halfMonthWarehouseRent;
-
-    @ApiModelProperty("每月仓租单位")
-    @Excel(name = "每月仓租单位")
-    private String monthlyWarehouseRentUnit;
-
-    @ApiModelProperty("半月仓租单位")
-    @Excel(name = "半月仓租单位")
-    private String halfMonthWarehouseRentUnit;
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInventoryOmsParamDO.java

@@ -83,8 +83,6 @@ public class MaterialInventoryOmsParamDO extends BaseVOEntity {
     private Date productionDate;
     //过期日期
     private Date expiryDate;
-    //进货日期
-    private Date purchaseDate;
 
     private String executioOrderNumber;
 

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/SignatureBatchFeignDTO.java

@@ -1,42 +0,0 @@
-package com.mhd.system.api.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * OMS→WMS 批量签名 Feign DTO
- * 
- * <p>OMS端批量签名时，通过此DTO调用WMS的批量签名接口，
- * 更新WMS stock_in_order / stock_out_order 表的签名字段。</p>
- */
-@Data
-public class SignatureBatchFeignDTO {
-
-    @ApiModelProperty("入库单ID列表")
-    private List<Long> inOrderIds;
-
-    @ApiModelProperty("出库单ID列表")
-    private List<Long> outOrderIds;
-
-    @ApiModelProperty("签名状态：2-已签名")
-    private Integer signatureStatus;
-
-    @ApiModelProperty("签名时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date signatureTime;
-
-    @ApiModelProperty("手写签名图片（base64或URL，单张）")
-    private String signaturePic;
-
-    @ApiModelProperty("拍照取证图片（逗号分隔多张URL）")
-    private String evidencePics;
-
-    @ApiModelProperty("签名备注")
-    private String signatureRemark;
-}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java

@@ -50,8 +50,8 @@ public class StockOutOrder extends BaseVOEntity {
     @Excel(name = "出库单号")
     private String outOrderNumber;
 
-    @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接")
+    @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
-    @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接")
+    @Excel(name = "出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核")
     private Integer status;
 
     @ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
@@ -405,13 +405,4 @@ public class StockOutOrder extends BaseVOEntity {
     @Excel(name = "车次")
     private Integer trainNo;
 
-    @ApiModelProperty("线路编码(取自WMS线路管理)")
-    private String lineCode;
-
-    @ApiModelProperty("线路名称(冗余存储)")
-    private String lineName;
-
-    @ApiModelProperty("车次序号(显示: 线路编码-车次, 如31-4)")
-    private String shuttleNo;
-
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseFeignPO.java

@@ -124,20 +124,4 @@ public class WarehouseFeignPO extends BaseVOEntity{
     @Excel(name = "作业模式")
     private String workMode;
 
-    @ApiModelProperty("订单号生成规则(0-日期累加 1-历史累加)")
-    @Excel(name = "单号生成规则")
-    private String orderNoGenerateRule;
-
-    @ApiModelProperty("入库单号首字母前缀")
-    @Excel(name = "入库单号首字母前缀")
-    private String inOrderNoPrefix;
-
-    @ApiModelProperty("出库单号首字母前缀")
-    @Excel(name = "出库单号首字母前缀")
-    private String outOrderNoPrefix;
-
-    @ApiModelProperty("样品出库单号首字母前缀")
-    @Excel(name = "样品出库单号首字母前缀")
-    private String sampleOutOrderNoPrefix;
-
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/WarehouseLinkageFeignPO.java

@@ -1,30 +0,0 @@
-package com.mhd.system.api.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 仓库联动树节点（Feign侧）
- * 镜像system端WarehouseLinkagePO/StorageSectionLinkagePO/StorageLocationLinkagePO三级结构：仓库→库区→库位
- *
- * @author rcx
- * @date 2026-08-22
- */
-@Data
-public class WarehouseLinkageFeignPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 仓库id / 库区id(storageSectionId) / 库位id(storageLocationId) */
-    private Long id;
-
-    /** warehouseCode / storageCode / storageLocationCode */
-    private String code;
-
-    /** warehouseName / storageName / storageLocationName */
-    private String name;
-
-    /** 下级节点：仓库下为库区列表，库区下为库位列表，库位无children */
-    private List<WarehouseLinkageFeignPO> children;
-}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteBmsFeignFallbackFactory.java

@@ -6,7 +6,6 @@ import com.mhd.common.core.domain.po.OrganizationPo;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.BmsServiceFeign;
 import com.mhd.system.api.ProductServiceFeign;
-import com.mhd.system.api.domain.BusinessDocumentFeign;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -67,21 +66,6 @@ public class RemoteBmsFeignFallbackFactory implements FallbackFactory<BmsService
             public AjaxResult wholeRentSynchronizationZXF(BusinessDataPushDTO businessDataPushDTO) {
                 return null;
             }
-
-            @Override
-            public AjaxResult feignSaveBusinessDocument(BusinessDocumentFeign businessDocumentFeign) {
-                return AjaxResult.error("保存业务单据失败");
-            }
-
-            @Override
-            public AjaxResult getListBySettlementCustomersId(Long settlementCustomersId) {
-                return AjaxResult.error(throwable.getMessage());
-            }
-
-            @Override
-            public AjaxResult updatePushContractManageJobId(Long settlementCustomersId, Integer jobId) {
-                return AjaxResult.error(throwable.getMessage());
-            }
         };
     }
-}
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java

@@ -41,11 +41,6 @@ public class RemoteOmsFeignFallbackFactory implements FallbackFactory<OmsService
                 return null;
             }
 
-            @Override
-            public AjaxResult returnInResult(String orderNumber, Long status, String type) {
-                return null;
-            }
-
             @Override
             public AjaxResult pushOutOrder(StockOutOrderTZPD stockOutOrder) {
                 return null;
@@ -95,11 +90,6 @@ public class RemoteOmsFeignFallbackFactory implements FallbackFactory<OmsService
             public AjaxResult batchPushByNumber(List<String> numberList) {
                 return null;
             }
-
-            @Override
-            public AjaxResult saveSignature(ElectronicSignatureSyncDTO saveDTO) {
-                return null;
-            }
         };
     }
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteSystemFeignFallbackFactory.java

@@ -13,8 +13,6 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.AssociationWarehouseFeign;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.domain.ContainerFeignPO;
-import com.mhd.system.api.domain.ContractManageFeignDTO;
-import com.mhd.system.api.domain.ContractManageParametersFeign;
 import com.mhd.system.api.domain.SysDictData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +20,6 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -187,11 +184,6 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
                 return AjaxResult.error("根据仓库ID获取仓库信息失败");
             }
 
-            @Override
-            public AjaxResult getWarehouseChildren(@RequestParam("warehouseId") Long warehouseId) {
-                return AjaxResult.error("根据仓库ID获取仓库及下库区及库位树失败");
-            }
-
             @Override
             public AjaxResult getStorageSectionInfoByStorageSectionId(@PathVariable("storageSectionId") Long storageSectionId) {
                 return AjaxResult.error("根据库区ID获取库区信息失败");
@@ -320,16 +312,6 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory<SystemS
             public AjaxResult matchForMaterialImport(String keyword, Long organizationId) {
                 return AjaxResult.error("物料分类匹配失败");
             }
-
-            @Override
-            public AjaxResult feignSave(ContractManageFeignDTO contractManageFeignDTO) {
-                return AjaxResult.error("新增合同失败");
-            }
-
-            @Override
-            public AjaxResult feignSaveContractParameters(ContractManageParametersFeign contractManageParametersFeign) {
-                return AjaxResult.error("保存合同参数失败");
-            }
         };
     }
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java

@@ -140,11 +140,6 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
                 return AjaxResult.error("获取租户托运人失败");
             }
 
-            @Override
-            public AjaxResult<?> userShipperListAllByOrg(Long orgCode) {
-                return null;
-            }
-
             @Override
             public AjaxResult<?> userDriverListAll() {
                 return AjaxResult.error("获取租户承运人失败");

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java

@@ -546,11 +546,6 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
                 return AjaxResult.error(cause.getMessage());
             }
 
-            @Override
-            public AjaxResult update(TmsOrderAddDTO tmsOrderAddDTO) {
-                return AjaxResult.error(cause.getMessage());
-            }
-
             @Override
             public AjaxResult cancelIssueDocuments(String executeOrderId) {
                 return AjaxResult.error(cause.getMessage());

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java

@@ -70,16 +70,12 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
             }
 
             @Override
-            public AjaxResult omsInOrderAdd(StockInOrder stockInOrder) {
+            public void omsInOrderAdd(StockInOrder stockInOrder) {
-                //返回错误而非静默成功：下发主单保存失败必须让OMS感知并回滚下发标记，
-                //否则OMS显示已下发、WMS无数据，下游收货流程无从进行（流程阻断）
-                return AjaxResult.error("WMS入库单保存失败（服务降级）：" + cause.getMessage());
             }
 
             @Override
-            public AjaxResult omsCancelExecutionOrder(StockOutOrder stockOutOrder) {
+            public void omsCancelExecutionOrder(StockOutOrder stockOutOrder) {
-                //返回错误而非静默成功，让OMS侧补偿清理能感知失败并记录告警
+
-                return AjaxResult.error("WMS取消下发清理失败：" + cause.getMessage());
             }
 
             @Override
@@ -93,21 +89,7 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
             }
 
             @Override
-            public AjaxResult checkOmsAssignInventory(List<OutMaterialDetail> outMaterialDetails) {
+            public void omsInOrderAddDetail(List<InMaterialDetail> inMaterialDetails) {
-                //校验接口本身不可用时返回错误，OMS会阻止下发（不能在WMS状态未知时盲目推送）
-                return AjaxResult.error("WMS库存校验服务不可用：" + cause.getMessage());
-            }
-
-            @Override
-            public AjaxResult omsInOrderAddDetail(List<InMaterialDetail> inMaterialDetails) {
-                //返回错误而非静默成功：明细保存（含自动审核）失败必须让OMS感知并回滚下发标记
-                return AjaxResult.error("WMS入库单明细保存失败（服务降级）：" + cause.getMessage());
-            }
-
-            @Override
-            public AjaxResult omsCancelInOrder(StockInOrder stockInOrder) {
-                //返回错误而非静默成功，让OMS侧取消下发能感知清理失败并整体回滚（取消下发可重试，WMS清理幂等）
-                return AjaxResult.error("WMS取消下发清理失败：" + cause.getMessage());
             }
 
             @Override
@@ -137,18 +119,6 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
             public AjaxResult genPickingOrderByOms(StockOutOrderDTO stockOutOrderDTO) {
                 return null;
             }
-
-            @Override
-            public AjaxResult batchSignWms(SignatureBatchFeignDTO dto) {
-                log.error("WMS批量签名调用失败");
-                return AjaxResult.error("WMS批量签名调用失败：" + cause.getMessage());
-            }
-
-            @Override
-            public AjaxResult listLineManagement(String routeCode) {
-                log.error("OMS查询WMS线路管理失败, routeCode:{}", routeCode);
-                return AjaxResult.error("WMS线路管理查询失败：" + cause.getMessage());
-            }
         };
     }
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteXxlJobFeignFallbackFactory.java

@@ -1,44 +0,0 @@
-package com.mhd.system.api.factory;
-
-import com.mhd.common.core.domain.dto.BusinessDataPushDTO;
-import com.mhd.common.core.domain.entity.R;
-import com.mhd.common.core.domain.po.OrganizationPo;
-import com.mhd.common.core.web.domain.AjaxResult;
-import com.mhd.system.api.BmsServiceFeign;
-import com.mhd.system.api.ProductServiceFeign;
-import com.mhd.system.api.XxlJobServiceFeign;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-
-/**
- * @Description
- * @Author zg
- * @Version 1.0
- * @Date 2023/11/3 14:37
- */
-@Component
-public class RemoteXxlJobFeignFallbackFactory implements FallbackFactory<XxlJobServiceFeign> {
-
-    private static final Logger log = LoggerFactory.getLogger(RemoteXxlJobFeignFallbackFactory.class);
-
-    @Override
-    public XxlJobServiceFeign create(Throwable throwable) {
-        log.error("系统服务调用失败:{}", throwable.getMessage());
-        return new XxlJobServiceFeign() {
-
-            @Override
-            public R<Map<String, Object>> openFeignTest(String string) {
-                return null;
-            }
-        };
-    }
-}

mhd-auth/src/main/java/com/mhd/auth/app/application/service/TokenLoginApplicationService.java

@@ -130,11 +130,9 @@ public class TokenLoginApplicationService {
             //验证码登录校验验证码
             String key = CacheConstants.SMS_LOGIN + userPhone;
             Object object = redisService.getCacheObject(key) == null ? "":redisService.getCacheObject(key);
-            if (loginDTO.getWechatFlag() != 1) {
+            if(!ObjectUtil.equal(String.valueOf(object),verificationCode) && !ObjectUtil.equal(verificationCode, SmsConstants.universalCode)){
-//                if (!ObjectUtil.equal(String.valueOf(object), verificationCode) && !ObjectUtil.equal(verificationCode, SmsConstants.universalCode)) {
+                recordLogininfor(userPhone, Constants.LOGIN_FAIL, "验证码错误", 1);
-//                    recordLogininfor(userPhone, Constants.LOGIN_FAIL, "验证码错误", 1);
+                throw new ServiceException("验证码错误");
-                    throw new ServiceException("验证码错误");
-//                }
             }
 
             //获取包名对应的业务(存在需要查询业务，不存在保存为无业务模式)
@@ -170,13 +168,7 @@ public class TokenLoginApplicationService {
                 throw new ServiceException("对不起，您的账号：" + userPhone + " 已停用");
             }
             //校验验证码是否正确
-            if (loginDTO.getWechatFlag() != 1) {
+            sysPasswordService.validate(userPo, verificationCode, 1, null);
-//                if (!ObjectUtil.equal(String.valueOf(object), verificationCode) && !ObjectUtil.equal(verificationCode, SmsConstants.universalCode)) {
-//                    recordLogininfor(userPhone, Constants.LOGIN_FAIL, "验证码错误", 1);
-                throw new ServiceException("验证码错误");
-//                }
-            }
-//            sysPasswordService.validate(userPo, verificationCode, 1, null);
         }
         return userInfo;
     }
@@ -187,67 +179,34 @@ public class TokenLoginApplicationService {
     }
 
     /**
-     * App注册（手机号 + 注册短信验证码 + 密码）
+     * 注册
      */
-    public void register(LoginDTO loginDTO) {
+    public void register(String username, String password) {
-        String userPhone = loginDTO.getUserPhone();          // LoginDTO.java:27-28
+        // 用户名或密码为空 错误
-        String verificationCode = loginDTO.getVerificationCode(); // LoginDTO.java:30-31
+        if (StringUtils.isAnyBlank(username, password)) {
-        String password = loginDTO.getPassword();
+            throw new ServiceException("用户/密码必须填写");
-
-        // 1. 基础校验
-        if (StringUtils.isAnyBlank(userPhone, verificationCode, password)) {
-            throw new ServiceException("手机号、验证码、密码必须填写");
         }
-        if (!RegexUtil.isPhoneLegal(userPhone)) {
+        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-            throw new DigitalLogisticsException(UserError.USER_PHONE_REG_ERROR);
+                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
+            throw new ServiceException("账户长度必须在2到20个字符之间");
+        }
+        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
+                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
+            throw new ServiceException("密码长度必须在5到20个字符之间");
         }
 
-        // 2. 校验注册短信验证码（发送时写入 redis，见 SmsApplicationService.java:112, :165）
+        // 注册用户信息
-        String key = CacheConstants.SMS_REGISTER + userPhone;   // "sms_register:" CacheConstants.java:51
+        SysUser sysUser = new SysUser();
-        Object cache = redisService.getCacheObject(key);
+        sysUser.setUserName(username);
-        if (cache == null || !ObjectUtil.equal(String.valueOf(cache), verificationCode)) {
+        sysUser.setNickName(username);
-            recordLogininfor(userPhone, Constants.LOGIN_FAIL, "注册验证码错误", 1);
+        sysUser.setPassword(SecurityUtils.encryptPassword(password));
-            throw new ServiceException("验证码错误或已过期");
+        //TODO app注册没写
-        }
+        /*R<?> registerResult = userServiceFeign.registerUserInfo(sysUser, SecurityConstants.INNER);
 
-        // 3. 域名 → 一级组织（与 loginByVerificationCode :103-110 一致）
-        String path = loginDTO.getPath();
-        AjaxResult topOrganizationIdR = organizationServiceFeign.getOrganizationByPath(path);
-        if (ObjectUtil.isNull(topOrganizationIdR) || ObjectUtil.isNull(topOrganizationIdR.get("data"))) {
-            throw new ServiceException("组织不存在，请检查登录域名");
-        }
-        SysTenantsPo sysTenantsPo = JSON.parseObject(JSON.toJSONString(topOrganizationIdR.get("data")), SysTenantsPo.class);
-        Long topOrganizationId = sysTenantsPo.getOrganizationId();
-        Long selectedOrgId = loginDTO.getOrganizationId();      // LoginDTO.java:37-38，App 选择组织时传
-        Long organizationId = (selectedOrgId != null) ? selectedOrgId : topOrganizationId;
-
-        // 4. 手机号已注册则直接提示（UserMapper.xml:199 按 user_phone+top_organization_id 查）
-        UserDTO query = new UserDTO();
-        query.setUserPhone(userPhone);
-        query.setTopOrganizationId(topOrganizationId);
-        R<LoginUser> exist = userServiceFeign.getUserByTopOrganizationUserPhone(query, SecurityConstants.INNER);
-        if (exist != null && exist.getData() != null && exist.getData().getUserPo() != null) {
-            throw new ServiceException("该手机号已注册，请直接登录");
-        }
-
-        // 5. 创建用户（复用验证码登录自动注册的同一链路：
-        //    auth feign UserServiceFeign.java:47-48 → user-center UserAPI.java:332-336
-        //    → UserApplicationService.registerAddUser:1820-1927，内部已处理默认角色/YMS同步）
-        UserDTO userDTO = new UserDTO();
-        userDTO.setUserPhone(userPhone);
-        userDTO.setUserPassword(SecurityUtils.encryptPassword(password));
-        userDTO.setTopOrganizationId(topOrganizationId);
-        userDTO.setOrganizationId(organizationId);
-        userDTO.setOrganizationName(StringUtils.isNotBlank(loginDTO.getOrganizationName())
-                ? loginDTO.getOrganizationName() : sysTenantsPo.getOrganizationName());
-        R<LoginUser> registerResult = userServiceFeign.registerAddUser(userDTO, SecurityConstants.INNER);
         if (R.FAIL == registerResult.getCode()) {
             throw new ServiceException(registerResult.getMsg());
-        }
+        }*/
-
+//        recordLogininfor(username, Constants.REGISTER, "注册成功");
-        // 6. 注册成功后清掉验证码并记日志
-        redisService.deleteObject(key);
-        recordLogininfor(userPhone, Constants.REGISTER, "注册成功", 2);
     }
 
     /**

mhd-auth/src/main/java/com/mhd/auth/app/interfaces/dto/LoginDTO.java

@@ -40,7 +40,4 @@ public class LoginDTO {
     @ApiModelProperty(name = "组织名称（司机选择组织时传入）")
     private String organizationName;
 
-    @ApiModelProperty(name = "微信标识")
-    private Integer wechatFlag;
-
 }

mhd-auth/src/main/java/com/mhd/auth/app/interfaces/facade/AppTokenController.java

@@ -72,9 +72,9 @@ public class AppTokenController extends BaseController {
 
     @PostMapping("register")
     public R<?> register(@RequestBody LoginDTO loginDTO) {
-        // 用户注册（手机号+短信验证码+密码）
+        // 用户注册
-        tokenLoginApplicationService.register(loginDTO);
+        tokenLoginApplicationService.register(loginDTO.getUsername(), loginDTO.getPassword());
-        return R.ok("注册成功");
+        return R.ok();
     }
 
     /**

mhd-auth/src/main/java/com/mhd/auth/system/controller/SsoAuthorizeController.java

@@ -79,7 +79,6 @@ public class SsoAuthorizeController {
             // 5. 重定向到前端页面，token通过URL参数传递
             //    前端页面需读取URL中的token参数并存入localStorage
             log.info("SSO单点登录成功, account={}", account);
-            log.info("SSO单点登录成功, account={}, token={} , redirectUrl={}", account, accessToken, redirectUrl);
             response.sendRedirect(redirectUrl + "?token=" + URLEncoder.encode(accessToken, StandardCharsets.UTF_8.name()));
 
         } catch (Exception e) {

mhd-auth/src/main/java/com/mhd/auth/system/service/SsoAuthorizeService.java

@@ -50,7 +50,7 @@ public class SsoAuthorizeService {
     @Value("${sso.public-key}")
     private String publicKeyStr;
 
-    @Value("${sso.redirect-url}")
+    @Value("https://diglog.namkwong.com.mo/main_app/sso")
     private String redirectUrl;
 
     @Resource

mhd-auth/src/main/java/com/mhd/auth/system/service/SysLoginService.java

@@ -550,11 +550,11 @@ public class SysLoginService {
             throw new ServiceException("请输入手机号和短信验证码");
         }
 
-//        //调用工具类校验，校验手机号格式错误
+        //调用工具类校验，校验手机号格式错误
-//        if (!RegexUtil.isPhoneLegal(userPhone)) {
+        if (!RegexUtil.isPhoneLegal(userPhone)) {
-//            recordLogininfor(userPhone, Constants.LOGIN_FAIL, UserError.USER_PHONE_REG_ERROR.errmsg(), 1);
+            recordLogininfor(userPhone, Constants.LOGIN_FAIL, UserError.USER_PHONE_REG_ERROR.errmsg(), 1);
-//            throw new DigitalLogisticsException(UserError.USER_PHONE_REG_ERROR);
+            throw new DigitalLogisticsException(UserError.USER_PHONE_REG_ERROR);
-//        }
+        }
 
         //根据域名获取一级组织ID
         AjaxResult topOrganizationIdR = organizationServiceFeign.getOrganizationByPath(path, SecurityConstants.INNER);

mhd-auth/src/main/java/com/mhd/auth/system/service/SysPasswordService.java

@@ -28,7 +28,6 @@ import com.mhd.common.redis.service.RedisService;
 import com.mhd.common.security.utils.password.PasswordUtil;
 import com.mhd.system.api.RemoteLogService;
 import com.mhd.system.api.domain.SysLogininforPo;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -40,7 +39,6 @@ import javax.annotation.Resource;
  * @description: 登录密码方法
  * @date 2023/12/26 15:33
  **/
-@Slf4j
 @Component
 public class SysPasswordService
 {
@@ -78,31 +76,29 @@ public class SysPasswordService
         if (retryCount == null) {
             retryCount = 0;
         }
-        //TODO 从三方配置表中取值（失败时用默认值，保证登录错误提示可用）
+        //TODO 从三方配置表中取值
-        int maxRetryCount = 5;     // 默认：密码错5次锁定
+        SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO = new SysDepartInterfaceInfoDTO();
-        long lockTime = 30L;       // 默认：锁定30分钟
+        sysDepartInterfaceInfoDTO.setTopOrganizationId(userPo.getTopOrganizationId());
-        try {
+        sysDepartInterfaceInfoDTO.setInterfaceType("login");
-            SysDepartInterfaceInfoDTO dto = new SysDepartInterfaceInfoDTO();
+        sysDepartInterfaceInfoDTO.setInterfaceTypeKey("maxRetryCount");
-            dto.setTopOrganizationId(userPo.getTopOrganizationId());
+        List<SysDepartInterfaceInfoPo> sysDepartInterfaceInfoPos = thirdPartyServiceFeign.queryListByFeign(sysDepartInterfaceInfoDTO);
-            dto.setInterfaceType("login");
+        if (sysDepartInterfaceInfoPos.isEmpty()){
-            dto.setInterfaceTypeKey("maxRetryCount");
+            String errMsg = "缺少登录信息配置，请联系管理员";
-            List<SysDepartInterfaceInfoPo> pos = thirdPartyServiceFeign.queryListByFeign(dto);
+            recordLogininfor(userPo, Constants.LOGIN_FAIL, errMsg, 1);
-            if (pos != null && !pos.isEmpty()) {
+            throw new ServiceException(errMsg);
-                maxRetryCount = Integer.parseInt(pos.get(0).getInterfaceTypeValue());
-            } else {
-                log.warn("组织[{}]缺少登录配置 login/maxRetryCount，使用默认值{}", userPo.getTopOrganizationId(), maxRetryCount);
-            }
-            dto.setInterfaceTypeKey("lockTime");
-            pos = thirdPartyServiceFeign.queryListByFeign(dto);
-            if (pos != null && !pos.isEmpty()) {
-                lockTime = Long.parseLong(pos.get(0).getInterfaceTypeValue());
-            } else {
-                log.warn("组织[{}]缺少登录配置 login/lockTime，使用默认值{}", userPo.getTopOrganizationId(), lockTime);
-            }
-        } catch (Exception e) {
-            log.warn("读取登录配置失败，使用默认重试策略", e);
         }
-        if (retryCount >= maxRetryCount) {
+        SysDepartInterfaceInfoPo sysDepartInterfaceInfoPo = sysDepartInterfaceInfoPos.get(0);
+        Integer maxRetryCount = Integer.valueOf(sysDepartInterfaceInfoPo.getInterfaceTypeValue());
+        sysDepartInterfaceInfoDTO.setInterfaceTypeKey("lockTime");
+        sysDepartInterfaceInfoPos = thirdPartyServiceFeign.queryListByFeign(sysDepartInterfaceInfoDTO);
+        if (sysDepartInterfaceInfoPos.isEmpty()){
+            String errMsg = "缺少登录信息配置，请联系管理员";
+            recordLogininfor(userPo, Constants.LOGIN_FAIL, errMsg, 1);
+            throw new ServiceException(errMsg);
+        }
+        sysDepartInterfaceInfoPo = sysDepartInterfaceInfoPos.get(0);
+        Long lockTime = Long.valueOf(sysDepartInterfaceInfoPo.getInterfaceTypeValue());
+        if (retryCount >= maxRetryCount){
             String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime);
             recordLogininfor(userPo, Constants.LOGIN_FAIL, errMsg, 1);
             throw new ServiceException(errMsg);

mhd-auth/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
-        server-addr: 10.102.192.31:6848
+        server-addr: 10.102.192.30:6848
         username: nacos
         password: manhuoda@2023
         #线上正式环境
@@ -24,7 +24,7 @@ spring:
 #        password: manhuoda@2023
       config:
 #        server-addr: 127.0.0.1:8848
-        server-addr: 10.102.192.31:6848
+        server-addr: 10.102.192.30:6848
         # 测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
         # 线上测试环境配置 容器名+端口号
@@ -52,4 +52,4 @@ sso:
     AwIDAQAB
     -----END PUBLIC KEY-----
   # SSO登录成功后跳转的前端页面地址
-  redirect-url: "https://diglog.namkwong.com.mo/main_app/sso"
+  redirect-url: "/"

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/mapper/BiPlatformRealDataMapper.java

@@ -1,58 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.mapper;
-
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealBusinessTypeStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformFloorStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealOnTimeStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskTypeStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealMonthlyTaskDurationPO;
-
-import java.util.List;
-
-/**
- * 月台监测-真实数据 Mapper
- * 数据来源：TEST_NGWL_YMS 库（达梦，跨库访问）
- * 注：列名按达梦默认大写规则；若实际库中小写请反馈调整
- */
-public interface BiPlatformRealDataMapper {
-
-    /** 作业车辆状态列表 */
-    List<RealPlatformVehiclePO> queryVehicles();
-
-    /** 月台实时概览（总数 / 当前作业中） */
-    RealPlatformOverviewPO queryPlatformOverview();
-
-    /** 今日作业任务数 */
-    Long countTodayTasks();
-
-    /** 车辆状态统计（今日） */
-    RealVehicleStatusPO queryVehicleStatusToday();
-
-    /** 本月任务量 */
-    Long countMonthTasks();
-
-    /** 本月任务平均时长 / 完成率统计 */
-    RealMonthlyTaskDurationPO queryMonthTaskStats();
-
-    /** 任务负荷（今日 24 小时） */
-    List<RealTaskLoadPO> queryTaskLoadToday();
-
-    /** 今日预约-业务类型统计（按 businessName 分组统计今日预约数量） */
-    List<RealBusinessTypeStatPO> queryTodayBusinessTypeStats();
-
-    /** 今日作业准时率统计（total 今日预约总数；onTimeCount 今日准时车辆数） */
-    RealOnTimeStatPO queryTodayOnTimeStats();
-
-    /** 任务类型统计（本月 YMS QMS_MAIN_BUSINESS 预约按业务类型 BUSINESS_NAME 分组） */
-    List<RealTaskTypeStatPO> queryMonthTransportOrderByType();
-
-    /** 月台监控-按楼层统计月台车辆（楼层、月台数量、今日预约车辆、当前作业车辆） */
-    List<RealPlatformFloorStatPO> queryPlatformFloorStats();
-
-    /** 月台管理列表（YMS qms_window_info，含机构/鹤位/状态/楼层/UUID 等完整信息） */
-    List<RealPlatformInfoPO> queryPlatformInfoList();
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealBusinessTypeStatPO.java

@@ -1,20 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 今日预约-业务类型统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
- * 按业务类型分组统计今日预约数量
- */
-@Data
-public class RealBusinessTypeStatPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 业务类型名称（qms_main_business.businessName） */
-    private String businessName;
-
-    /** 今日预约数量 */
-    private Long count;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealMonthlyTaskDurationPO.java

@@ -1,29 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 本月任务平均时长 / 完成率统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
- * avgDurationHours：累计 (EXIT_TIME - ENTRY_TIME) 小时数（仅 ENTRY_TIME/EXIT_TIME 都不为空时参与）
- * durationCount：参与平均时长统计的有效条数
- * completedCount：已出场（EXIT_TIME IS NOT NULL）且预约日期在本月的数量
- * totalCount：本月（TARGET_DATE）预约总数量
- */
-@Data
-public class RealMonthlyTaskDurationPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 平均作业时长（小时） */
-    private Double avgDurationHours;
-
-    /** 参与平均时长统计的有效条数 */
-    private Long durationCount;
-
-    /** 本月已出场数量 */
-    private Long completedCount;
-
-    /** 本月预约总数量（按 TARGET_DATE 统计） */
-    private Long totalCount;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealOnTimeStatPO.java

@@ -1,20 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 今日作业准时率统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
- * 准时率 = 今日实际进场时间在预约日期当天的车辆数 / 今日预约总车辆数 × 100%
- */
-@Data
-public class RealOnTimeStatPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 今日预约总车辆数 */
-    private Long total;
-
-    /** 今日准时车辆数（已进场且实际进场日期 = 预约日期） */
-    private Long onTimeCount;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformFloorStatPO.java

@@ -1,26 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 月台监控-月台车辆统计（按楼层分组）
- * 数据来源：TEST_NGWL_YMS.QMS_WINDOW_INFO（楼层+月台）与 QMS_MAIN_BUSINESS（当日预约/作业）
- */
-@Data
-public class RealPlatformFloorStatPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 楼层（从叫号月台 WINDOW_NAME 解析，如 S1-01 -> F1） */
-    private String floorNo;
-
-    /** 该楼层的月台数量 */
-    private Long platformCount;
-
-    /** 今日预约车辆数（按 WINDOW_NAME 关联楼层） */
-    private Long todayReservedVehicles;
-
-    /** 当前作业车辆数（FLOW_STATUS IN 5,6,7,8,9,10） */
-    private Long operatingVehicles;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformInfoPO.java

@@ -1,59 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 月台管理列表（真实数据，来自 TEST_NGWL_YMS.QMS_WINDOW_INFO）
- * 对应 YMS qms_window_info 月台/鹤位窗口表
- */
-@Data
-public class RealPlatformInfoPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 主键 */
-    private Long id;
-
-    /** 机构代码（org_no） */
-    private String orgNo;
-
-    /** 机构名称（dept_name） */
-    private String deptName;
-
-    /** 鹤位号/月台号（window_number） */
-    private String windowNumber;
-
-    /** 鹤位名称/月台名称（window_name） */
-    private String windowName;
-
-    /** 优先级别（priority_set） */
-    private String prioritySet;
-
-    /** 鹤位状态/月台状态（running_status） */
-    private String runningStatus;
-
-    /** uuid */
-    private String uuid;
-
-    /** 鹤位屏名字集合/绑定月台屏（berr_names） */
-    private String berrNames;
-
-    /** 最新业务状态（new_flow_status） */
-    private String newFlowStatus;
-
-    /** 月台图片（guide_images） */
-    private String guideImages;
-
-    /** 月台楼层（platform_floor） */
-    private String platformFloor;
-
-    /** 作业状态 0-空闲 1-占用（job_status） */
-    private Integer jobStatus;
-
-    /** 创建人（create_by） */
-    private String createBy;
-
-    /** 创建时间（create_time） */
-    private String createTime;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformOverviewPO.java

@@ -1,18 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-import java.io.Serializable;
-
-/**
- * 月台实时概览（真实数据，来自 TEST_NGWL_YMS.QMS_WINDOW_INFO）
- */
-@Data
-public class RealPlatformOverviewPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 月台总数 */
-    private Long totalPlatforms;
-
-    /** 当前作业中（月台作业状态=占用） */
-    private Long operatingPlatforms;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformVehiclePO.java

@@ -1,30 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-import java.io.Serializable;
-
-/**
- * 月台监测-作业车辆（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS 等）
- */
-@Data
-public class RealPlatformVehiclePO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 车牌号（qms_main_business.CARNO） */
-    private String plateNumber;
-
-    /** 流程状态（qms_main_business.FLOWSTATUS） */
-    private String status;
-
-    /** 叫号月台（qms_queue_list.WINDOWNAME） */
-    private String platformId;
-
-    /** 月台作业时长，分钟（EXITTIME - ENTRYTIME） */
-    private Long platformDuration;
-
-    /** 预约申请时间（qms_main_business.CREATE_TIME） */
-    private String appointmentTime;
-
-    /** 作业楼层（qms_window_info.PLATFORMFLOOR） */
-    private String workFloor;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealTaskLoadPO.java

@@ -1,18 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-import java.io.Serializable;
-
-/**
- * 任务负荷统计（按小时，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
- */
-@Data
-public class RealTaskLoadPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 0-23 小时 */
-    private Integer hourOfDay;
-
-    /** 该小时段任务数 */
-    private Long taskCount;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealTaskTypeStatPO.java

@@ -1,20 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 任务类型统计（真实数据，来自 NGWL_TEST_YMS.QMS_MAIN_BUSINESS 预约登记表）
- * 按本月预约车辆数（TARGET_DATE 在当前月）以 BUSINESS_NAME 业务类型分组
- */
-@Data
-public class RealTaskTypeStatPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 业务类型名称（qms_main_business.BUSINESS_NAME） */
-    private String businessName;
-
-    /** 该业务类型本月预约车辆数 */
-    private Long count;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealVehicleStatusPO.java

@@ -1,27 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.repository.po;
-
-import lombok.Data;
-import java.io.Serializable;
-
-/**
- * 作业车辆状态统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
- */
-@Data
-public class RealVehicleStatusPO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /** 今日预约车辆 */
-    private Long todayReservedVehicles;
-
-    /** 当前未签到 */
-    private Long notCheckedIn;
-
-    /** 当前等待作业（FLOW_STATUS IN '1','2','3' 已预约/已签到/已叫号） */
-    private Long waiting;
-
-    /** 当前作业中 */
-    private Long operatingVehicles;
-
-    /** 作业完成 */
-    private Long completedVehicles;
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java

@@ -1,486 +0,0 @@
-package com.mhd.bi.domain.biPlatformRealData.service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.mhd.bi.domain.biPlatformRealData.repository.mapper.BiPlatformRealDataMapper;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealBusinessTypeStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformFloorStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealOnTimeStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskTypeStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealMonthlyTaskDurationPO;
-import com.mhd.bi.domain.biPlatformSurveillance.repository.mapper.BiPlatformSurveillanceReportMapper;
-import com.mhd.bi.domain.biSnapshotSync.repository.mapper.BiSnapshotWriteMapper;
-import com.mhd.bi.domain.biSnapshotSync.support.BiSnapshotWeeklyRandomDataBuilder;
-import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillanceVO;
-import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformVehicleItemVO;
-import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.TaskLoadItemVO;
-import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.TaskTypeStatisticsVO;
-import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.TaskTypeCountItemVO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Random;
-
-/**
- * 月台监测-真实数据业务层（封装 YMS 跨库查询）
- * 注：列名大小写、字段类型需以实际库为准；若 YMS 库无数据/无权限，相关方法应返回空/0，不影响写死字段写入快照
- */
-@Slf4j
-@Service
-public class BiPlatformRealDataService {
-
-    @Resource
-    private BiPlatformRealDataMapper biPlatformRealDataMapper;
-
-    @Resource
-    private BiSnapshotWriteMapper biSnapshotWriteMapper;
-
-    @Resource
-    private BiPlatformSurveillanceReportMapper biPlatformSurveillanceReportMapper;
-
-    @Resource
-    private ObjectMapper objectMapper;
-
-    private static final String REMARK_REALTIME = "realtime platform-surveillance";
-
-    /**
-     * 实时组装月台监测数据；仅当真实业务数据（YMS 库查出的字段）发生变化时，
-     * 才覆盖更新 BI_PLATFORM_SURVEILLANCE_SNAPSHOT 快照表最新一条后返回。
-     * 写死字段变化不触发更新；表中尚无记录时插入一条兜底。
-     */
-    public PlatformSurveillanceVO buildRealTimePlatformSurveillanceAndPersist() {
-        PlatformSurveillanceVO vo = buildRealTimePlatformSurveillance();
-        try {
-            String fullJson = objectMapper.writeValueAsString(vo);
-            String fingerprint = realDataFingerprint(vo);
-
-            String latestJson = biPlatformSurveillanceReportMapper.selectLatestPayloadJson();
-            if (StringUtils.isNotBlank(latestJson)) {
-                PlatformSurveillanceVO latestVo = objectMapper.readValue(latestJson.trim(), PlatformSurveillanceVO.class);
-                if (Objects.equals(fingerprint, realDataFingerprint(latestVo))) {
-                    log.info("BI 月台监测真实业务数据未变化，跳过落库");
-                    return vo;
-                }
-            }
-
-            int rows = biSnapshotWriteMapper.updateLatestPlatformSurveillanceSnapshot(fullJson, REMARK_REALTIME);
-            if (rows < 1) {
-                // 表中无最新记录可更新，插入一条兜底
-                biSnapshotWriteMapper.insertPlatformSurveillanceSnapshot(fullJson, REMARK_REALTIME);
-            }
-            log.info("BI 月台监测实时数据已落库(覆盖最新, 数据变化), affectedRows={}", rows);
-        } catch (Exception e) {
-            log.error("BI 月台监测实时数据落库失败", e);
-        }
-        return vo;
-    }
-
-    /**
-     * 提取月台监测的「真实业务数据」指纹（仅含 YMS 库查出的字段），用于判断业务数据是否变化。
-     * 写死/随机字段不纳入指纹，故其变化不会触发更新。
-     */
-    private String realDataFingerprint(PlatformSurveillanceVO vo) throws Exception {
-        Map<String, Object> fp = new LinkedHashMap<>();
-        if (vo.getPlatformOverview() != null) {
-            fp.put("totalPlatforms", vo.getPlatformOverview().getTotalPlatforms());
-            fp.put("operatingPlatforms", vo.getPlatformOverview().getOperatingPlatforms());
-            fp.put("currentOccupancyRate", vo.getPlatformOverview().getCurrentOccupancyRate());
-            fp.put("todayTasks", vo.getPlatformOverview().getTodayTasks());
-        }
-        if (vo.getEfficiencyStatistics() != null) {
-            fp.put("platformOnTimeRate", vo.getEfficiencyStatistics().getPlatformOnTimeRate());
-        }
-        if (vo.getVehicleStatus() != null) {
-            fp.put("todayReservedVehicles", vo.getVehicleStatus().getTodayReservedVehicles());
-            fp.put("notCheckedIn", vo.getVehicleStatus().getNotCheckedIn());
-            fp.put("waiting", vo.getVehicleStatus().getWaiting());
-            fp.put("operatingVehicles", vo.getVehicleStatus().getOperatingVehicles());
-            fp.put("completedVehicles", vo.getVehicleStatus().getCompletedVehicles());
-        }
-        if (vo.getMonthlyTaskStatistics() != null) {
-            fp.put("taskTotal", vo.getMonthlyTaskStatistics().getTaskTotal());
-            fp.put("avgTaskDuration", vo.getMonthlyTaskStatistics().getAvgTaskDuration());
-            fp.put("taskCompletionRate", vo.getMonthlyTaskStatistics().getTaskCompletionRate());
-        }
-        if (vo.getVehicles() != null) {
-            List<Map<String, Object>> vehicles = new ArrayList<>();
-            for (PlatformVehicleItemVO v : vo.getVehicles()) {
-                Map<String, Object> m = new LinkedHashMap<>();
-                m.put("appointmentTime", v.getAppointmentTime());
-                m.put("workFloor", v.getWorkFloor());
-                m.put("plateNumber", v.getPlateNumber());
-                m.put("status", v.getStatus());
-                m.put("platformId", v.getPlatformId());
-                m.put("platformDuration", v.getPlatformDuration());
-                vehicles.add(m);
-            }
-            fp.put("vehicles", vehicles);
-        }
-        if (vo.getTaskLoadStatistics() != null) {
-            List<Map<String, Object>> loads = new ArrayList<>();
-            for (TaskLoadItemVO item : vo.getTaskLoadStatistics()) {
-                Map<String, Object> m = new LinkedHashMap<>();
-                m.put("time", item.getTime());
-                m.put("taskCount", item.getTaskCount());
-                loads.add(m);
-            }
-            fp.put("taskLoadStatistics", loads);
-        }
-        if (vo.getTaskTypeStatistics() != null) {
-            Map<String, Object> m = new LinkedHashMap<>();
-            m.put("totalTasks", vo.getTaskTypeStatistics().getTotalTasks());
-            if (vo.getTaskTypeStatistics().getTaskTypes() != null) {
-                List<Map<String, Object>> types = new ArrayList<>();
-                for (TaskTypeCountItemVO it : vo.getTaskTypeStatistics().getTaskTypes()) {
-                    Map<String, Object> tm = new LinkedHashMap<>();
-                    tm.put("type", it.getType());
-                    tm.put("count", it.getCount());
-                    types.add(tm);
-                }
-                m.put("taskTypes", types);
-            }
-            fp.put("taskTypeStatistics", m);
-        }
-        // 月台告警统计：按业务要求恒为 0，纳入指纹以确保旧快照（可能含非0写死值）能被覆盖更新为 0
-        if (vo.getPlatformAlarmStatistics() != null) {
-            fp.put("todayAlarmTotal", vo.getPlatformAlarmStatistics().getTodayAlarmTotal());
-            fp.put("handled", vo.getPlatformAlarmStatistics().getHandled());
-            fp.put("unhandled", vo.getPlatformAlarmStatistics().getUnhandled());
-        }
-        return objectMapper.writeValueAsString(fp);
-    }
-
-    public List<RealPlatformVehiclePO> queryVehicles() {
-        try {
-            return biPlatformRealDataMapper.queryVehicles();
-        } catch (Exception e) {
-            log.error("【YMS】查询作业车辆列表失败: {}", e.getMessage(), e);
-            return java.util.Collections.emptyList();
-        }
-    }
-
-    public RealPlatformOverviewPO queryPlatformOverview() {
-        try {
-            RealPlatformOverviewPO po = biPlatformRealDataMapper.queryPlatformOverview();
-            if (po == null) {
-                po = new RealPlatformOverviewPO();
-            }
-            if (po.getTotalPlatforms() == null) po.setTotalPlatforms(0L);
-            if (po.getOperatingPlatforms() == null) po.setOperatingPlatforms(0L);
-            return po;
-        } catch (Exception e) {
-            log.error("【YMS】查询月台概览失败: {}", e.getMessage(), e);
-            RealPlatformOverviewPO po = new RealPlatformOverviewPO();
-            po.setTotalPlatforms(0L);
-            po.setOperatingPlatforms(0L);
-            return po;
-        }
-    }
-
-    public long countTodayTasks() {
-        try {
-            Long n = biPlatformRealDataMapper.countTodayTasks();
-            return n == null ? 0L : n;
-        } catch (Exception e) {
-            log.error("【YMS】统计今日作业任务失败: {}", e.getMessage(), e);
-            return 0L;
-        }
-    }
-
-    /**
-     * 今日作业准时率 = 今日准时车辆数 / 今日有入场时间的车辆数 × 100%（四舍五入取整）
-     * 准时：实际进入时间 < 预约日期(TARGET_DATE) + 预约结束时间(BOOKING_END_TIME)。
-     * 分子分母都只统计有入场时间（ENTRY_TIME 不为空）的车辆；分母为 0 时返回 0。
-     */
-    public int calcTodayOnTimeRate() {
-        try {
-            RealOnTimeStatPO po = biPlatformRealDataMapper.queryTodayOnTimeStats();
-            if (po == null) return 0;
-            long total = po.getTotal() == null ? 0L : po.getTotal();
-            long onTime = po.getOnTimeCount() == null ? 0L : po.getOnTimeCount();
-            if (total <= 0) return 0;
-            // 四舍五入到整数百分比（取整）
-            return (int) Math.round(((double) onTime / (double) total) * 100.0);
-        } catch (Exception e) {
-            log.error("【YMS】计算今日作业准时率失败: {}", e.getMessage(), e);
-            return 0;
-        }
-    }
-
-    public RealVehicleStatusPO queryVehicleStatusToday() {
-        try {
-            RealVehicleStatusPO po = biPlatformRealDataMapper.queryVehicleStatusToday();
-            if (po == null) po = new RealVehicleStatusPO();
-            if (po.getTodayReservedVehicles() == null) po.setTodayReservedVehicles(0L);
-            if (po.getNotCheckedIn() == null) po.setNotCheckedIn(0L);
-            if (po.getWaiting() == null) po.setWaiting(0L);
-            if (po.getOperatingVehicles() == null) po.setOperatingVehicles(0L);
-            if (po.getCompletedVehicles() == null) po.setCompletedVehicles(0L);
-            return po;
-        } catch (Exception e) {
-            log.error("【YMS】统计车辆状态失败: {}", e.getMessage(), e);
-            RealVehicleStatusPO po = new RealVehicleStatusPO();
-            po.setTodayReservedVehicles(0L);
-            po.setNotCheckedIn(0L);
-            po.setWaiting(0L);
-            po.setOperatingVehicles(0L);
-            po.setCompletedVehicles(0L);
-            return po;
-        }
-    }
-
-    public long countMonthTasks() {
-        try {
-            Long n = biPlatformRealDataMapper.countMonthTasks();
-            return n == null ? 0L : n;
-        } catch (Exception e) {
-            log.error("【YMS】统计本月任务量失败: {}", e.getMessage(), e);
-            return 0L;
-        }
-    }
-
-    /**
-     * 本月任务平均时长 / 完成率统计：
-     *  - avgDurationHours：累计(EXIT_TIME - ENTRY_TIME)小时数 / 参与数；任一为空的行不参与
-     *  - taskCompletionRate：已完成（EXIT_TIME 不为空 且 预约日期在本月）/ 本月预约总数量 ×100
-     * 任一查询失败均返回 null，由调用方决定是否覆盖模板值。
-     */
-    public RealMonthlyTaskDurationPO queryMonthTaskStats() {
-        try {
-            return biPlatformRealDataMapper.queryMonthTaskStats();
-        } catch (Exception e) {
-            log.error("【YMS】统计本月任务平均时长/完成率失败: {}", e.getMessage(), e);
-            return null;
-        }
-    }
-
-    public List<RealTaskLoadPO> queryTaskLoadToday() {
-        try {
-            return biPlatformRealDataMapper.queryTaskLoadToday();
-        } catch (Exception e) {
-            log.error("【YMS】统计任务负荷失败: {}", e.getMessage(), e);
-            return java.util.Collections.emptyList();
-        }
-    }
-
-    /**
-     * 任务类型统计：本月（YMS QMS_MAIN_BUSINESS）预约车辆按业务类型 BUSINESS_NAME 分组；
-     * 返回 {totalTasks: 当月总预约车辆数, taskTypes: [{type: 业务类型名称, count: 该类型预约数}]}
-     * 按真实 BUSINESS_NAME 分组输出，不固定兜底类别；当月无数据或查询失败时返回空列表。
-     */
-    public TaskTypeStatisticsVO queryMonthTransportOrderByType() {
-        List<TaskTypeCountItemVO> items = new ArrayList<>();
-        int total = 0;
-        try {
-            List<RealTaskTypeStatPO> rows = biPlatformRealDataMapper.queryMonthTransportOrderByType();
-            if (rows != null) {
-                for (RealTaskTypeStatPO r : rows) {
-                    if (r == null || r.getBusinessName() == null || r.getCount() == null) {
-                        continue;
-                    }
-                    int c = r.getCount().intValue();
-                    items.add(TaskTypeCountItemVO.builder().type(r.getBusinessName()).count(c).build());
-                    total += c;
-                }
-            }
-        } catch (Exception e) {
-            log.error("【YMS】统计当月预约业务类型失败: {}", e.getMessage(), e);
-            // 查询失败返回空列表（前端会显示空）
-            items = new ArrayList<>();
-            total = 0;
-        }
-        return TaskTypeStatisticsVO.builder().totalTasks(total).taskTypes(items).build();
-    }
-
-    /**
-     * 今日预约-业务类型统计：按业务类型分组统计今日预约数量。
-     * 例：今日预约航空打板 3 条 → 返回 {businessName:"航空打板", count:3}
-     */
-    public List<RealBusinessTypeStatPO> queryTodayBusinessTypeStats() {
-        try {
-            return biPlatformRealDataMapper.queryTodayBusinessTypeStats();
-        } catch (Exception e) {
-            log.error("【YMS】统计今日业务类型失败: {}", e.getMessage(), e);
-            return java.util.Collections.emptyList();
-        }
-    }
-
-    /**
-     * 月台监控-按楼层统计月台车辆：返回 {floorNo, platformCount, todayReservedVehicles, operatingVehicles}
-     * 实时查 YMS 库，不落库。
-     */
-    public List<RealPlatformFloorStatPO> queryPlatformFloorStats() {
-        try {
-            return biPlatformRealDataMapper.queryPlatformFloorStats();
-        } catch (Exception e) {
-            log.error("【YMS】月台监控按楼层统计失败: {}", e.getMessage(), e);
-            return java.util.Collections.emptyList();
-        }
-    }
-
-    /**
-     * 月台管理列表：实时查 YMS qms_window_info，返回月台/鹤位窗口完整信息，不落库。
-     */
-    public List<RealPlatformInfoPO> queryPlatformInfoList() {
-        try {
-            return biPlatformRealDataMapper.queryPlatformInfoList();
-        } catch (Exception e) {
-            log.error("【YMS】查询月台管理列表失败: {}", e.getMessage(), e);
-            return java.util.Collections.emptyList();
-        }
-    }
-
-    /**
-     * 实时组装月台监测数据：原则「有真实数据源用真实，无真实数据源用写死模拟」。
-     * 有真实数据源的字段（vehicles / platformOverview / vehicleStatus / taskLoad / taskTotal）
-     * 无条件用 YMS 真实查询覆盖，真实为空即为空，不用模板兜底；
-     * 无真实数据源的字段（效率统计、趋势、告警、任务类型等）保留模板写死值。
-     * 每次调用实时查库，不经过快照表。
-     */
-    public PlatformSurveillanceVO buildRealTimePlatformSurveillance() {
-        // 固定种子生成写死模板：仅用于没有真实数据源的字段
-        Random r = new Random(20260825L);
-        PlatformSurveillanceVO template = BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(r);
-
-        // 作业车辆列表：真实数据源，无条件覆盖（真实为空则返回空列表，不用模板模拟）
-        List<RealPlatformVehiclePO> realVehicles = queryVehicles();
-        List<PlatformVehicleItemVO> vehicleVos = new ArrayList<>();
-        for (RealPlatformVehiclePO rv : realVehicles) {
-            PlatformVehicleItemVO v = new PlatformVehicleItemVO();
-            v.setAppointmentTime(rv.getAppointmentTime());
-            v.setWorkFloor(rv.getWorkFloor());
-            v.setPlateNumber(rv.getPlateNumber());
-            v.setStatus(translateFlowStatus(rv.getStatus()));
-            v.setPlatformId(rv.getPlatformId());
-            v.setPlatformDuration(rv.getPlatformDuration() == null ? 0 : rv.getPlatformDuration().intValue());
-            vehicleVos.add(v);
-        }
-        template.setVehicles(vehicleVos);
-
-        // 月台实时概览：真实数据源，无条件覆盖
-        // 总月台 / 占用月台 来源：YMS 月台管理列表 QMS_WINDOW_INFO（JOB_STATUS=1 表示占用）
-        // 月台占用率 = 占用 / 全部月台
-        // 今日作业任务 来源：QMS_MAIN_BUSINESS 按预约时间 TARGET_DATE = 今天 的全部数量
-        // 作业准时率 = 今日（实际进场时间在预约日期当天的车辆数） / 今日预约车辆总数 × 100%
-        if (template.getPlatformOverview() != null) {
-            List<RealPlatformInfoPO> platformList = queryPlatformInfoList();
-            int total = platformList == null ? 0 : platformList.size();
-            int occ = 0;
-            if (platformList != null) {
-                for (RealPlatformInfoPO p : platformList) {
-                    if (p != null && p.getJobStatus() != null && p.getJobStatus() == 1) {
-                        occ++;
-                    }
-                }
-            }
-            double rate = total > 0 ? Math.round(((double) occ / total) * 100.0 * 100.0) / 100.0 : 0d;
-            int todayTasks = (int) countTodayTasks();
-            template.getPlatformOverview().setTotalPlatforms(total);
-            template.getPlatformOverview().setOperatingPlatforms(occ);
-            template.getPlatformOverview().setCurrentOccupancyRate(rate);
-            template.getPlatformOverview().setTodayTasks(todayTasks);
-
-            // 作业准时率（实际进入时间 < 预约日期+预约结束时间 的车辆 / 今日预约总数 × 100% 取整）
-            if (template.getEfficiencyStatistics() != null) {
-                template.getEfficiencyStatistics().setPlatformOnTimeRate(calcTodayOnTimeRate());
-            }
-        }
-
-        // 作业车辆状态统计：真实数据源，无条件覆盖（含等待作业 waiting = 今日预约且 已预约/已签到/已叫号）
-        if (template.getVehicleStatus() != null) {
-            RealVehicleStatusPO vs = queryVehicleStatusToday();
-            template.getVehicleStatus().setTodayReservedVehicles(vs.getTodayReservedVehicles().intValue());
-            template.getVehicleStatus().setNotCheckedIn(vs.getNotCheckedIn().intValue());
-            template.getVehicleStatus().setWaiting(vs.getWaiting().intValue());
-            template.getVehicleStatus().setOperatingVehicles(vs.getOperatingVehicles().intValue());
-            template.getVehicleStatus().setCompletedVehicles(vs.getCompletedVehicles().intValue());
-        }
-
-        // 本月任务统计：taskTotal / avgTaskDuration / taskCompletionRate 均有真实数据源，无条件覆盖；YoY 保留模板写死值
-        if (template.getMonthlyTaskStatistics() != null) {
-            template.getMonthlyTaskStatistics().setTaskTotal((int) countMonthTasks());
-            RealMonthlyTaskDurationPO monthStats = queryMonthTaskStats();
-            if (monthStats != null) {
-                if (monthStats.getAvgDurationHours() != null) {
-                    // 保留两位小数
-                    double v = monthStats.getAvgDurationHours();
-                    template.getMonthlyTaskStatistics().setAvgTaskDuration(Math.round(v * 100.0) / 100.0);
-                }
-                Long total = monthStats.getTotalCount();
-                Long completed = monthStats.getCompletedCount();
-                if (total != null && total > 0 && completed != null) {
-                    int rate = (int) Math.round(((double) completed.longValue() / total.longValue()) * 100.0);
-                    template.getMonthlyTaskStatistics().setTaskCompletionRate(rate);
-                } else {
-                    template.getMonthlyTaskStatistics().setTaskCompletionRate(0);
-                }
-            }
-        }
-
-        // 任务负荷：有真实数据源；真实为空则清空不用模板模拟，有数据则按真实小时覆盖
-        List<RealTaskLoadPO> loads = queryTaskLoadToday();
-        if (loads.isEmpty()) {
-            template.setTaskLoadStatistics(new ArrayList<>());
-        } else if (template.getTaskLoadStatistics() != null) {
-            Map<Integer, Long> hourMap = new HashMap<>();
-            for (RealTaskLoadPO l : loads) {
-                hourMap.put(l.getHourOfDay(), l.getTaskCount());
-            }
-            for (TaskLoadItemVO item : template.getTaskLoadStatistics()) {
-                Integer hour = parseHourFromLabel(item.getTime());
-                if (hour != null && hourMap.containsKey(hour)) {
-                    item.setTaskCount(hourMap.get(hour).intValue());
-                }
-            }
-        }
-
-        // 任务类型统计：本月 YMS QMS_MAIN_BUSINESS 按业务类型 BUSINESS_NAME 分组（真实业务数据）
-        template.setTaskTypeStatistics(queryMonthTransportOrderByType());
-
-        return template;
-    }
-
-    private static Integer parseHourFromLabel(String label) {
-        if (label == null) return null;
-        try {
-            String s = label.replace("时", "").trim();
-            return Integer.parseInt(s);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * FLOW_STATUS 数字转中文：1已预约 2已签到 3已叫号 4已过号 5已进场 6已称重 7已装车 8二次称重 9已结算 10已还卡 11已出场 12已取消
-     */
-    private static String translateFlowStatus(String flowStatus) {
-        if (flowStatus == null) return null;
-        switch (flowStatus.trim()) {
-            case "1": return "已预约";
-            case "2": return "已签到";
-            case "3": return "已叫号";
-            case "4": return "已过号";
-            case "5": return "已进场";
-            case "6": return "已称重";
-            case "7": return "已装车";
-            case "8": return "二次称重";
-            case "9": return "已结算";
-            case "10": return "已还卡";
-            case "11": return "已出场";
-            case "12": return "已取消";
-            default: return flowStatus;
-        }
-    }
-}

mhd-bi/src/main/java/com/mhd/bi/domain/biReport/support/BiReportSnapshotMapperSupport.java

@@ -85,9 +85,9 @@ public final class BiReportSnapshotMapperSupport {
                         .entryOvertimeRate(0).overtimeCount(0).platformOnTimeRate(0)
                         .avgPlatformDuration(0d).yardOnTimeRate(0).avgYardDuration(0d).build())
                 .platformOverview(PlatformOverviewVO.builder()
-                        .totalPlatforms(0).currentOccupancyRate(0d).operatingPlatforms(0).todayTasks(0).build())
+                        .totalPlatforms(0).currentOccupancyRate(0).operatingPlatforms(0).todayTasks(0).build())
                 .vehicleStatus(VehicleStatusVO.builder()
-                        .todayReservedVehicles(0).notCheckedIn(0).waiting(0).operatingVehicles(0).completedVehicles(0).build())
+                        .todayReservedVehicles(0).notCheckedIn(0).operatingVehicles(0).completedVehicles(0).build())
                 .avgOperationDurationTrend(Collections.emptyList())
                 .monthlyTaskStatistics(MonthlyTaskStatisticsVO.builder()
                         .taskTotal(0).taskTotalYoY(0).avgTaskDuration(0d).avgDurationYoY(0)

mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/repository/mapper/BiSnapshotWriteMapper.java

@@ -13,8 +13,6 @@ public interface BiSnapshotWriteMapper {
 
     int insertPlatformSurveillanceSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
 
-    int updateLatestPlatformSurveillanceSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
-
     int insertOverallOperationSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);
 
     int insertWarehouseOperationZoneSnapshot(@Param("payloadJson") String payloadJson, @Param("remark") String remark);

mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/service/BiReportSnapshotSyncService.java

@@ -13,20 +13,10 @@ import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillance
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.HkMacaoServiceZoneVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TransportOperationZoneVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WarehouseOperationZoneVO;
-import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformVehicleItemVO;
-import com.mhd.bi.domain.biPlatformRealData.service.BiPlatformRealDataService;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Random;
 
 /**
@@ -44,7 +34,6 @@ public class BiReportSnapshotSyncService {
 
     private final BiSnapshotWriteMapper biSnapshotWriteMapper;
     private final ObjectMapper objectMapper;
-    private final BiPlatformRealDataService biPlatformRealDataService;
 
     /**
      * 依次同步各快照表；单表失败不影响其它表，只记日志。
@@ -148,121 +137,9 @@ public class BiReportSnapshotSyncService {
         return BiSnapshotWeeklyRandomDataBuilder.warehouseTransport(new Random());
     }
 
-    /** TODO 业务落地：部分字段改为真实数据，其余仍写死。 */
+    /** TODO 业务落地：改为查询真实数据。临时实现见 {@link BiSnapshotWeeklyRandomDataBuilder#platformSurveillance(Random)}。 */
     protected PlatformSurveillanceVO buildPlatformSurveillanceSnapshot() {
-        // 固定种子，保证写死字段每次生成值一致（真实字段随后实时覆盖）
+        return BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(new Random());
-        Random r = new Random(20260825L);
-        // 写死数据复用原 builder
-        PlatformSurveillanceVO template = BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(r);
-
-        // ====== 真实数据：作业车辆列表 ======
-        List<RealPlatformVehiclePO> realVehicles = biPlatformRealDataService.queryVehicles();
-        List<PlatformVehicleItemVO> vehicleVos = new ArrayList<>();
-        for (RealPlatformVehiclePO rv : realVehicles) {
-            PlatformVehicleItemVO v = new PlatformVehicleItemVO();
-            v.setAppointmentTime(rv.getAppointmentTime());
-            v.setWorkFloor(rv.getWorkFloor());
-            v.setPlateNumber(rv.getPlateNumber());
-            v.setStatus(rv.getStatus());
-            v.setPlatformId(rv.getPlatformId());
-            v.setPlatformDuration(rv.getPlatformDuration() == null ? 0 : rv.getPlatformDuration().intValue());
-            vehicleVos.add(v);
-        }
-        if (!vehicleVos.isEmpty()) {
-            template.setVehicles(vehicleVos);
-        }
-
-        // ====== 真实数据：月台实时概览 ======
-        // 总月台 / 占用月台 来源：YMS 月台管理列表 QMS_WINDOW_INFO（JOB_STATUS=1 表示占用）
-        // 月台占用率 = 占用 / 全部月台
-        // 今日作业任务 来源：QMS_MAIN_BUSINESS 按预约时间 TARGET_DATE = 今天 的全部数量
-        if (template.getPlatformOverview() != null) {
-            List<RealPlatformInfoPO> platformList = biPlatformRealDataService.queryPlatformInfoList();
-            int total = platformList == null ? 0 : platformList.size();
-            int occ = 0;
-            if (platformList != null) {
-                for (RealPlatformInfoPO p : platformList) {
-                    if (p != null && p.getJobStatus() != null && p.getJobStatus() == 1) {
-                        occ++;
-                    }
-                }
-            }
-            double rate = total > 0 ? Math.round(((double) occ / total) * 100.0 * 100.0) / 100.0 : 0d;
-            int todayTasks = (int) biPlatformRealDataService.countTodayTasks();
-            template.getPlatformOverview().setTotalPlatforms(total);
-            template.getPlatformOverview().setOperatingPlatforms(occ);
-            template.getPlatformOverview().setCurrentOccupancyRate(rate);
-            template.getPlatformOverview().setTodayTasks(todayTasks);
-
-            // 作业准时率 = 实际进入时间 < 预约日期+预约结束时间 的车辆 / 今日预约总数 × 100%（取整）
-            if (template.getEfficiencyStatistics() != null) {
-                template.getEfficiencyStatistics().setPlatformOnTimeRate(biPlatformRealDataService.calcTodayOnTimeRate());
-            }
-        }
-
-        // ====== 真实数据：作业车辆状态统计 ======
-        RealVehicleStatusPO vs = biPlatformRealDataService.queryVehicleStatusToday();
-        if (template.getVehicleStatus() != null) {
-            template.getVehicleStatus().setTodayReservedVehicles(vs.getTodayReservedVehicles().intValue());
-            template.getVehicleStatus().setNotCheckedIn(vs.getNotCheckedIn().intValue());
-            template.getVehicleStatus().setWaiting(vs.getWaiting().intValue());
-            template.getVehicleStatus().setOperatingVehicles(vs.getOperatingVehicles().intValue());
-            template.getVehicleStatus().setCompletedVehicles(vs.getCompletedVehicles().intValue());
-        }
-
-        // ====== 真实数据：本月任务统计 taskTotal / avgTaskDuration / taskCompletionRate ======
-        long monthTasks = biPlatformRealDataService.countMonthTasks();
-        if (template.getMonthlyTaskStatistics() != null) {
-            template.getMonthlyTaskStatistics().setTaskTotal((int) monthTasks);
-            com.mhd.bi.domain.biPlatformRealData.repository.po.RealMonthlyTaskDurationPO monthStats =
-                    biPlatformRealDataService.queryMonthTaskStats();
-            if (monthStats != null) {
-                if (monthStats.getAvgDurationHours() != null) {
-                    double v = monthStats.getAvgDurationHours();
-                    template.getMonthlyTaskStatistics().setAvgTaskDuration(Math.round(v * 100.0) / 100.0);
-                }
-                Long total = monthStats.getTotalCount();
-                Long completed = monthStats.getCompletedCount();
-                if (total != null && total > 0 && completed != null) {
-                    int rate = (int) Math.round(((double) completed.longValue() / total.longValue()) * 100.0);
-                    template.getMonthlyTaskStatistics().setTaskCompletionRate(rate);
-                } else {
-                    template.getMonthlyTaskStatistics().setTaskCompletionRate(0);
-                }
-            }
-        }
-
-        // ====== 真实数据：任务负荷（今日 24 小时） ======
-        List<RealTaskLoadPO> loads = biPlatformRealDataService.queryTaskLoadToday();
-        if (!loads.isEmpty() && template.getTaskLoadStatistics() != null) {
-            Map<Integer, Long> hourMap = new HashMap<>();
-            for (RealTaskLoadPO l : loads) {
-                hourMap.put(l.getHourOfDay(), l.getTaskCount());
-            }
-            for (com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.TaskLoadItemVO item : template.getTaskLoadStatistics()) {
-                Integer hour = parseHourFromLabel(item.getTime());
-                if (hour != null) {
-                    Long n = hourMap.get(hour);
-                    if (n != null) item.setTaskCount(n.intValue());
-                }
-            }
-        }
-
-        // ====== 真实数据：任务类型统计（本月 YMS QMS_MAIN_BUSINESS 按业务类型 BUSINESS_NAME 分组） ======
-        template.setTaskTypeStatistics(biPlatformRealDataService.queryMonthTransportOrderByType());
-
-        return template;
-    }
-
-    private static Integer parseHourFromLabel(String label) {
-        if (label == null) return null;
-        // "15时" -> 15
-        try {
-            String s = label.replace("时", "").trim();
-            return Integer.parseInt(s);
-        } catch (Exception e) {
-            return null;
-        }
     }
 
     /**

mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/support/BiSnapshotWeeklyRandomDataBuilder.java

@@ -127,8 +127,6 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
         for (String[] row : Baseline.P_PLATES) {
             int dur = jitterInt(Integer.parseInt(row[3]), r);
             vehicles.add(PlatformVehicleItemVO.builder()
-                    .appointmentTime(Baseline.P_APPOINTMENT_TIME)
-                    .workFloor(Baseline.P_WORK_FLOOR)
                     .plateNumber(row[0])
                     .status(row[1])
                     .platformId(row[2])
@@ -147,7 +145,7 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
 
         PlatformOverviewVO overview = PlatformOverviewVO.builder()
                 .totalPlatforms(Math.max(1, jitterInt(Baseline.P_TOT_PL, r)))
-                .currentOccupancyRate((double) jitterPercentInt(Baseline.P_OCC, r))
+                .currentOccupancyRate(jitterPercentInt(Baseline.P_OCC, r))
                 .operatingPlatforms(Math.max(0, jitterInt(Baseline.P_OP, r)))
                 .todayTasks(Math.max(0, jitterInt(Baseline.P_TASKS, r)))
                 .build();
@@ -185,8 +183,13 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
                     .build());
         }
 
-        // 月台告警：按业务要求，全部置 0（趋势/统计/分布均不生成写死数据）
         List<PlatformAlarmTrendItemVO> alarmTrend = new ArrayList<>();
+        for (int i = 0; i < Baseline.P_AL_D.length; i++) {
+            alarmTrend.add(PlatformAlarmTrendItemVO.builder()
+                    .date(Baseline.P_AL_D[i])
+                    .alarmCount(Math.max(0, jitterInt(Baseline.P_AL_C[i], r)))
+                    .build());
+        }
 
         List<TaskTypeCountItemVO> typeCounts = new ArrayList<>();
         for (int i = 0; i < Baseline.P_TT_TYPES.length; i++) {
@@ -196,11 +199,18 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
                     .build());
         }
 
-        int todayAl = 0;
+        int todayAl = Math.max(0, jitterInt(Baseline.P_AL_TOT, r));
-        int handled = 0;
+        int handled = Math.max(0, jitterInt(Baseline.P_AL_H, r));
-        int unhandled = 0;
+        handled = Math.min(handled, todayAl);
+        int unhandled = Math.max(0, todayAl - handled);
 
         List<PlatformAlarmDistItemVO> dist = new ArrayList<>();
+        for (int i = 0; i < Baseline.P_DIST_T.length; i++) {
+            dist.add(PlatformAlarmDistItemVO.builder()
+                    .type(Baseline.P_DIST_T[i])
+                    .count(Math.max(0, jitterInt(Baseline.P_DIST_C[i], r)))
+                    .build());
+        }
 
         return PlatformSurveillanceVO.builder()
                 .vehicles(vehicles)
@@ -384,8 +394,6 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
         static final String[] W_CUST_NAMES = {"华东冷链", "华南汽配", "西南快消", "华北家电", "跨境达"};
         static final int[] W_CUST_AMT = {198, 172, 205, 189, 221};
 
-        static final String P_APPOINTMENT_TIME = "2026-08-03 09:30:00";
-        static final String P_WORK_FLOOR = "一楼";
         static final String[][] P_PLATES = {
                 {"粤A12345", "待入场", "#12", "88"},
                 {"闽D99887", "作业中", "#07", "142"},
@@ -403,7 +411,6 @@ public final class BiSnapshotWeeklyRandomDataBuilder {
         static final int P_TASKS = 418;
         static final int P_RESV = 2_850;
         static final int P_NC = 920;
-        static final int P_WAIT = 680;
         static final int P_OPV = 1_180;
         static final int P_DONE = 1_420;
         static final String[] P_MO_LABELS = {"5月", "6月", "7月"};

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/BiReportApi.java

@@ -3,10 +3,6 @@ package com.mhd.bi.interfaces.facadeApi.biReport;
 import com.mhd.bi.domain.biSnapshotSync.service.BiReportSnapshotSyncService;
 import com.mhd.bi.domain.biComprehensive.service.BiComprehensiveReportService;
 import com.mhd.bi.domain.biPlatformSurveillance.service.BiPlatformSurveillanceReportService;
-import com.mhd.bi.domain.biPlatformRealData.service.BiPlatformRealDataService;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealBusinessTypeStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformFloorStatPO;
-import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO;
 import com.mhd.bi.domain.biOverallOperation.service.BiOverallOperationReportService;
 import com.mhd.bi.domain.biHkMacaoServiceZone.service.BiHkMacaoServiceZoneReportService;
 import com.mhd.bi.domain.biTransportOperationZone.service.BiTransportOperationZoneReportService;
@@ -15,17 +11,12 @@ import com.mhd.bi.domain.biWarehouseTransport.service.BiWarehouseTransportReport
 import com.mhd.bi.interfaces.facadeApi.biReport.dto.BiApiResult;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.ComprehensiveSituationVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.WarehouseTransportSituationVO;
-import com.mhd.bi.interfaces.facadeApi.biReport.vo.gps.NanqiGpsLocationVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.overall.OverallOperationSituationVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillanceVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.HkMacaoServiceZoneVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TransportOperationZoneVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WarehouseOperationZoneVO;
-import com.mhd.common.core.exception.ServiceException;
-import com.mhd.common.core.feign.ThirdPartyServiceFeign;
 import com.mhd.common.core.web.controller.BaseController;
-import com.mhd.common.core.web.domain.AjaxResult;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -38,8 +29,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * BI 报表接口
  */
@@ -59,9 +48,6 @@ public class BiReportApi extends BaseController {
     @Autowired
     private BiPlatformSurveillanceReportService biPlatformSurveillanceReportService;
 
-    @Autowired
-    private BiPlatformRealDataService biPlatformRealDataService;
-
     @Autowired
     private BiOverallOperationReportService biOverallOperationReportService;
 
@@ -77,12 +63,6 @@ public class BiReportApi extends BaseController {
     @Autowired
     private BiReportSnapshotSyncService biReportSnapshotSyncService;
 
-    @Autowired
-    private ThirdPartyServiceFeign thirdPartyServiceFeign;
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
 
     @ApiOperation(value = "手动触发快照同步", notes = "立即写入各 BI 快照表（综合、仓储运输、月台监测、总体运营、仓储运营专区、运输运营专区、港澳服务专区）；须带 X-BI-Access-Token")
     @PostMapping("/snapshotSync/run")
@@ -112,67 +92,14 @@ public class BiReportApi extends BaseController {
     }
 
     /**
-     * 月台监测指标查询（实时查 YMS 库，真实字段 + 写死字段），并落库一条到 BI_PLATFORM_SURVEILLANCE_SNAPSHOT
+     * 月台监测指标查询（按照 del_flag=1，按 create_time 最新一条）
      */
-    @ApiOperation(value = "月台监测指标查询", notes = "每次调用实时查询 YMS 库组装并写入快照表；部分字段为真实业务数据，部分为写死数据")
+    @ApiOperation(value = "月台监测指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条快照")
     @GetMapping("/platformSurveillance")
     public BiApiResult<PlatformSurveillanceVO> platformSurveillance() {
-        PlatformSurveillanceVO data = biPlatformRealDataService.buildRealTimePlatformSurveillanceAndPersist();
+        PlatformSurveillanceVO data = biPlatformSurveillanceReportService.loadLatestPlatformSurveillance();
         return BiApiResult.ok(data);
     }
-
-    /**
-     * 今日预约-业务类型统计（实时查 YMS 库，不落库）
-     */
-    @ApiOperation(value = "今日预约业务类型统计", notes = "按业务类型分组统计今日预约数量，实时查询 YMS 库，不落库；例：航空打板 3 条")
-    @GetMapping("/businessTypeStats")
-    public BiApiResult<List<RealBusinessTypeStatPO>> businessTypeStats() {
-        List<RealBusinessTypeStatPO> data = biPlatformRealDataService.queryTodayBusinessTypeStats();
-        return BiApiResult.ok(data);
-    }
-
-    /**
-     * 月台监控-按楼层统计月台车辆（实时查 YMS 库，不落库）
-     */
-    @ApiOperation(value = "月台车辆统计（按楼层）", notes = "按楼层统计月台数量、今日预约车辆、当前作业车辆，实时查询 YMS 库，不落库")
-    @GetMapping("/platformFloorStats")
-    public BiApiResult<List<RealPlatformFloorStatPO>> platformFloorStats() {
-        List<RealPlatformFloorStatPO> data = biPlatformRealDataService.queryPlatformFloorStats();
-        return BiApiResult.ok(data);
-    }
-
-    /**
-     * 月台管理列表（实时查 YMS qms_window_info，不落库）
-     */
-    @ApiOperation(value = "月台管理列表", notes = "实时查询 YMS 库 qms_window_info，返回月台/鹤位窗口列表（机构、月台号、月台名称、楼层、绑定屏、UUID、状态等），不落库")
-    @GetMapping("/platformInfoList")
-    public BiApiResult<List<RealPlatformInfoPO>> platformInfoList() {
-        List<RealPlatformInfoPO> data = biPlatformRealDataService.queryPlatformInfoList();
-        return BiApiResult.ok(data);
-    }
-
-    /**
-     * 南岐GPS：根据车牌号查询车辆实时定位
-     * （内部经 ThirdPartyServiceFeign 转发到 mhd_thrid_party 的 /nanqiGps/queryByPlate，逻辑仍在 mhd_thrid_party）
-     */
-    @ApiOperation(value = "根据车牌号查询车辆实时定位（南岐GPS）", notes = "按车牌号查询南岐GPS车辆实时定位，实时转发到三方服务")
-    @GetMapping("/nanqiGps/queryByPlate")
-    public BiApiResult<NanqiGpsLocationVO> nanqiQueryByPlate(
-            @ApiParam(value = "车牌号")
-            @RequestParam(value = "carPlate") String carPlate) {
-        if (carPlate == null || carPlate.trim().isEmpty()) {
-            throw new ServiceException("车牌号不能为空");
-        }
-        AjaxResult result = thirdPartyServiceFeign.nanqiQueryByPlate(carPlate);
-        Object codeObj = result == null ? null : result.get("code");
-        if (codeObj == null || !"200".equals(String.valueOf(codeObj))) {
-            String msg = result == null ? "南岐GPS查询失败" : String.valueOf(result.get("msg"));
-            throw new ServiceException(msg);
-        }
-        Object data = result.get("data");
-        NanqiGpsLocationVO vo = objectMapper.convertValue(data, NanqiGpsLocationVO.class);
-        return BiApiResult.ok(vo);
-    }
 //园区物流大屏接口----------------------------------------------------------------------
     /**
      * 总体运营态势

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/gps/NanqiGpsLocationVO.java

@@ -1,248 +0,0 @@
-package com.mhd.bi.interfaces.facadeApi.biReport.vo.gps;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * 南岐GPS 车辆定位信息 VO（与 mhd_thrid_party.NanqiGpsLocationVO 同构，供 BI 开放接口返回）
- *
- * @author mhd
- */
-@Data
-@ApiModel("南岐GPS 车辆定位信息")
-public class NanqiGpsLocationVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("应答结果：1成功 0失败")
-    private Integer rspCode;
-
-    @ApiModelProperty("应答描述")
-    private String rspDesc;
-
-    @ApiModelProperty("车辆id")
-    private String carId;
-
-    @ApiModelProperty("车牌号")
-    private String carPlate;
-
-    @ApiModelProperty("车辆名")
-    private String carName;
-
-    @ApiModelProperty("车队id")
-    private String teamId;
-
-    @ApiModelProperty("车队名称")
-    private String teamName;
-
-    @ApiModelProperty("终端号")
-    private String tmnNo;
-
-    @ApiModelProperty("消息序列号")
-    private String tmnKey;
-
-    @ApiModelProperty("卡号")
-    private String simCard;
-
-    @ApiModelProperty("定位时间")
-    private String time;
-
-    @ApiModelProperty("经度（WGS84）")
-    private BigDecimal lng;
-
-    @ApiModelProperty("纬度（WGS84）")
-    private BigDecimal lat;
-
-    @ApiModelProperty("百度经度")
-    private BigDecimal blng;
-
-    @ApiModelProperty("百度纬度")
-    private BigDecimal blat;
-
-    @ApiModelProperty("谷歌/高德经度")
-    private BigDecimal glng;
-
-    @ApiModelProperty("谷歌/高德纬度")
-    private BigDecimal glat;
-
-    @ApiModelProperty("海拔（米）")
-    private BigDecimal height;
-
-    @ApiModelProperty("速度（千米/小时）")
-    private BigDecimal speed;
-
-    @ApiModelProperty("方向 0~360")
-    private String drct;
-
-    @ApiModelProperty("昨日平台总里程（千米）")
-    private String prevDayTotalMile;
-
-    @ApiModelProperty("平台总里程（千米）")
-    private String mile;
-
-    @ApiModelProperty("今日里程（千米）")
-    private String preMile;
-
-    @ApiModelProperty("终端里程（千米）")
-    private String tmnMile;
-
-    @ApiModelProperty("定位信号：0无 弱<=3 中<=6 强>6")
-    private String satl;
-
-    @ApiModelProperty("通讯信号：0无 弱<=10 中<=20 强>20")
-    private String sgn;
-
-    @ApiModelProperty("地理描述")
-    private String addr;
-
-    @ApiModelProperty("车辆定位状态")
-    private String state;
-
-    @ApiModelProperty("车辆状态文字")
-    private String stateCn;
-
-    @ApiModelProperty("驾驶员")
-    private String drvName;
-
-    @ApiModelProperty("驾驶员电话")
-    private String drvPhone;
-
-    @ApiModelProperty("车牌颜色")
-    private String plateColor;
-
-    @ApiModelProperty("车辆类型")
-    private String carType;
-
-    @ApiModelProperty("地图图标")
-    private String icon;
-
-    @ApiModelProperty("地图图标完整链接")
-    private String iconLink;
-
-    @ApiModelProperty("是否上传自定义图片：true取上传图片 false取大图")
-    private String uploadFlag;
-
-    @ApiModelProperty("大图片")
-    private String bigIcon;
-
-    @ApiModelProperty("大图片完整链接")
-    private String bigIconLink;
-
-    @ApiModelProperty("实时照片")
-    private String photoIcon;
-
-    @ApiModelProperty("中文方向")
-    private String drctCn;
-
-    @ApiModelProperty("今日行驶时长（秒）")
-    private String todayRun;
-
-    @ApiModelProperty("行停时长")
-    private String runStopTime;
-
-    @ApiModelProperty("行停时长（秒），排序时使用")
-    private String runStopTimeSecond;
-
-    @ApiModelProperty("ACC时长")
-    private String accTime;
-
-    @ApiModelProperty("ACC总时长")
-    private String totalAccTime;
-
-    @ApiModelProperty("离线时长")
-    private String offLineTime;
-
-    @ApiModelProperty("信号线（返回集合，每记录含name/value）")
-    private String sgnStts;
-
-    @ApiModelProperty("提醒信息（返回集合，每记录含name/value）")
-    private String reminds;
-
-    @ApiModelProperty("油量（返回集合，每记录含name/value）")
-    private String st1;
-
-    @ApiModelProperty("载重（返回集合，每记录含name/value）")
-    private String st2;
-
-    @ApiModelProperty("温度（返回集合，每记录含name/value）")
-    private String st3;
-
-    @ApiModelProperty("湿度（返回集合，每记录含name/value）")
-    private String st4;
-
-    @ApiModelProperty("水位（返回集合，每记录含name/value）")
-    private String st5;
-
-    @ApiModelProperty("服务到期状态：1已到期 0未到期")
-    private String expState;
-
-    @ApiModelProperty("服务期限")
-    private String expTime;
-
-    @ApiModelProperty("油量")
-    private String oil;
-
-    @ApiModelProperty("定位附加项（JSON）")
-    private String protocols;
-
-    @ApiModelProperty("扩展字段（JSON）")
-    private String exts;
-
-    @ApiModelProperty("模拟量1")
-    private String moni1;
-
-    @ApiModelProperty("模拟量2")
-    private String moni2;
-
-    @ApiModelProperty("模拟量3")
-    private String moni3;
-
-    @ApiModelProperty("模拟量4")
-    private String moni4;
-
-    @ApiModelProperty("视频通道（JSON）")
-    private String videos;
-
-    @ApiModelProperty("未处理报警类型名称（逗号分隔）")
-    private String alarms;
-
-    @ApiModelProperty("未处理报警类型ID（逗号分隔）")
-    private String alarmTypeIds;
-
-    @ApiModelProperty("终端型号")
-    private String tmnType;
-
-    @ApiModelProperty("终端到期时间")
-    private String tmnExpirTime;
-
-    @ApiModelProperty("视频设备报警id集合")
-    private String videoAlarmTypes;
-
-    @ApiModelProperty("驾驶员登签姓名(卡号)")
-    private String driverSign;
-
-    @ApiModelProperty("驾驶员登签电话号码")
-    private String driverSignPhone;
-
-    @ApiModelProperty("驾驶员登签时间")
-    private String driverSignTime;
-
-    @ApiModelProperty("驾驶员登签时长")
-    private String drvSignTimeLong;
-
-    @ApiModelProperty("车辆基本状态（16进制位掩码）")
-    private String carStts;
-
-    @ApiModelProperty("报警状态（16进制位掩码）")
-    private String alarmStts;
-
-    @ApiModelProperty("协议版本")
-    private String prtcVer;
-
-    @ApiModelProperty("接入端口")
-    private String tmnPort;
-}

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformOverviewVO.java

@@ -18,7 +18,7 @@ public class PlatformOverviewVO {
     private Integer totalPlatforms;
 
     @ApiModelProperty("当前占用率，单位：%")
-    private Double currentOccupancyRate;
+    private Integer currentOccupancyRate;
 
     @ApiModelProperty("当前作业中，单位：个")
     private Integer operatingPlatforms;

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/PlatformVehicleItemVO.java

@@ -14,12 +14,6 @@ import lombok.NoArgsConstructor;
 @ApiModel("月台监测-作业车辆")
 public class PlatformVehicleItemVO {
 
-    @ApiModelProperty("预约申请时间")
-    private String appointmentTime;
-
-    @ApiModelProperty("作业楼层")
-    private String workFloor;
-
     @ApiModelProperty("车牌号码")
     private String plateNumber;
 

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/vo/platform/VehicleStatusVO.java

@@ -20,9 +20,6 @@ public class VehicleStatusVO {
     @ApiModelProperty("当前未签到，单位：辆")
     private Integer notCheckedIn;
 
-    @ApiModelProperty("当前等待作业（已预约/已签到/已叫号），单位：辆")
-    private Integer waiting;
-
     @ApiModelProperty("当前作业中，单位：辆")
     private Integer operatingVehicles;
 

mhd-bi/src/main/resources/bootstrap.yml

@@ -19,14 +19,14 @@ spring:
 #        username: nacos
 #        password: manhuoda@2023
         #线上正式环境
-        server-addr: 10.102.192.30:6848
+        server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
       config:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
-        server-addr: 10.102.192.30:6848
+        server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
         #线上正式环境

mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml

@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mhd.bi.domain.biPlatformRealData.repository.mapper.BiPlatformRealDataMapper">
-
-    <!-- 作业车辆状态列表（vehicles）：仅查询预约日期是今天（TARGET_DATE）的车辆
-         plateNumber      <- qms_main_business.CAR_NO
-         status           <- qms_main_business.FLOW_STATUS
-         platformId       <- qms_main_business.WINDOW_NAME（叫号月台，主业务表直接有）
-         platformDuration <- qms_main_business.EXIT_TIME - ENTRY_TIME（分钟）
-         appointmentTime  <- qms_main_business.CREATE_TIME
-         workFloor        <- qms_window_info.PLATFORM_FLOOR（按 WINDOW_NAME 关联）
-    -->
-    <select id="queryVehicles" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO">
-        SELECT
-            mb.CAR_NO             AS plateNumber,
-            mb.FLOW_STATUS        AS status,
-            mb.WINDOW_NAME        AS platformId,
-            CASE
-                WHEN mb.EXIT_TIME IS NOT NULL AND mb.ENTRY_TIME IS NOT NULL
-                THEN CAST((mb.EXIT_TIME - mb.ENTRY_TIME) * 24 * 60 AS BIGINT)
-                ELSE 0
-            END                  AS platformDuration,
-            TO_CHAR(mb.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS') AS appointmentTime,
-            wi.PLATFORM_FLOOR     AS workFloor
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS mb
-        LEFT JOIN NGWL_TEST_YMS.QMS_WINDOW_INFO wi
-               ON wi.WINDOW_NAME = mb.WINDOW_NAME
-        WHERE mb.TARGET_DATE IS NOT NULL
-          AND TRUNC(mb.TARGET_DATE) = TRUNC(SYSDATE)
-        ORDER BY mb.CREATE_TIME DESC
-    </select>
-
-    <!-- 月台概览：totalPlatforms（总条数）、operatingPlatforms（作业状态=占用，JOB_STATUS: 0空闲 1占用） -->
-    <select id="queryPlatformOverview" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO">
-        SELECT
-            COUNT(1) AS totalPlatforms,
-            SUM(CASE WHEN JOB_STATUS = 1 THEN 1 ELSE 0 END) AS operatingPlatforms
-        FROM NGWL_TEST_YMS.QMS_WINDOW_INFO
-    </select>
-
-    <!-- 今日作业任务：按预约时间 TARGET_DATE（今日）统计主业务记录数 -->
-    <select id="countTodayTasks" resultType="java.lang.Long">
-        SELECT COUNT(1)
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
-        WHERE TARGET_DATE IS NOT NULL
-          AND TRUNC(TARGET_DATE) = TRUNC(SYSDATE)
-    </select>
-
-    <!-- 今日作业准时率统计：
-         total       今日有入场时间的预约车辆数（ENTRY_TIME 不为空 且 TARGET_DATE = 今天）
-         onTimeCount 今日准时车辆数（实际进入时间 < 预约日期 + 预约结束时间 BOOKING_END_TIME，即 ENTRY_TIME < TRUNC(TARGET_DATE) + 预约时段结束时分）
-         「准时率 = 今日准时车辆数 / 今日有入场时间的车辆数 × 100%（四舍五入取整）；分子分母都只统计有入场时间的车辆」
-         BOOKING_END_TIME 存纯时分（如 18:30），故用 TO_DATE 解析后取其时分间隔加到 TARGET_DATE 上
-    -->
-    <select id="queryTodayOnTimeStats" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealOnTimeStatPO">
-        SELECT
-            SUM(CASE WHEN ENTRY_TIME IS NOT NULL
-                       AND TARGET_DATE IS NOT NULL
-                       AND TRUNC(TARGET_DATE) = TRUNC(SYSDATE) THEN 1 ELSE 0 END)                                                                  AS total,
-            SUM(CASE WHEN ENTRY_TIME IS NOT NULL
-                       AND TRUNC(TARGET_DATE) = TRUNC(SYSDATE)
-                       AND ENTRY_TIME &lt; TRUNC(TARGET_DATE)
-                              + (TO_DATE(BOOKING_END_TIME, 'HH24:MI') - TRUNC(TO_DATE(BOOKING_END_TIME, 'HH24:MI')))
-                     THEN 1 ELSE 0 END)                                                                                                              AS onTimeCount
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
-    </select>
-
-    <!-- 车辆状态统计：今日的统计（按创建时间 CREATE_TIME / 流程状态）
-         todayReservedVehicles 改为按预约日期 TARGET_DATE（其它 3 项保持 CREATE_TIME）
-         waiting 等待作业：FLOW_STATUS IN ('1','2','3') 已预约/已签到/已叫号 且 预约日期 = 今天
-         FLOW_STATUS: 1已预约 2已签到 3已叫号 4已过号 5已进场 6已称重 7已装车 8二次称重 9已结算 10已还卡 11已出场 12已取消 -->
-    <select id="queryVehicleStatusToday" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO">
-        SELECT
-            SUM(CASE WHEN TRUNC(TARGET_DATE) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS todayReservedVehicles,
-            SUM(CASE WHEN FLOW_STATUS = '1' AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS notCheckedIn,
-            SUM(CASE WHEN FLOW_STATUS IN ('1','2','3') AND TRUNC(TARGET_DATE) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS waiting,
-            SUM(CASE WHEN FLOW_STATUS IN ('5','6','7','8','9','10') AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS operatingVehicles,
-            SUM(CASE WHEN FLOW_STATUS = '11' AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS completedVehicles
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
-    </select>
-
-    <!-- 本月任务量：按预约日期 TARGET_DATE（Y预约日期）统计本月预约总数量 -->
-    <select id="countMonthTasks" resultType="java.lang.Long">
-        SELECT COUNT(1)
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
-        WHERE TARGET_DATE IS NOT NULL
-          AND TO_CHAR(TARGET_DATE, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM')
-    </select>
-
-    <!-- 本月任务平均作业时长 / 完成率统计：
-         avgDurationHours 平均时长（小时）= AVG((EXIT_TIME - ENTRY_TIME) * 24)
-                          仅 ENTRY_TIME 与 EXIT_TIME 都不为空时参与；
-         durationCount    参与平均时长统计的有效条数；
-         completedCount   本月（TARGET_DATE）已出场（EXIT_TIME IS NOT NULL）的数量；
-         totalCount       本月（TARGET_DATE）预约总数量。
-    -->
-    <select id="queryMonthTaskStats" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealMonthlyTaskDurationPO">
-        SELECT
-            AVG(CASE WHEN ENTRY_TIME IS NOT NULL AND EXIT_TIME IS NOT NULL
-                     THEN (EXIT_TIME - ENTRY_TIME) * 24
-                END)                                                                                                  AS avgDurationHours,
-            SUM(CASE WHEN ENTRY_TIME IS NOT NULL AND EXIT_TIME IS NOT NULL
-                     AND TO_CHAR(ENTRY_TIME, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM')
-                     THEN 1 ELSE 0 END)                                                                              AS durationCount,
-            SUM(CASE WHEN EXIT_TIME IS NOT NULL
-                     AND TARGET_DATE IS NOT NULL
-                     AND TO_CHAR(TARGET_DATE, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM')
-                     THEN 1 ELSE 0 END)                                                                              AS completedCount,
-            SUM(CASE WHEN TARGET_DATE IS NOT NULL
-                     AND TO_CHAR(TARGET_DATE, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM')
-                     THEN 1 ELSE 0 END)                                                                              AS totalCount
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
-    </select>
-
-    <!-- 今日预约-业务类型统计：按 BUSINESS_NAME（业务类型名称）分组统计今日预约数量，按预约日期 TARGET_DATE 过滤 -->
-    <select id="queryTodayBusinessTypeStats" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealBusinessTypeStatPO">
-        SELECT
-            BUSINESS_NAME AS businessName,
-            COUNT(1)      AS count
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
-        WHERE BUSINESS_NAME IS NOT NULL
-          AND TRUNC(TARGET_DATE) = TRUNC(SYSDATE)
-        GROUP BY BUSINESS_NAME
-        ORDER BY COUNT(1) DESC
-    </select>
-
-    <!-- 月台监控-按楼层统计：楼层从叫号月台 WINDOW_NAME 解析（如 S1-01 / N1-02 -> F1），不依赖字母前缀，只取 - 前面那段的数字
-         platformCount 来自 QMS_WINDOW_INFO；todayReservedVehicles/operatingVehicles 来自 QMS_MAIN_BUSINESS（按 TARGET_DATE=今天） -->
-    <select id="queryPlatformFloorStats" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformFloorStatPO">
-        SELECT
-            'F' || SUBSTR(W.WINDOW_NAME, INSTR(W.WINDOW_NAME,'-')-1, 1) AS floorNo,
-            COUNT(DISTINCT W.WINDOW_NAME)                               AS platformCount,
-            COUNT(DISTINCT CASE
-                WHEN TRUNC(mb.TARGET_DATE) = TRUNC(SYSDATE) THEN mb.CAR_NO
-            END)                                                        AS todayReservedVehicles,
-            COUNT(DISTINCT CASE
-                WHEN TRUNC(mb.TARGET_DATE) = TRUNC(SYSDATE)
-                 AND mb.FLOW_STATUS IN ('5','6','7','8','9','10')
-                THEN mb.CAR_NO
-            END)                                                        AS operatingVehicles
-        FROM NGWL_TEST_YMS.QMS_WINDOW_INFO W
-        LEFT JOIN NGWL_TEST_YMS.QMS_MAIN_BUSINESS mb
-               ON mb.WINDOW_NAME = W.WINDOW_NAME
-        WHERE W.WINDOW_NAME LIKE '%-%'
-        GROUP BY SUBSTR(W.WINDOW_NAME, INSTR(W.WINDOW_NAME,'-')-1, 1)
-        ORDER BY 1 DESC
-    </select>
-
-    <!-- 任务类型统计（来自 NGWL_TEST_YMS.QMS_MAIN_BUSINESS 预约登记表）：
-         按本月预约车辆数（TARGET_DATE 在当前月）按 BUSINESS_NAME 业务类型分组统计 -->
-    <select id="queryMonthTransportOrderByType" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskTypeStatPO">
-        SELECT
-            BUSINESS_NAME AS businessName,
-            COUNT(1)      AS count
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
-        WHERE BUSINESS_NAME IS NOT NULL
-          AND TARGET_DATE IS NOT NULL
-          AND TO_CHAR(TARGET_DATE, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM')
-        GROUP BY BUSINESS_NAME
-        ORDER BY COUNT(1) DESC
-    </select>
-
-    <!-- 任务负荷（今日 24 小时时段）：按 EXTRACT(HOUR FROM ENTRY_TIME) 统计 -->
-    <select id="queryTaskLoadToday" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO">
-        SELECT
-            EXTRACT(HOUR FROM ENTRY_TIME) AS hourOfDay,
-            COUNT(1) AS taskCount
-        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
-        WHERE ENTRY_TIME IS NOT NULL
-          AND TRUNC(ENTRY_TIME) = TRUNC(SYSDATE)
-        GROUP BY EXTRACT(HOUR FROM ENTRY_TIME)
-        ORDER BY EXTRACT(HOUR FROM ENTRY_TIME)
-    </select>
-
-    <!-- 月台管理列表：查询 YMS qms_window_info 月台/鹤位窗口
-         机构名称 deptName  <- sys_dept.DEPT_NAME（d.dept_id = a.ORG_NO 关联）
-         鹤位屏名称 berrNames <- qms_window_berr(WINDOW_ID/BERR_ID) join qms_berr_config(ID/BERR_NAME)，WM_CONCAT 拼接
-         其余列来自 qms_window_info 本身 -->
-    <select id="queryPlatformInfoList" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformInfoPO">
-        SELECT
-            a.ID              AS id,
-            a.ORG_NO          AS orgNo,
-            d.DEPT_NAME       AS deptName,
-            a.WINDOW_NUMBER   AS windowNumber,
-            a.WINDOW_NAME     AS windowName,
-            a.PRIORITY_SET    AS prioritySet,
-            a.RUNNING_STATUS  AS runningStatus,
-            a.CREATE_BY       AS createBy,
-            TO_CHAR(a.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS') AS createTime,
-            a.UUID            AS uuid,
-            a.GUIDE_IMAGES    AS guideImages,
-            a.PLATFORM_FLOOR  AS platformFloor,
-            a.JOB_STATUS      AS jobStatus,
-            (
-                SELECT WM_CONCAT(qbc.BERR_NAME)
-                FROM NGWL_TEST_YMS.QMS_WINDOW_BERR qwb
-                LEFT JOIN NGWL_TEST_YMS.QMS_BERR_CONFIG qbc ON qbc.ID = qwb.BERR_ID
-                WHERE qwb.WINDOW_ID = a.ID
-            )                 AS berrNames
-        FROM NGWL_TEST_YMS.QMS_WINDOW_INFO a
-        LEFT JOIN NGWL_TEST_YMS.SYS_DEPT d ON d.DEPT_ID = a.ORG_NO
-        ORDER BY a.PLATFORM_FLOOR, a.WINDOW_NUMBER
-    </select>
-</mapper>

mhd-bi/src/main/resources/mapper/biSnapshotSync/BiSnapshotWriteMapper.xml

@@ -18,15 +18,6 @@
         values (#{payloadJson}, SYSDATE, SYSDATE, 1, #{remark})
     </insert>
 
-    <update id="updateLatestPlatformSurveillanceSnapshot">
-        update NGWL_TEST_BI.BI_PLATFORM_SURVEILLANCE_SNAPSHOT
-        set PAYLOAD_JSON = #{payloadJson},
-            UPDATE_TIME   = SYSDATE,
-            REMARK        = #{remark}
-        where DEL_FLAG = 1
-          and ID = (select max(t.ID) from NGWL_TEST_BI.BI_PLATFORM_SURVEILLANCE_SNAPSHOT t where t.DEL_FLAG = 1)
-    </update>
-
     <insert id="insertOverallOperationSnapshot">
         insert into NGWL_TEST_BI.BI_OVERALL_OPERATION_SNAPSHOT (PAYLOAD_JSON, CREATE_TIME, UPDATE_TIME, DEL_FLAG, REMARK)
         values (#{payloadJson}, SYSDATE, SYSDATE, 1, #{remark})

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/constant/ServiceNameConstants.java

@@ -66,9 +66,6 @@ public class ServiceNameConstants
     //YMS系统
     public static final String YMS_SERVICE = "mhd-yms-service";
 
-    //YMS系统
-    public static final String XXL_JOB_SERVICE = "xxl-job-service";
-
 
 
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/SettlementCustomersPO.java

@@ -88,10 +88,5 @@ public class SettlementCustomersPO extends BaseVOEntity{
 
     private String settlementObject;
 
-    @ApiModelProperty(name = "散租推送计费单据/流水任务id")
+
-    private Integer pushBillingRecordJobId;
+}
-    @ApiModelProperty(name = "整租推送计费单据/流水任务id")
-    private Integer pushContractManageToBmsJobId;
-    @ApiModelProperty(name = "生成应收账单任务id")
-    private Integer pushBillManageJobId;
-}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/SettlementCustomersParametersPO.java

@@ -1,58 +0,0 @@
-package com.mhd.common.core.domain.po;
-
-import com.mhd.common.core.annotation.Excel;
-import com.mhd.common.core.web.domain.BaseVOEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "结算对象参数对象", description = "结算对象参数响应对象")
-public class SettlementCustomersParametersPO extends BaseVOEntity {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("id")
-    private Long id;
-
-    @ApiModelProperty("结算对象id")
-    private Long settlementCustomersId;
-
-    @ApiModelProperty("一级组织表ID")
-    @Excel(name = "一级组织表ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("组织表ID")
-    @Excel(name = "组织表ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("结算对象编码")
-    @Excel(name = "结算对象编码")
-    private String settlementCustomersCode;
-
-    @ApiModelProperty("结算主体id")
-    @Excel(name = "结算主体id")
-    private Long settlementEntityId;
-
-    @ApiModelProperty("结算主体")
-    @Excel(name = "结算主体")
-    private String settlementEntity;
-
-    @ApiModelProperty("合同编号")
-    @Excel(name = "合同编号")
-    private String contractNumber;
-
-    @ApiModelProperty("合同管理id")
-    private Long contractManageId;
-
-    @ApiModelProperty("参数内容")
-    @Excel(name = "参数内容")
-    private String content;
-
-    @ApiModelProperty("参数名称")
-    @Excel(name = "参数名称")
-    private String parametersName;
-}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/WarehousePO.java

@@ -33,6 +33,4 @@ public class WarehousePO implements Serializable {
     @Excel(name = "仓库名称")
     private String warehouseName;
 
-    @Excel(name = "是否启用: 1-否 2-是")
-    private Integer isEnable;
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/enums/RoleEnum.java

@@ -16,8 +16,7 @@ public enum RoleEnum {
     STORE_ADMIN("店铺管理员", "store_admin"),
     OWNER_CARGO("货主", "ownerCargo"),
     SUPPLIER("供应商", "supplier"),
-    CUSTOMER("客户", "customer"),
+    CUSTOMER("客户", "customer");
-    TENANT("租户", "tenant");
 
     private String name;
     private String code;

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java

@@ -26,8 +26,7 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
-// 目标地址由 nacos 配置项 feign.url.mhd-third-party-service 指定，未配置时按服务名走服务发现
+@FeignClient(value = "mhd-third-party-service", configuration = FeignAutoConfiguration.class)
-@FeignClient(value = "mhd-third-party-service",url = "http://10.102.192.32:8012", configuration = FeignAutoConfiguration.class)
 public interface ThirdPartyServiceFeign {
 
     //查询当前组织所有三方接口信息
@@ -335,12 +334,4 @@ public interface ThirdPartyServiceFeign {
     @PostMapping("/mdmMasterData/queryMerchant")
     R<com.mhd.common.core.domain.thirdparty.MdmMerchantQueryResultDTO> queryMdmMerchant(
             @RequestBody com.mhd.common.core.domain.thirdparty.MdmMerchantQueryDTO queryDTO);
-
-    /**
-     * 南岐GPS：根据车牌号查询车辆实时定位
-     * @param carPlate 车牌号
-     * @return AjaxResult，data 为车辆定位信息（code=200 成功）
-     */
-    @GetMapping("/nanqiGps/queryByPlate")
-    AjaxResult nanqiQueryByPlate(@RequestParam("carPlate") String carPlate);
 }

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/jackson/FlexibleDateDeserializer.java

@@ -1,112 +0,0 @@
-package com.mhd.common.core.jackson;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-
-import java.io.IOException;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 宽松日期反序列化：兼容 yyyy-MM-dd（纯日期）等常见格式。
- *
- * 背景：库存查询等接口日期只保留年月日后，前端可能把 "2026-07-06" 这类纯日期回传，
- * 而实体/DTO 上 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 是严格格式，反序列化直接报
- * InvalidFormatException。本反序列化器解析顺序：
- *   1) 字段 @JsonFormat 指定的模式（严格全匹配，保持原行为）；
- *   2) 兜底常见格式：yyyy-MM-dd HH:mm:ss → yyyy-MM-dd HH:mm → yyyy-MM-dd；
- *   3) 纯数字按毫秒时间戳；
- *   4) 交给 Jackson 默认解析（ISO-8601 等）。
- * 仅放宽接受范围，不影响任何既有格式的解析结果；由各服务 DateCompatibilityConfig 显式注册生效。
- *
- * @author rcx
- * @date 2026-09-05
- */
-public class FlexibleDateDeserializer extends JsonDeserializer<Date> implements ContextualDeserializer {
-
-    /** 兜底格式按长度降序排列，避免长文本被短格式部分解析 */
-    private static final String[] FALLBACK_PATTERNS = {
-            "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd"
-    };
-
-    /** 字段 @JsonFormat 指定的模式，可为空 */
-    private final String pattern;
-
-    public FlexibleDateDeserializer() {
-        this(null);
-    }
-
-    public FlexibleDateDeserializer(String pattern) {
-        this.pattern = pattern;
-    }
-
-    @Override
-    public Date deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException {
-        String value = parser.getText();
-        if (value == null || value.trim().isEmpty()) {
-            return null;
-        }
-        value = value.trim();
-
-        // 纯数字按毫秒时间戳（10位秒级时间戳也兼容）
-        if (value.matches("\\d{10,}")) {
-            return new Date(Long.parseLong(value));
-        }
-
-        // 1) 字段 @JsonFormat 指定的模式优先
-        Date parsed = tryParse(value, pattern);
-        // 2) 兜底常见格式
-        if (parsed == null) {
-            for (String fallback : FALLBACK_PATTERNS) {
-                parsed = tryParse(value, fallback);
-                if (parsed != null) {
-                    break;
-                }
-            }
-        }
-        // 3) 交给 Jackson 默认解析（ISO-8601 等）
-        if (parsed == null) {
-            try {
-                parsed = ctxt.parseDate(value);
-            } catch (IllegalArgumentException ignore) {
-                // 走不到默认解析时统一在下方抛出友好异常
-            }
-        }
-        if (parsed == null) {
-            throw ctxt.weirdStringException(value, Date.class,
-                    "支持格式：yyyy-MM-dd HH:mm:ss / yyyy-MM-dd HH:mm / yyyy-MM-dd");
-        }
-        return parsed;
-    }
-
-    /**
-     * 严格全匹配解析：解析失败或文本未完整消费（如按 yyyy-MM-dd 解析 "2026-07-06 10:00:00"）
-     * 都视为不匹配返回 null，交由下一个格式尝试
-     */
-    private Date tryParse(String value, String pattern) {
-        if (pattern == null || pattern.isEmpty()) {
-            return null;
-        }
-        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
-        sdf.setLenient(false);
-        ParsePosition pos = new ParsePosition(0);
-        Date date = sdf.parse(value, pos);
-        return (date != null && pos.getIndex() == value.length()) ? date : null;
-    }
-
-    @Override
-    public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property) {
-        if (property != null) {
-            JsonFormat jsonFormat = property.getAnnotation(JsonFormat.class);
-            if (jsonFormat != null && jsonFormat.pattern() != null && !jsonFormat.pattern().isEmpty()) {
-                return new FlexibleDateDeserializer(jsonFormat.pattern());
-            }
-        }
-        return this;
-    }
-}

mhd-common/mhd-common-security/src/main/java/com/mhd/common/security/handler/GlobalExceptionHandler.java

@@ -88,8 +88,7 @@ public class GlobalExceptionHandler
     {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生未知异常.", requestURI, e);
-        String msg = StringUtils.isEmpty(e.getMessage()) ? "系统繁忙，请稍后重试" : e.getMessage();
+        return AjaxResult.error(e.getMessage());
-        return AjaxResult.error(msg);
     }
 
     /**
@@ -100,8 +99,7 @@ public class GlobalExceptionHandler
     {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生系统异常.", requestURI, e);
-        String msg = StringUtils.isEmpty(e.getMessage()) ? "系统繁忙，请稍后重试" : e.getMessage();
+        return AjaxResult.error(e.getMessage());
-        return AjaxResult.error(msg);
     }
 
     /**

mhd-gateway/src/main/java/com/mhd/gateway/config/CaptchaConfig.java

@@ -34,8 +34,6 @@ public class CaptchaConfig
         properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode");
         // 验证码文本字符长度 默认为5
         properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4");
-        // 验证码文本字符源 默认为abcde2345678gfynmnpqr 改为纯数字
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING, "0123456789");
         // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
         properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
         // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy

mhd-gateway/src/main/resources/bootstrap.yml

@@ -14,16 +14,23 @@ spring:
     nacos:
       discovery:
         server-addr: 127.0.0.1:8848
-#        server-addr: 10.102.192.30:6848
+        # 线上测试环境配置 容器名+端口号
+#        server-addr: 10.102.192.31:6848
 #        server-addr: 10.33.0.129:6010
-        username: nacos
+        #线上正式环境
-        password: manhuoda@2023
+#        server-addr: 127.0.0.1:8848
+#        server-addr: 10.102.192.31:6848
+#        username: nacos
+#        password: manhuoda@2023
       config:
         server-addr: 127.0.0.1:8848
+        # 线上测试环境配置 容器名+端口号
 #        server-addr: 10.33.0.129:6010
-#        server-addr: 10.102.192.30:6848
+        #线上正式环境
-        username: nacos
+#        server-addr: 127.0.0.1:8848
-        password: manhuoda@2023
+#        server-addr: 10.102.192.31:6848
+#        username: nacos
+#        password: manhuoda@2023
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
         file-extension: yml   #默认properties
         # 共享配置

mhd-modules/mhd-system/pom.xml

@@ -111,16 +111,6 @@
             <version>2.24</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-            <version>2.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>1.17.2</version>
-        </dependency>
         <!-- JPush推送 -->
         <!-- jpush极光推送导入start -->
 <!--        <dependency>-->

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java

@@ -40,14 +40,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import com.mhd.basic.interfaces.dto.shipperLeaseDetailsApi.WarehouseLeaseExportVO;
-import com.mhd.common.core.utils.poi.ExcelUtil;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-import java.util.Map;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -278,15 +270,14 @@ public class LeaseApplicationService {
      * 货主租赁明细
      * 定时任务：每天凌晨1点执行，计算前一天的货主租赁明细
      */
-//    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
     public void shipperLeaseDetails() {
         log.info("开始执行货主租赁明细定时任务");
         // 计算前一天的日期，将时间设置为当天的0点0分0秒，只保留日期部分
         final Date yesterday = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1));
 
         LeaseDO leaseDO = new LeaseDO();
-        leaseDO.setTime(yesterday); // 设置查询时间
+        leaseDO.setTime(yesterday);
-        leaseDO.setStatus(1); // 只查询启用状态的租赁，停用的不参与出租率计算
         //查询有效期内的租赁
         List<LeasePO> leasePOS = queryList(leaseDO);
         List<LeasePO> entireUnit = leasePOS.stream()
@@ -503,103 +494,6 @@ public class LeaseApplicationService {
         return warehouseOccupancyRatesList;
     }
 
-    /**
-     * 导出仓库出租率及客户租赁明细（单 sheet，明细行带仓库当日汇总列）
-     * 参数与 /warehouseOccupancyRate、/list 一致
-     */
-    public void exportOccupancyRate(HttpServletResponse response, ShipperLeaseDetailsDO shipperLeaseDetailsDO) throws IOException {
-        // 注意：本方法不调用 warehouseOccupancyRate()，因为该方法在不传 warehouseId 时
-        // totalArea 会算成全系统所有仓库库区面积之和（如 6168），导致导出面积/日租率错误。
-        // 这里自行按 (业务日期 + 仓库) 维度计算，保证多仓库导出时每个仓库的面积/日租率正确。
-
-        // ===== 1. 查全部明细（用副本 DO，避免影响外部）=====
-        ShipperLeaseDetailsDO detailDO = new ShipperLeaseDetailsDO();
-        BeanUtils.copyProperties(shipperLeaseDetailsDO, detailDO);
-        List<ShipperLeaseDetailsPO> detailList = shipperLeaseDetailsService.queryList(detailDO);
-        if (detailList == null) {
-            detailList = new ArrayList<>();
-        }
-
-        // ===== 2. 预算每个仓库的总面积（启用库区的 storageRegion 累加），建 warehouseId -> totalArea 映射 =====
-        Set<Long> warehouseIds = detailList.stream()
-                .map(ShipperLeaseDetailsPO::getWarehouseId)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toSet());
-        Map<Long, BigDecimal> warehouseTotalAreaMap = new HashMap<>();
-        for (Long wid : warehouseIds) {
-            StorageSectionDO storageSectionDO = new StorageSectionDO();
-            storageSectionDO.setWarehouseId(wid);
-            storageSectionDO.setOpeningUp(1);
-            List<StorageSectionPO> sections = storageSectionApplicationService.queryList(storageSectionDO);
-            BigDecimal area = BigDecimal.ZERO;
-            for (StorageSectionPO s : sections) {
-                area = area.add(s.getStorageRegion() == null ? BigDecimal.ZERO : s.getStorageRegion());
-            }
-            warehouseTotalAreaMap.put(wid, area);
-        }
-
-        // ===== 3. 按 (业务日期 + 仓库ID) 聚合，算每个仓库当天的整租/散租面积 =====
-        // summaryMap: key -> [整租面积, 散租面积]
-        SimpleDateFormat keySdf = new SimpleDateFormat("yyyy-MM-dd");
-        Map<String, BigDecimal[]> summaryMap = new HashMap<>();
-        for (ShipperLeaseDetailsPO d : detailList) {
-            String key = (d.getBusinessDate() == null ? "" : keySdf.format(d.getBusinessDate()))
-                    + "_" + d.getWarehouseId();
-            BigDecimal[] arr = summaryMap.computeIfAbsent(key, k -> new BigDecimal[]{BigDecimal.ZERO, BigDecimal.ZERO});
-            BigDecimal leaseArea = d.getLeaseArea() == null ? BigDecimal.ZERO : d.getLeaseArea();
-            if ("整租".equals(d.getLeaseType())) {
-                arr[0] = arr[0].add(leaseArea);
-            } else {
-                arr[1] = arr[1].add(leaseArea);
-            }
-        }
-
-        // ===== 4. 明细为主，每行拼上对应仓库当天的汇总（总面积/日租率按仓库单独算）=====
-        List<WarehouseLeaseExportVO> exportList = new ArrayList<>();
-        for (ShipperLeaseDetailsPO d : detailList) {
-            WarehouseLeaseExportVO vo = new WarehouseLeaseExportVO();
-            // 明细列
-            vo.setBusinessDate(d.getBusinessDate());
-            vo.setOrganizationName(d.getOrganizationName());
-            vo.setWarehouseName(d.getWarehouseName());
-            vo.setCargoOwnerName(d.getCargoOwnerName());
-            vo.setLeaseType(d.getLeaseType());
-            vo.setLeaseArea(d.getLeaseArea());
-            // 汇总列
-            String key = (d.getBusinessDate() == null ? "" : keySdf.format(d.getBusinessDate()))
-                    + "_" + d.getWarehouseId();
-            BigDecimal[] arr = summaryMap.get(key);
-            BigDecimal entireLeaseArea = (arr != null) ? arr[0] : BigDecimal.ZERO;
-            BigDecimal fractionalLeaseArea = (arr != null) ? arr[1] : BigDecimal.ZERO;
-            vo.setEntireLeaseArea(entireLeaseArea);
-            vo.setFractionalLeaseArea(fractionalLeaseArea);
-            // 该仓库的总面积（按仓库单独算，不再用全局总和）
-            BigDecimal widTotalArea = warehouseTotalAreaMap.getOrDefault(d.getWarehouseId(), BigDecimal.ZERO);
-            vo.setTotalArea(widTotalArea);
-            // 日租率 = (整租+散租) / 总面积 × 100，保留2位小数（直接输出百分比值，如 10.00）
-            BigDecimal leaseSum = entireLeaseArea.add(fractionalLeaseArea);
-            BigDecimal dailyRate = widTotalArea.compareTo(BigDecimal.ZERO) == 0
-                    ? BigDecimal.ZERO
-                    : leaseSum.multiply(new BigDecimal("100")).divide(widTotalArea, 2, BigDecimal.ROUND_HALF_UP);
-            vo.setDailyRentalRate(dailyRate);
-            exportList.add(vo);
-        }
-
-        // ===== 5. 按业务日期降序、仓库名升序排序（null 排最后）=====
-        exportList.sort(Comparator
-                .comparing(WarehouseLeaseExportVO::getBusinessDate, Comparator.nullsLast(Comparator.reverseOrder()))
-                .thenComparing(WarehouseLeaseExportVO::getWarehouseName, Comparator.nullsLast(Comparator.naturalOrder())));
-
-        // ===== 6. 用 ExcelUtil 导出（项目通用做法，单 sheet）=====
-        String fileName = URLEncoder.encode("仓库出租率导出", "UTF-8").replaceAll("\\+", "%20");
-        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-        response.setCharacterEncoding("utf-8");
-        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
-
-        ExcelUtil<WarehouseLeaseExportVO> util = new ExcelUtil<>(WarehouseLeaseExportVO.class);
-        util.exportExcel(response, exportList, "仓库出租率");
-    }
-
 
     /**
      * 定时任务整租推送到bms
@@ -643,7 +537,7 @@ public class LeaseApplicationService {
     /**
      * 定时任务散租推送到bms
      */
-//    @Scheduled(cron = "0 0 0 * * ?")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void ScatteredRentalSynchronization() {
         LeaseDO leaseDO = new LeaseDO();
         leaseDO.setTime(new Date());
@@ -687,25 +581,6 @@ public class LeaseApplicationService {
         }
     }
 
-    /**
-     * 启用/停用租赁
-     * @param leaseIds 租赁ID列表
-     * @param status 目标状态：1=启用，0=停用
-     */
-    public Boolean updateStatus(List<Long> leaseIds, Integer status) {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long updateBy = loginUser != null ? loginUser.getUserid() : null;
-        String updateByName = loginUser != null ? loginUser.getUsername() : null;
-        if (leaseIds == null || leaseIds.isEmpty()) {
-            throw new ServiceException("租赁ID不能为空");
-        }
-        if (status == null || (status != 0 && status != 1)) {
-            throw new ServiceException("状态值无效：1=启用，0=停用");
-        }
-        log.info("启用/停用租赁--结束,leaseIds={},状态={},更新人id={}，更新人名称={}",leaseIds,status==0?"停用":"启用",updateBy,updateByName);
-        return leaseDomainService.updateStatus(leaseIds, status, updateBy, updateByName);
-    }
-
 //    /**
 //     * @description 设置数据字典键值
 //     * @author ZhouGY

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/MessageManageApplicationService.java

@@ -461,8 +461,7 @@ public class MessageManageApplicationService
         //获取当前登录人
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if(null == loginUser){
-            //未登录(游客)：返回空消息中心结构，保证小程序界面正常展示而不报错
+            throw new ServiceException("获取登录人失败");
-            return buildEmptyAppNoticeList();
         }
         noticeMessageLoggingDo.setUserId(loginUser.getUserid());
         //获取每种类型的最新一条
@@ -523,27 +522,6 @@ public class MessageManageApplicationService
         return result;
     }
 
-    /**
-     * 未登录(游客)时返回空的消息中心结构，避免前端页面因无登录上下文而报错
-     * @return NoticeMessageLoggingAppListPo
-     */
-    private NoticeMessageLoggingAppListPo buildEmptyAppNoticeList() {
-        NoticeMessageLoggingAppListPo result = new NoticeMessageLoggingAppListPo();
-        NoticeMessageLoggingAppListPo.CommonNotice serviceNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
-        serviceNotice.setUnreadNum("0");
-        NoticeMessageLoggingAppListPo.CommonNotice activityNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
-        activityNotice.setUnreadNum("0");
-        NoticeMessageLoggingAppListPo.CommonNotice logisticsNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
-        logisticsNotice.setUnreadNum("0");
-        NoticeMessageLoggingAppListPo.CommonNotice systemNotice = new NoticeMessageLoggingAppListPo.CommonNotice();
-        systemNotice.setUnreadNum("0");
-        result.setServiceNotice(serviceNotice);
-        result.setActivityNotice(activityNotice);
-        result.setLogisticsNotice(logisticsNotice);
-        result.setSystemNotice(systemNotice);
-        return result;
-    }
-
     /**
      * APP根据类型获取消息通知
      * @param noticeMessageLoggingDo

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java

@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,26 +11,16 @@ import com.mhd.basic.domain.contractManage.entity.ContractManage;
 import com.mhd.basic.domain.contractManage.repository.mapper.ContractManageMapper;
 import com.mhd.basic.domain.contractManage.repository.po.ContractManagePO;
 import com.mhd.basic.domain.contractManage.repository.todo.ContractManageDO;
-import com.mhd.basic.domain.contractManage.repository.util.HttpWebServiceUtil;
-import com.mhd.basic.domain.contractManage.repository.util.XxlJobOpenApiUtil;
 import com.mhd.basic.domain.contractManage.service.ContractManageDomainService;
 import com.mhd.basic.domain.contractManageDetail.entity.ContractManageDetail;
 import com.mhd.basic.domain.contractManageDetail.repository.mapper.ContractManageDetailMapper;
 import com.mhd.basic.domain.contractManageDetail.repository.po.ContractManageDetailPO;
 import com.mhd.basic.domain.contractManageDetail.repository.todo.ContractManageDetailDO;
 import com.mhd.basic.domain.contractManageDetail.service.ContractManageDetailDomainService;
-import com.mhd.basic.domain.contractManageParameters.entity.ContractManageParameters;
-import com.mhd.basic.domain.contractManageParameters.repository.facade.IContractManageParametersService;
-import com.mhd.basic.domain.contractManageParameters.repository.mapper.ContractManageParametersMapper;
-import com.mhd.basic.domain.contractManageParameters.repository.po.ContractManageParametersPO;
-import com.mhd.basic.domain.contractManageParameters.repository.todo.ContractManageParametersDO;
-import com.mhd.basic.domain.contractManageParameters.service.ContractManageParametersDomainService;
 import com.mhd.basic.domain.expenseAccount.repository.po.ExpenseAccountPO;
 import com.mhd.basic.domain.expenseAccount.service.ExpenseAccountDomainService;
 import com.mhd.basic.interfaces.dto.contractManage.*;
-import com.mhd.basic.interfaces.assember.contractManageParameters.ContractManageParametersAssembler;
 import com.mhd.basic.interfaces.dto.contractManageDetail.ContractManageDetailDTO;
-import com.mhd.basic.interfaces.dto.contractManageParameters.ContractManageParametersDTO;
 import com.mhd.common.core.domain.po.*;
 import com.mhd.common.core.enums.DictCode;
 import com.mhd.common.core.exception.ServiceException;
@@ -43,23 +32,18 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.BmsServiceFeign;
 import com.mhd.system.api.SystemServiceFeign;
-import com.mhd.system.api.domain.BusinessDocumentFeign;
-import com.mhd.system.api.domain.MaterialInventoryPO;
 import com.mhd.system.api.domain.SysDictData;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.system.service.ISysDictTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -91,20 +75,6 @@ public class ContractManageApplicationService {
     @Autowired
     private SystemServiceFeign systemServiceFeign;
 
-    @Autowired
-    private ContractManageParametersDomainService contractManageParametersDomainService;
-
-    @Autowired
-    private ContractManageParametersAssembler contractManageParametersAssembler;
-    @Autowired
-    private ContractManageParametersMapper contractManageParametersMapper;
-    @Autowired
-    private IContractManageParametersService contractManageParametersService;
-    @Resource
-    private XxlJobOpenApiUtil apiUtil;
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-    private static final String token = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjozNTYzLCJ0b3BPcmdhbml6YXRpb25JZCI6MjgyNywidXNlcl9rZXkiOiI0N2MzY2U4My0wMmFjLTQ0NTQtOTdiYS1lYmQwMDc2MzNiNDMiLCJ1c2VybmFtZSI6ImNhbmdtYSJ9.tnZyywwburfBo3Kizdhfk5eYdXbrrZ9976Z0W7GrS6UqSpKwfI2RwdRwfYx7DbD7Ri1Fdj_eOVxBkjvdFF226Q";
 
     /**
      * 分页查询合同管理列表
@@ -156,21 +126,7 @@ public class ContractManageApplicationService {
                 contractManageDO.setTopOrganizationId(2827L);
             }
         }
-        List<ContractManagePO> list = contractManageDomainService.queryList(contractManageDO);
+        return contractManageDomainService.queryList(contractManageDO);
-
-        if (!list.isEmpty()) {
-            List<Long> contractManageIds = list.stream()
-                    .map(ContractManagePO::getContractManageId)
-                    .collect(Collectors.toList());
-            List<ContractManageParametersPO> allParams = contractManageParametersDomainService.queryListByManageIds(contractManageIds);
-            Map<Long, List<ContractManageParametersPO>> paramsMap = allParams.stream()
-                    .collect(Collectors.groupingBy(ContractManageParametersPO::getContractManageId));
-            for (ContractManagePO po : list) {
-                po.setContractManageParametersList(paramsMap.getOrDefault(po.getContractManageId(), new ArrayList<>()));
-            }
-        }
-
-        return list;
     }
 
 //    public BigDecimal getAmount(List<SubjectAndPriceReturn> subjectAndPriceReturnList) {
@@ -654,7 +610,6 @@ public class ContractManageApplicationService {
          */
         //20260702取消同一时间段不能有相同合同校验
         //checkContract(contractManageDO);
-        checkUniqueActiveContract(contractManageDO);
         handleData(contractManageDO);
         handleDict(contractManageDO);
         contractManageDO.setContractNumber(OrderSequence.getOrderCode("HT"));
@@ -663,42 +618,9 @@ public class ContractManageApplicationService {
         contractManageDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
         boolean flag = contractManageDomainService.insert(contractManageDO);
         handleDetils(contractManageDO, true);
-        handleParameters(contractManageDO);
         return flag;
     }
 
-    /**
-     * 新增合同管理
-     */
-    @Transactional
-    public ContractManageDO insertFeign(ContractManageDO contractManageDO) {
-        //获取当前登录人信息
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (ObjectUtil.isNull(loginUser)) {
-            throw new DigitalLogisticsException(UserError.TIMEOUT);
-        }
-        validateContractType(contractManageDO.getContractType());
-        /*
-            通用合同：同一时间段、同一合同类型，只能存在一个
-            特殊合同：同一结算主体、同一时间段、同一合同类型，只能存在一个
-         */
-        //20260702取消同一时间段不能有相同合同校验
-        //checkContract(contractManageDO);
-        checkUniqueActiveContract(contractManageDO);
-        handleData(contractManageDO);
-        handleDict(contractManageDO);
-        contractManageDO.setContractNumber(OrderSequence.getOrderCode("HT"));
-        contractManageDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
-        contractManageDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
-        contractManageDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
-        boolean flag = contractManageDomainService.insert(contractManageDO);
-        if (!flag) {
-            throw new ServiceException("新增合同管理失败，请检查数据");
-        }
-        handleDetils(contractManageDO, true);
-        return contractManageDO;
-    }
-
     /**
      * 处理数据字典
      */
@@ -826,26 +748,6 @@ public class ContractManageApplicationService {
         }
     }
 
-    private void checkUniqueActiveContract(ContractManageDO contractManageDO) {
-        if (contractManageDO.getContractState() != null && contractManageDO.getContractState() != 2) {
-            return;
-        }
-        if (contractManageDO.getSettlementCustomersId() == null
-                || StringUtils.isEmpty(contractManageDO.getWarehouseTempLayerType())
-                || StringUtils.isEmpty(contractManageDO.getContractRentType())) {
-            return;
-        }
-        long count = contractManageDomainService.countByUniqueKey(
-                contractManageDO.getSettlementCustomersId(),
-                contractManageDO.getWarehouseTempLayerType(),
-                contractManageDO.getContractRentType(),
-                contractManageDO.getContractManageId()
-        );
-        if (count > 0) {
-            throw new ServiceException("同一结算客户、同一温层、同一租赁类型只能存在一个使用中的合同");
-        }
-    }
-
     /**
      * 处理合同详情
      */
@@ -944,111 +846,6 @@ public class ContractManageApplicationService {
         }
     }
 
-    private void handleParameters(ContractManageDO contractManageDO) {
-        List<ContractManageParametersPO> existingList = contractManageParametersDomainService.queryListByManageId(contractManageDO.getContractManageId());
-        if (!existingList.isEmpty()) {
-            Long[] ids = existingList.stream().map(ContractManageParametersPO::getId).toArray(Long[]::new);
-            contractManageParametersDomainService.delete(ids);
-        }
-        if (StringUtils.isNotEmpty(contractManageDO.getParametersJson())) {
-            ContractManageParametersDTO dto = new ContractManageParametersDTO();
-            dto.setContractManageId(contractManageDO.getContractManageId());
-            dto.setContractNumber(contractManageDO.getContractNumber());
-            dto.setContractName(contractManageDO.getContractName());
-            dto.setParametersJson(contractManageDO.getParametersJson());
-            dto.setOrganizationId(contractManageDO.getOrganizationId());
-            dto.setOrganizationName(contractManageDO.getOrganizationName());
-            dto.setTopOrganizationId(contractManageDO.getTopOrganizationId());
-            ContractManageParametersDO parametersDO = contractManageParametersAssembler.toDO(dto);
-            contractManageParametersDomainService.insert(parametersDO);
-            if(StringUtils.isNotEmpty(contractManageDO.getSettlementCustomersCode())){
-                AjaxResult ajaxResult = bmsServiceFeign.getCustomersInfoByCode(contractManageDO.getSettlementCustomersCode());
-                if (!"200".equals(String.valueOf(ajaxResult.get("code")))){
-                    throw new ServiceException("获取结算客户信息失败");
-                }
-                SettlementCustomersPO settlementCustomersPO = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), SettlementCustomersPO.class);
-                if(null == settlementCustomersPO){
-                    throw new ServiceException("结算客户信息未找到");
-                }
-                Long settlementEntityId = settlementCustomersPO.getSettlementEntityId();
-                if(null != settlementEntityId){
-                    Integer pushContractManageToBmsJobId = settlementCustomersPO.getPushContractManageToBmsJobId();
-                    if (null != pushContractManageToBmsJobId) {
-                        stopXxlJob(pushContractManageToBmsJobId);
-                    }
-                    Integer jobId = addXxlJob(settlementEntityId.toString());
-                    settlementCustomersPO.setPushContractManageToBmsJobId(jobId);
-                    AjaxResult updateResult = bmsServiceFeign.updatePushContractManageJobId(settlementCustomersPO.getSettlementCustomersId(), jobId);
-                    if (!"200".equals(String.valueOf(updateResult.get("code")))) {
-                        throw new ServiceException("更新结算对象定时任务ID失败");
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 创建夜间23点定时任务
-     * @param shipperId 结算对象id，作为任务参数
-     * @return xxlJobId 保存到业务表，后续用于删除/暂停
-     */
-    public Integer addXxlJob(String shipperId) {
-        XxlJobOpenApiUtil.JobInfoAddReq req = new XxlJobOpenApiUtil.JobInfoAddReq();
-        req.setJobGroup(5);
-        //生成唯一业务流水号拼接至JobDesc，保证本次新建任务的JobDesc唯一，据此查询jobId不会命中历史任务
-        String xxlJobBizNo = generateXxlJobBizNo();
-        req.setJobDesc("整租推送计费单据/流水任务,结算对象id:" + shipperId + ",业务流水号:" + xxlJobBizNo);
-        req.setAuthor("system");
-        req.setAlarmEmail("");
-        req.setScheduleType("CRON");
-        // 每天晚上23点执行
-        req.setScheduleConf("0 0 1 * * ?");
-        req.setGlueType("BEAN");
-        req.setExecutorHandler("pushContractManageToBms");
-        req.setExecutorParam(shipperId);
-        req.setGlueRemark("");
-        req.setGlueSource("");
-        req.setExecutorRouteStrategy("FIRST");
-        req.setChildJobId(null);
-        req.setMisfireStrategy("DO_NOTHING");
-        req.setExecutorBlockStrategy("SERIAL_EXECUTION");
-        req.setExecutorTimeout(0);
-        req.setExecutorFailRetryCount(0);
-
-        boolean addOk = apiUtil.addJob(req);
-        if (!addOk) {
-            throw new RuntimeException("创建夜间定时任务失败");
-        }
-        Integer xxlJobId = apiUtil.queryJobIdByDescAndParam(req.getJobDesc(), shipperId,"5");
-        if (xxlJobId == null) {
-            throw new RuntimeException("定时任务创建成功，但查询jobId失败");
-        }
-        return xxlJobId;
-    }
-
-
-    public void stopXxlJob(Integer shipperId) {
-        //1.实例化工具类，建议交给Spring管理
-        XxlJobOpenApiUtil apiUtil = new XxlJobOpenApiUtil(adminAddresses,token);
-        //3.调用创建任务接口 ，返回任务ID
-        apiUtil.pauseJob(shipperId);
-    }
-
-    private static final DateTimeFormatter JOB_BIZ_NO_FORMATTER = DateTimeFormatter.ofPattern("yyMMddHHmmssSSS");
-    private static final Random RANDOM = new Random();
-
-    /**
-     * 生成xxl-job任务业务流水号：JOB + 当天yyMMddHHmmssSSS + 6位随机数字，保证每次创建的JobDesc唯一
-     * 示例：JOB260905102030123123456
-     * @return 业务流水号字符串
-     */
-    private static String generateXxlJobBizNo() {
-        String dateTimeStr = LocalDateTime.now().format(JOB_BIZ_NO_FORMATTER);
-        int randomNum = RANDOM.nextInt(1_000_000);
-        String randomStr = String.format("%06d", randomNum);
-        return "JOB" + dateTimeStr + randomStr;
-    }
-
     /**
      * 修改合同管理
      */
@@ -1056,10 +853,8 @@ public class ContractManageApplicationService {
     public Boolean update(ContractManageDO contractManageDO) {
         validateContractType(contractManageDO.getContractType());
         //checkContract(contractManageDO);
-        checkUniqueActiveContract(contractManageDO);
         handleData(contractManageDO);
         handleDetils(contractManageDO, false);
-        handleParameters(contractManageDO);
         handleDict(contractManageDO);
         return contractManageDomainService.update(contractManageDO);
     }
@@ -1085,8 +880,6 @@ public class ContractManageApplicationService {
         ContractManagePO result = contractManageDomainService.getInfo(contractManageId);
         List<ContractManageDetailPO> contractManageDetailPOList = contractManageDetailDomainService.queryListByManageId(result.getContractManageId());
         result.setContractManageDetailPOList(contractManageDetailPOList);
-        List<ContractManageParametersPO> paramsList = contractManageParametersDomainService.queryListByManageId(result.getContractManageId());
-        result.setContractManageParametersList(paramsList);
         return result;
     }
 
@@ -1331,343 +1124,4 @@ public class ContractManageApplicationService {
     public ContractManagePO getGeneralContract() {
         return contractManageDomainService.getGeneralContract();
     }
-
-    /**
-     * 合同导出（合同头字段 + 明细拍平成一行一条明细）
-     */
-    public List<ContractManageExportVO> buildExportList(ContractManageDO contractManageDO) {
-        List<ContractManagePO> contractList = this.queryList(contractManageDO);
-        List<ContractManageExportVO> exportList = new ArrayList<>();
-        if (contractList == null || contractList.isEmpty()) {
-            return exportList;
-        }
-        List<Long> contractManageIds = contractList.stream()
-                .map(ContractManagePO::getContractManageId)
-                .collect(Collectors.toList());
-        Map<Long, List<ContractManageDetailPO>> detailMap = contractManageDetailDomainService
-                .queryListByManageIds(contractManageIds).stream()
-                .collect(Collectors.groupingBy(ContractManageDetailPO::getContractManageId));
-
-        for (ContractManagePO contract : contractList) {
-            List<ContractManageDetailPO> details = detailMap.get(contract.getContractManageId());
-            if (details != null && !details.isEmpty()) {
-                for (ContractManageDetailPO detail : details) {
-                    ContractManageExportVO vo = new ContractManageExportVO();
-                    // 合同头字段整体复制
-                    BeanUtils.copyProperties(contract, vo);
-                    // 明细字段显式赋值（合同头/明细存在同名字段，避免互相覆盖）
-                    vo.setSubjectType(detail.getSubjectType());
-                    vo.setFirstSubjectCode(detail.getFirstSubjectCode());
-                    vo.setFirstSubjectName(detail.getFirstSubjectName());
-                    vo.setSecondSubjectCode(detail.getSecondSubjectCode());
-                    vo.setSecondSubjectName(detail.getSecondSubjectName());
-                    vo.setAccountingStrategy(detail.getAccountingStrategy());
-                    vo.setBillingAttributes(detail.getBillingAttributes());
-                    vo.setSubjectEffectiveDate(detail.getSubjectEffectiveDate());
-                    vo.setSubjectExpirationDate(detail.getSubjectExpirationDate());
-                    vo.setDocumentType(detail.getDocumentType());
-                    vo.setServiceItemsName(detail.getServiceItemsName());
-                    exportList.add(vo);
-                }
-            } else {
-                // 无明细的合同也保留一行头字段
-                ContractManageExportVO vo = new ContractManageExportVO();
-                BeanUtils.copyProperties(contract, vo);
-                exportList.add(vo);
-            }
-        }
-        return exportList;
-    }
-
-    /*
-    * 获取结算对象
-    * */
-    public SettlementCustomersPO getSettlementCustomers(Long shipperId) {
-        try {
-            Long topOrganizationId = null;
-            AjaxResult ajaxResult = bmsServiceFeign.getCustomersInfoBySettlementEntityId(shipperId, topOrganizationId);
-            if (ajaxResult == null || !"200".equals(String.valueOf(ajaxResult.get("code"))) || ajaxResult.get("data") == null) {
-                log.warn("按 settlementEntityId 查询结算对象未成功：shipperId={}, code={}", shipperId, ajaxResult != null ? ajaxResult.get("code") : null);
-                return null;
-            }
-            return JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")), SettlementCustomersPO.class);
-        } catch (Exception e) {
-            log.warn("按 settlementEntityId 查询结算对象异常，shipperId={}", shipperId, e);
-            return null;
-        }
-    }
-
-    /*
-    * 根据结算对象id获取结算对象参数列表
-    * */
-    public List<SettlementCustomersParametersPO> getSettlementCustomersParameters(Long settlementCustomersId) {
-        try {
-            AjaxResult ajaxResult = bmsServiceFeign.getListBySettlementCustomersId(settlementCustomersId);
-            if (ajaxResult == null || !"200".equals(String.valueOf(ajaxResult.get("code"))) || ajaxResult.get("data") == null) {
-                log.warn("按 settlementCustomersId 查询结算对象参数未成功：settlementCustomersId={}, code={}", settlementCustomersId, ajaxResult != null ? ajaxResult.get("code") : null);
-                return null;
-            }
-            return JSON.parseArray(JSON.toJSONString(ajaxResult.get("data")), SettlementCustomersParametersPO.class);
-        } catch (Exception e) {
-            log.warn("按 settlementCustomersId 查询结算对象参数异常，settlementCustomersId={}", settlementCustomersId, e);
-            return null;
-        }
-    }
-
-    public void pushContractManageToBms(String shipperId) {
-        SettlementCustomersPO settlementCustomers = getSettlementCustomers(Long.valueOf(shipperId));
-        if (settlementCustomers == null) {
-            log.warn("pushContractManageToBms 未找到结算对象，shipperId={}", shipperId);
-            return;
-        }
-        Long settlementCustomersId = settlementCustomers.getSettlementCustomersId();
-        List<SettlementCustomersParametersPO> parametersList = getSettlementCustomersParameters(settlementCustomersId);
-        if (parametersList == null || parametersList.isEmpty()) {
-            log.warn("pushContractManageToBms 未找到结算对象参数，settlementCustomersId={}", settlementCustomersId);
-            return;
-        }
-
-        for (SettlementCustomersParametersPO param : parametersList) {
-            String parametersName = param.getParametersName();
-            String content = param.getContent();
-            if (StringUtils.isEmpty(content)) {
-                log.warn("结算对象参数 content 为空，parametersName={}, settlementCustomersId={}", parametersName, settlementCustomersId);
-                continue;
-            }
-            Map<String, Object> contentMap = JSON.parseObject(content, new TypeReference<Map<String, Object>>() {});
-            Integer sfzdcz = Integer.valueOf(contentMap.get("sfzdcz").toString());
-            if (sfzdcz != 1) {
-                log.info("结算对象参数 sfzdcz 不为1，跳过推送，parametersName={}, sfzdcz={}", parametersName, sfzdcz);
-                continue;
-            }
-
-            String warehouseTempLayerType;
-            String serviceItemsName;
-            Boolean isGc = false;
-            if ("冻仓计费配置".equals(parametersName)) {
-                warehouseTempLayerType = "DC";
-                serviceItemsName = "冻仓仓租费用";
-            } else if ("干仓计费配置".equals(parametersName)) {
-                warehouseTempLayerType = "GC";
-                serviceItemsName = "干仓仓租费用";
-                isGc=true;
-            } else {
-                log.warn("未知的结算对象参数类型，parametersName={}", parametersName);
-                continue;
-            }
-
-            List<ContractManage> contractManages = contractManageMapper.selectList(new LambdaQueryWrapper<ContractManage>()
-                    .eq(ContractManage::getContractRentType, "NORMAL")
-                    .eq(ContractManage::getContractState, 2)
-                    .eq(ContractManage::getDelFlag, 1)
-                    .eq(ContractManage::getSettlementCustomersId, settlementCustomersId)
-                    .eq(ContractManage::getWarehouseTempLayerType, warehouseTempLayerType));
-            if (contractManages == null || contractManages.isEmpty()) {
-                log.warn("未找到正式合同，warehouseTempLayerType={}, settlementCustomersId={}", warehouseTempLayerType, settlementCustomersId);
-                continue;
-            }
-            for (ContractManage contractManage : contractManages) {
-                Long contractManageId = contractManage.getContractManageId();
-                ContractManageParameters contractManageParameters = contractManageParametersService.getOne(new LambdaQueryWrapper<ContractManageParameters>()
-                        .eq(ContractManageParameters::getContractManageId, contractManageId), false);
-                if (contractManageParameters == null) {
-                    continue;
-                }
-                String parametersJson = contractManageParameters.getParametersJson();
-                Map<String, Object> parametersMap = JSON.parseObject(parametersJson, new TypeReference<Map<String, Object>>() {});
-                BigDecimal hyj = (BigDecimal) parametersMap.get("hyj");
-                buildBusinessDocument(hyj, settlementCustomers, contractManage, "0D01", "租金（固定租）", warehouseTempLayerType, serviceItemsName);
-            }
-        }
-    }
-
-    private void buildBusinessDocument(BigDecimal fee, SettlementCustomersPO settlementCustomers, ContractManage contractManage, String code, String name, String warehouseType, String serviceItemsName) {
-
-        Long settlementCustomersId = settlementCustomers.getSettlementCustomersId();
-        Long settlementEntityId = settlementCustomers.getSettlementEntityId();
-        String settlementEntity = settlementCustomers.getSettlementEntity();
-        String settlementCustomersCode = settlementCustomers.getSettlementCustomersCode();
-        BusinessDocumentFeign businessDocumentFeign = new BusinessDocumentFeign();
-        businessDocumentFeign.setBillAmount(fee);
-        businessDocumentFeign.setOrganizationId(contractManage.getOrganizationId());
-        businessDocumentFeign.setOrganizationName(contractManage.getOrganizationName());
-        businessDocumentFeign.setTopOrganizationId(contractManage.getTopOrganizationId());
-        businessDocumentFeign.setBelongModuleCode("wms");
-        businessDocumentFeign.setBelongModule("WMS");
-        businessDocumentFeign.setDataSources(1);
-        businessDocumentFeign.setSettlementEntity(settlementEntity);
-        businessDocumentFeign.setSettlementCustomersId(settlementCustomersId);
-        businessDocumentFeign.setSettlementCustomersCode(settlementCustomersCode);
-        businessDocumentFeign.setDocumentTypeId(4l);
-        businessDocumentFeign.setDocumentTypeCode("CM_ZL");
-        businessDocumentFeign.setDocumentType("仓库租赁单");
-        businessDocumentFeign.setFirstSubjectCode(code);
-        businessDocumentFeign.setFirstSubjectName(name);
-        businessDocumentFeign.setBillingTime(new Date());
-        businessDocumentFeign.setServiceItemsCode("GC_CZ");
-        businessDocumentFeign.setServiceItemsName(serviceItemsName);
-        businessDocumentFeign.setSettlementWay(1);
-        businessDocumentFeign.setOriginalBusinessNum(contractManage.getContractNumber());
-        businessDocumentFeign.setWarehouseType(warehouseType);
-        String contractName = contractManage.getContractName();
-        String contractNumber = contractManage.getContractNumber();
-        Long contractManageId = contractManage.getContractManageId();
-        businessDocumentFeign.setContractName(contractName);
-        businessDocumentFeign.setContractNumber(contractNumber);
-        businessDocumentFeign.setContractManageId(contractManageId);
-        businessDocumentFeign.setBusinessFlow(OrderSequence.getOrderCode("LS"));
-        businessDocumentFeign.setIsPush(1);
-        AjaxResult ajaxResult = bmsServiceFeign.feignSaveBusinessDocument(businessDocumentFeign);
-        if (ajaxResult == null || !"200".equals(String.valueOf(ajaxResult.get("code")))) {
-            log.error("保存业务单据失败: {}", ajaxResult != null ? ajaxResult.get("msg") : "feign调用异常");
-        }
-    }
-
-
-    private static final String WEBSERVICE_URL = "http://10.33.0.116:8080/sys/webservice/ngLegalByFindWebserviceService";
-
-    public List<com.alibaba.fastjson.JSONObject> getContractNosByCompanyName(String companyName, int pageNum, int pageSize) {
-        List<com.alibaba.fastjson.JSONObject> contractList = new ArrayList<>();
-
-        try {
-            log.info("=== 开始查询合同列表 ===");
-            log.info("查询公司: {}, 页码: {}, 每页数量: {}", companyName, pageNum, pageSize);
-
-            String httpRequest = buildXmlRequest(companyName, pageNum, pageSize);
-            log.info("XML请求: {}", httpRequest);
-            log.info("XML请求生成完成，长度: {} 字符", httpRequest.length());
-
-            log.info("正在调用WebService...");
-            String httpResponse = HttpWebServiceUtil.callWebService(httpRequest, WEBSERVICE_URL);
-
-            String jsonData = extractJsonFromResponse(httpResponse);
-
-            log.info("正在解析JSON..."+jsonData);
-
-            if (jsonData == null || jsonData.trim().isEmpty()) {
-                log.warn("未提取到JSON数据，返回空列表");
-                return contractList;
-            }
-
-            log.info("提取到JSON数据，长度: {} 字符", jsonData.length());
-
-            List<com.alibaba.fastjson.JSONObject> result = parseContractListFromJson(jsonData);
-            contractList.addAll(result);
-
-            log.info("=== 查询完成 ===");
-            log.info("找到 {} 个合同", contractList.size());
-
-        } catch (Exception e) {
-            log.error("查询合同列表失败", e);
-            throw new RuntimeException("查询合同列表失败: " + e.getMessage(), e);
-        }
-
-        return contractList;
-    }
-
-    /**
-     * 构建XML请求 - 动态分页
-     */
-    private String buildXmlRequest(String companyName, int pageNum, int pageSize) {
-        String jsonParam = "{\"fdName\":\"" + companyName + "\"}";
-
-        return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-                "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"" +
-                " xmlns:web=\"http://webservice.legal.ng.kmss.landray.com/\">" +
-                "<soapenv:Body>" +
-                "<web:findNgLegal>" +
-                "<arg0 xmlns=\"\">" +
-                "<fdPageNo>" + pageNum + "</fdPageNo>" +
-                "<fdRowSize>" + pageSize + "</fdRowSize>" +
-                "<fdRelativePerson><![CDATA[" + jsonParam + "]]></fdRelativePerson>" +
-                "<fdContractNo></fdContractNo>" +
-                "<fdPersonNo>NA0301</fdPersonNo>" +
-                "<fdSponsor></fdSponsor>" +
-                "<docCreateTimeStar></docCreateTimeStar>" +
-                "<docCreateTimeEnd></docCreateTimeEnd>" +
-                "</arg0>" +
-                "</web:findNgLegal>" +
-                "</soapenv:Body>" +
-                "</soapenv:Envelope>";
-    }
-
-    /**
-     * 从SOAP响应中提取JSON
-     */
-    private String extractJsonFromResponse(String soapResponse) {
-        if (soapResponse == null || soapResponse.isEmpty()) {
-            return null;
-        }
-
-        // 直接查找JSON部分
-        int jsonStart = soapResponse.indexOf("{\"returnState\":");
-        int jsonEnd = soapResponse.indexOf("}</return>");
-
-        if (jsonStart != -1 && jsonEnd != -1) {
-            // 找到JSON结束位置
-            jsonEnd = jsonEnd + 1; // 包含右大括号
-
-            String json = soapResponse.substring(jsonStart, jsonEnd);
-            log.info("直接提取JSON成功");
-            return json;
-        }
-
-        // 备用方法：查找<return>标签
-        int start = soapResponse.indexOf("<return>");
-        int end = soapResponse.indexOf("</return>");
-
-        if (start != -1 && end != -1) {
-            start += "<return>".length();
-            String json = soapResponse.substring(start, end);
-
-            // 解码XML实体
-            json = json.replace("&lt;", "<")
-                    .replace("&gt;", ">")
-                    .replace("&amp;", "&")
-                    .replace("&quot;", "\"")
-                    .replace("&apos;", "'");
-
-            log.info("从<return>标签提取JSON成功");
-            return json.trim();
-        }
-
-        log.warn("无法从响应中提取JSON");
-        return null;
-    }
-
-    /**
-     * 解析JSON获取完整合同列表
-     */
-    private List<com.alibaba.fastjson.JSONObject> parseContractListFromJson(String jsonData) {
-        List<com.alibaba.fastjson.JSONObject> contractList = new ArrayList<>();
-
-        try {
-            com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(jsonData);
-
-            String returnState = jsonObject.getString("returnState");
-            if (!"2".equals(returnState)) {
-                log.warn("返回状态异常: {}", returnState);
-                return contractList;
-            }
-
-            JSONArray dataArray = jsonObject.getJSONArray("data");
-            if (dataArray == null || dataArray.isEmpty()) {
-                log.info("查询成功，但未找到合同数据");
-                return contractList;
-            }
-
-            log.info("找到 {} 个合同", dataArray.size());
-
-            for (int i = 0; i < dataArray.size(); i++) {
-                com.alibaba.fastjson.JSONObject contract = dataArray.getJSONObject(i);
-                contractList.add(contract);
-            }
-
-        } catch (Exception e) {
-            log.error("JSON解析失败", e);
-            log.error("原始JSON: {}", jsonData);
-        }
-
-        return contractList;
-    }
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManageParameters/ContractManageParametersApplicationService.java

@@ -1,72 +0,0 @@
-package com.mhd.basic.application.service.contractManageParameters;
-
-import com.mhd.basic.domain.contractManageParameters.repository.po.ContractManageParametersPO;
-import com.mhd.basic.domain.contractManageParameters.repository.todo.ContractManageParametersDO;
-import com.mhd.basic.domain.contractManageParameters.service.ContractManageParametersDomainService;
-import com.mhd.common.security.utils.SecurityUtils;
-import com.mhd.system.api.model.LoginUser;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.List;
-/**
- * 合约信息规则维护表ApplicationService
- *
- * @author gen
- * @date 2024-06-07
- */
-@Service
-@Slf4j
-public class ContractManageParametersApplicationService {
-    @Autowired
-    private ContractManageParametersDomainService contractManageParametersDomainService;
-
-
-    /**
-     * 分页查询合约信息规则维护表列表
-     */
-
-    public List<ContractManageParametersPO> queryList(ContractManageParametersDO contractManageParametersDO) {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (loginUser != null){
-            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-            if (topOrganizationId != null && topOrganizationId != 1){
-                contractManageParametersDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
-            }
-        }
-        return contractManageParametersDomainService.queryList(contractManageParametersDO);
-    }
-
-
-    /**
-     * 新增合约信息规则维护表
-     */
-    public Boolean insert(ContractManageParametersDO contractManageParametersDO) {
-
-        return contractManageParametersDomainService.insert(contractManageParametersDO);
-    }
-
-    /**
-     * 修改合约信息规则维护表
-     */
-    public Boolean update(ContractManageParametersDO contractManageParametersDO) {
-        return contractManageParametersDomainService.update(contractManageParametersDO);
-    }
-
-    /**
-     * 批量删除合约信息规则维护表
-     */
-    public boolean delete(Long[] ids) {
-        return contractManageParametersDomainService.delete(ids);
-    }
-
-    /**
-     * 获取合约信息规则维护表详细信息
-     */
-    public ContractManageParametersPO getInfo(Long id)
-    {
-        return contractManageParametersDomainService.getInfo(id);
-    }
-
-
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/expenseAccount/ExpenseAccountApplicationService.java

@@ -13,7 +13,6 @@ import com.mhd.basic.application.service.contractManage.ContractManageApplicatio
 import com.mhd.basic.domain.expenseAccount.service.ExpenseAccountDomainService;
 import com.mhd.basic.infrastructure.feign.vo.SysDictDataVo;
 import com.mhd.basic.interfaces.dto.expenseAccount.ExpenseAccountDTO;
-import com.mhd.basic.interfaces.dto.expenseAccount.ExpenseAccountExportVO;
 import com.mhd.basic.interfaces.dto.expenseAccount.SearchExpenseAccountDTO;
 import com.mhd.common.core.enums.DictCode;
 import com.mhd.common.core.exception.ServiceException;
@@ -28,11 +27,14 @@ import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.common.core.domain.po.UserPo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -380,55 +382,6 @@ public class ExpenseAccountApplicationService {
         return expenseAccountDomainService.getInfo(expenseAccountId);
     }
 
-    /**
-     * 复制费用科目-获取原科目数据供前端回显
-     * <p>前端拿到数据后回显到新增弹窗，用户填写新科目编码后通过 /edit 接口（id 为空走新增）提交保存。
-     * 清空科目编码是为了避免直接复制出重复编码（费用科目编码无唯一性校验）。</p>
-     */
-    public ExpenseAccountPO copy(ExpenseAccountDTO expenseAccountDTO) {
-        if (expenseAccountDTO == null || expenseAccountDTO.getExpenseAccountId() == null) {
-            throw new ServiceException("原费用科目id不能为空");
-        }
-        // 获取原费用科目信息
-        ExpenseAccountPO original = expenseAccountDomainService.getInfo(expenseAccountDTO.getExpenseAccountId());
-        if (null == original) {
-            throw new ServiceException("原费用科目信息未找到");
-        }
-        // 清空主键，前端提交时走新增
-        original.setExpenseAccountId(null);
-        // 清空科目编码，强制用户输入新编码，避免编码重复
-        original.setSubjectCode(null);
-        // 清空审计字段，新增时由 ExpenseAccountAssembler 重新生成
-        original.setCreateBy(null);
-        original.setCreateByName(null);
-        original.setCreateTime(null);
-        original.setUpdateBy(null);
-        original.setUpdateByName(null);
-        original.setUpdateTime(null);
-        original.setDelFlag(null);
-        // 清空非表字段
-        original.setUnit(null);
-        original.setExpenseAccountPOList(null);
-        return original;
-    }
-
-    /**
-     * 构建费用科目导出数据（不分页全量，按列表页查询条件 + 数据权限过滤）
-     */
-    public List<ExpenseAccountExportVO> buildExportList(ExpenseAccountDO expenseAccountDO) {
-        List<ExpenseAccountExportVO> exportList = new ArrayList<>();
-        List<ExpenseAccountPO> list = this.queryList(expenseAccountDO);
-        if (list == null || list.isEmpty()) {
-            return exportList;
-        }
-        for (ExpenseAccountPO po : list) {
-            ExpenseAccountExportVO vo = new ExpenseAccountExportVO();
-            BeanUtils.copyProperties(po, vo);
-            exportList.add(vo);
-        }
-        return exportList;
-    }
-
     /**
      * 修改状态
      * @param expenseAccountDTO
@@ -627,46 +580,6 @@ public class ExpenseAccountApplicationService {
         return expenseAccountDomainService.getInfoByCode2(subjectCode,topOrganizationId);
     }
 
-    /**
-     * 根据编码和组织ID查询
-     */
-    public ExpenseAccountPO getInfoByOrgAndCode(String subjectCode, Long organizationId) {
-        if(!StringUtils.isNotEmpty(subjectCode)){
-            throw new ServiceException("费用科目编码不能为空");
-        }
-        if(organizationId == null){
-            throw new ServiceException("组织ID不能为空");
-        }
-        ExpenseAccountPO expenseAccountPO = expenseAccountDomainService.getInfoByOrgAndCode(subjectCode, organizationId);
-//        // 组装计费单位列表：单位-单位英文
-//        List<String> unit = new ArrayList<>();
-//        if (expenseAccountPO != null) {
-//            unit.add(expenseAccountPO.getBillingUnit() + "-" + expenseAccountPO.getBillingUnitEn());
-//            unit.add(expenseAccountPO.getBillingUnit2() + "-" + expenseAccountPO.getBillingUnitEn2());
-//            expenseAccountPO.setUnit(unit);
-//        }
-        // 组装计费单位列表(数组)，中文和英文都为null时过滤掉，避免出现"null-null"
-        List<Map<String, String>> unit = new ArrayList<>();
-        if (expenseAccountPO != null) {
-            addUnitIfPresent(unit, expenseAccountPO.getBillingUnit(), expenseAccountPO.getBillingUnitEn());
-            addUnitIfPresent(unit, expenseAccountPO.getBillingUnit2(), expenseAccountPO.getBillingUnitEn2());
-            expenseAccountPO.setUnit(unit);
-        }
-        return expenseAccountPO;
-    }
-
-    /**
-     * 组装计费单位，中文和英文都为null时不加入列表
-     */
-    private void addUnitIfPresent(List<Map<String, String>> unit, String billingUnit, String billingUnitEn) {
-        if (billingUnit == null && billingUnitEn == null) {
-            return;
-        }
-        Map<String, String> unitMap = new HashMap<>();
-        unitMap.put("unit", billingUnit + "-" + billingUnitEn);
-        unit.add(unitMap);
-    }
-
     public List<QueryExpenseAccountPO> selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO){
         setDataPermissionForSearch(searchExpenseAccountDO);
         return expenseAccountDomainService.selectExpenseAccount(searchExpenseAccountDO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java

@@ -157,18 +157,15 @@ public class MaterialBaseInfoApplicationService {
      * @param materialBaseInfoDO
      */
     private void shipperParam(MaterialBaseInfoDO materialBaseInfoDO){
-        Long shipperId = materialBaseInfoDO.getShipperId();
+        AjaxResult ajaxResult = userServiceFeign.getInfo(materialBaseInfoDO.getShipperId());
-        if (shipperId != null && shipperId != 0l) {
+        if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
-            AjaxResult ajaxResult = userServiceFeign.getInfo(materialBaseInfoDO.getShipperId());
+            throw new ServiceException("获取货主信息失败");
-            if(!"200".equals(String.valueOf(ajaxResult.get("code")))){
+        }
-                throw new ServiceException("获取货主信息失败");
+        UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
-            }
+        // 如果原始shipperName不为空，保留原始值（导入或手动输入时应该保留完整名称）
-            UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class);
+        // 只有在原始shipperName为空时，才使用查询到的userName
-            // 如果原始shipperName不为空，保留原始值（导入或手动输入时应该保留完整名称）
+        if (materialBaseInfoDO.getShipperName() == null || materialBaseInfoDO.getShipperName().trim().isEmpty()) {
-            // 只有在原始shipperName为空时，才使用查询到的userName
+            materialBaseInfoDO.setShipperName(userPo.getUserName());
-            if (materialBaseInfoDO.getShipperName() == null || materialBaseInfoDO.getShipperName().trim().isEmpty()) {
-                materialBaseInfoDO.setShipperName(userPo.getUserName());
-            }
         }
     }
 
@@ -185,4 +182,4 @@ public class MaterialBaseInfoApplicationService {
         //return materialBaseInfoDomainService.getMaterialStockList(shipperName,materialName,machineCode,topOrganizationId,pageNum,pageSize);/**/
         return null;
     }
-}
+}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/storageLocation/StorageLocationApplicationService.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSON;
 import com.mhd.basic.domain.storageLocation.repository.po.StorageLocationPO;
 import com.mhd.basic.domain.storageLocation.repository.todo.StorageLocationDO;
 import com.mhd.basic.domain.storageLocation.service.StorageLocationDomainService;
-import com.mhd.basic.interfaces.dto.storageLocation.StorageLocationDTO;
 import com.mhd.basic.domain.storageSection.repository.todo.StorageSectionDO;
 import com.mhd.basic.infrastructure.feign.vo.SysDictDataVo;
 import com.mhd.common.core.domain.po.UserPo;
@@ -208,39 +207,6 @@ public class StorageLocationApplicationService {
         return storageLocationDomainService.getInfo(storageLocationId);
     }
 
-    /**
-     * 复制库位-获取原库位数据供前端回显
-     * 前端拿到数据后跳转到新增库位页面，用户修改编码后通过edit接口提交新增
-     */
-    public StorageLocationPO copyStorageLocation(StorageLocationDTO storageLocationDTO) {
-        if (storageLocationDTO.getStorageLocationId() == null) {
-            throw new ServiceException("原库位id不能为空");
-        }
-        // 获取原库位信息
-        StorageLocationPO originalStorageLocation = storageLocationDomainService.getInfo(storageLocationDTO.getStorageLocationId());
-        if (null == originalStorageLocation) {
-            throw new ServiceException("原库位信息未找到");
-        }
-        // 清空唯一性字段：库位id不清空会导致提交后走修改分支覆盖原库位；
-        // 库位编码同组织同仓库唯一，须由用户重新填写；条码为物理唯一标识，一并清空
-        originalStorageLocation.setStorageLocationId(null);
-        originalStorageLocation.setStorageLocationCode(null);
-        originalStorageLocation.setLocationBarCode(null);
-        // 状态重置为初始值：新库位无库存(空)、启用、未作废
-        originalStorageLocation.setStatus(1);
-        originalStorageLocation.setOpeningUp(1);
-        originalStorageLocation.setNullify(1);
-        // 清空审计字段，提交新增时由Assembler按当前登录人重新生成
-        originalStorageLocation.setCreateBy(null);
-        originalStorageLocation.setCreateByName(null);
-        originalStorageLocation.setCreateTime(null);
-        originalStorageLocation.setUpdateBy(null);
-        originalStorageLocation.setUpdateByName(null);
-        originalStorageLocation.setUpdateTime(null);
-        // 其余业务字段(仓库/库区/库位组、分类/种类/混放策略、限制、长宽高、坐标、备注)保留回显
-        return originalStorageLocation;
-    }
-
     public int getStorageLocationCount(StorageLocationDO storageLocationDO)
     {
         return storageLocationDomainService.getStorageLocationCount(storageLocationDO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/storageSection/StorageSectionApplicationService.java

@@ -21,7 +21,6 @@ import com.mhd.system.service.ISysDictTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.math.BigDecimal;
 import java.util.List;
 /**
  * 库区ApplicationService
@@ -43,32 +42,11 @@ public class StorageSectionApplicationService {
      */
 
     public List<StorageSectionPO> queryList(StorageSectionDO storageSectionDO) {
-        //设置查询数据权限
-        applyQueryDataPermission(storageSectionDO);
-        return storageSectionDomainService.queryList(storageSectionDO);
-    }
-
-    /**
-     * 库区面积合计：与 /list 相同的数据权限和筛选条件，SQL 直接 SUM(库区面积)，
-     * 保证合计数与列表中各行库区面积之和一致
-     */
-    public BigDecimal sumStorageRegion(StorageSectionDO storageSectionDO) {
-        //与 /list 共用同一数据权限，保证合计与列表口径一致
-        applyQueryDataPermission(storageSectionDO);
-        return storageSectionDomainService.sumStorageRegion(storageSectionDO);
-    }
-
-    /**
-     * @description 设置查询数据权限（queryList 与 sumStorageRegion 共用）
-     * @author ZhouGY
-     * @param storageSectionDO
-     */
-    private void applyQueryDataPermission(StorageSectionDO storageSectionDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (loginUser != null && loginUser.getUserPo() != null) {
             Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
             Long frontendOrganizationId = storageSectionDO.getOrganizationId(); // 前端传递的 organizationId
-
+            
             // 数据权限：根据 organizationId 来设置查询权限
             // 当前登录用户的 organizationId 为 2827 时，可查全部组织数据；其他组织只能查自己
             if (userOrganizationId != null && userOrganizationId == 2827L) {
@@ -113,6 +91,7 @@ public class StorageSectionApplicationService {
                 }
             }
         }
+        return storageSectionDomainService.queryList(storageSectionDO);
     }
 
 

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/entity/ContractManage.java

@@ -126,18 +126,6 @@ public class ContractManage extends BaseVOEntity{
     @Excel(name = "其他附件地址")
     private String otherAttachmentsUrl;
 
-    @ApiModelProperty("合同正本附件原始文件名")
-    private String contractOriginalName;
-
-    @ApiModelProperty("廉政协议附件原始文件名")
-    private String integrityAgreementName;
-
-    @ApiModelProperty("安全协议附件原始文件名")
-    private String securityProtocolName;
-
-    @ApiModelProperty("其他附件原始文件名(多文件时与 otherAttachmentsUrl 同分隔符、同顺序)")
-    private String otherAttachmentsName;
-
     @ApiModelProperty("我司签订人")
     @Excel(name = "我司签订人")
     private String ourSinged;
@@ -192,30 +180,4 @@ public class ContractManage extends BaseVOEntity{
     @ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)")
     private Integer transportationCosts;
 
-    @ApiModelProperty("合同租赁类型")
-    private String contractRentType;
-
-    @ApiModelProperty("合同租赁类型")
-    private String contractRentTypeName;
-
-    @ApiModelProperty("仓库温层类型")
-    private String warehouseTempLayerType;
-
-    @ApiModelProperty("仓库温层类型")
-    private String warehouseTempLayerTypeName;
-
-    @ApiModelProperty("续期提前天数")
-    private Integer renewalAdvanceDays;
-
-    @ApiModelProperty("标的物")
-    private String subjectMatter;
-
-    @ApiModelProperty("性质")
-    private String nature;
-
-    @ApiModelProperty("合同最初起始日")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "合同最初起始日", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date initialStartDate;
-
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/po/ContractManagePO.java

@@ -1,7 +1,6 @@
 package com.mhd.basic.domain.contractManage.repository.po;
 
 import com.mhd.basic.domain.contractManageDetail.repository.po.ContractManageDetailPO;
-import com.mhd.basic.domain.contractManageParameters.repository.po.ContractManageParametersPO;
 import com.mhd.basic.interfaces.dto.contractManageDetail.ContractManageDetailDTO;
 import com.mhd.common.core.annotation.Excel;
 import lombok.Data;
@@ -125,18 +124,6 @@ public class ContractManagePO extends BaseVOEntity{
     @Excel(name = "其他附件地址")
     private String otherAttachmentsUrl;
 
-    @ApiModelProperty("合同正本附件原始文件名")
-    private String contractOriginalName;
-
-    @ApiModelProperty("廉政协议附件原始文件名")
-    private String integrityAgreementName;
-
-    @ApiModelProperty("安全协议附件原始文件名")
-    private String securityProtocolName;
-
-    @ApiModelProperty("其他附件原始文件名(多文件时与 otherAttachmentsUrl 同分隔符、同顺序)")
-    private String otherAttachmentsName;
-
     @ApiModelProperty("我司签订人")
     @Excel(name = "我司签订人")
     private String ourSinged;
@@ -196,35 +183,5 @@ public class ContractManagePO extends BaseVOEntity{
 
     @ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)")
     private Integer transportationCosts;
-
-    @ApiModelProperty("客户类型")
-    private String contractRentType;
-
-    @ApiModelProperty("客户类型编码")
-    private String contractRentTypeName;
-
-    @ApiModelProperty("仓库温层类型")
-    private String warehouseTempLayerType;
-
-    @ApiModelProperty("仓库温层类型编码")
-    private String warehouseTempLayerTypeName;
-
     private String isMany;
-
-    @ApiModelProperty("合约信息规则维护列表")
-    private List<ContractManageParametersPO> contractManageParametersList;
-
-    @ApiModelProperty("续期提前天数")
-    private Integer renewalAdvanceDays;
-
-    @ApiModelProperty("标的物")
-    private String subjectMatter;
-
-    @ApiModelProperty("性质")
-    private String nature;
-
-    @ApiModelProperty("合同最初起始日")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "合同最初起始日", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date initialStartDate;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/todo/ContractManageDO.java

@@ -121,18 +121,6 @@ public class ContractManageDO extends BaseVOEntity{
     @Excel(name = "其他附件地址")
     private String otherAttachmentsUrl;
 
-    @ApiModelProperty("合同正本附件原始文件名")
-    private String contractOriginalName;
-
-    @ApiModelProperty("廉政协议附件原始文件名")
-    private String integrityAgreementName;
-
-    @ApiModelProperty("安全协议附件原始文件名")
-    private String securityProtocolName;
-
-    @ApiModelProperty("其他附件原始文件名(多文件时与 otherAttachmentsUrl 同分隔符、同顺序)")
-    private String otherAttachmentsName;
-
     @ApiModelProperty("我司签订人")
     @Excel(name = "我司签订人")
     private String ourSinged;
@@ -226,34 +214,6 @@ public class ContractManageDO extends BaseVOEntity{
     @ApiModelProperty(name = "是否包含运输费用(1-包含，2-包含)")
     private Integer transportationCosts;
 
-    @ApiModelProperty("客户类型")
-    private String contractRentType;
-
-    @ApiModelProperty("客户类型编码")
-    private String contractRentTypeName;
-
-    @ApiModelProperty("仓库温层类型")
-    private String warehouseTempLayerType;
-
-    @ApiModelProperty("仓库温层类型编码")
-    private String warehouseTempLayerTypeName;
-
     @ApiModelProperty("一级费用科目code")
     private String firstSubjectCode;
-
-    @ApiModelProperty("合约信息规则维护JSON")
-    private String parametersJson;
-
-    @ApiModelProperty("续期提前天数")
-    private Integer renewalAdvanceDays;
-
-    @ApiModelProperty("标的物")
-    private String subjectMatter;
-
-    @ApiModelProperty("性质")
-    private String nature;
-
-    @ApiModelProperty("合同最初起始日")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date initialStartDate;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/util/HttpWebServiceUtil.java

@@ -1,96 +0,0 @@
-package com.mhd.basic.domain.contractManage.repository.util;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.*;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.zip.GZIPInputStream;
-
-@Slf4j
-@Component
-public class HttpWebServiceUtil {
-
-    /**
-     * 调用HTTP WebService
-     */
-    public static String callWebService(String requestBody, String endpointUrl) {
-        try {
-            // 创建RestTemplate
-            RestTemplate restTemplate = new RestTemplate();
-
-            // 设置请求头
-            HttpHeaders headers = new HttpHeaders();
-//            headers.setContentType(MediaType.TEXT_XML);
-//            headers.setAccept(Collections.singletonList(MediaType.TEXT_XML));
-            headers.setContentType(MediaType.parseMediaType("text/xml; charset=UTF-8")); // 核心修复
-            headers.setAccept(Collections.singletonList(MediaType.ALL));
-            headers.set("SOAPAction", "");
-            headers.set("User-Agent", "PostmanRuntime/7.26.10");
-            headers.set("Cache-Control", "no-cache");
-            headers.set("Accept-Encoding", "gzip, deflate");
-            headers.set("Connection", "keep-alive");
-
-            // 创建请求实体
-            HttpEntity<String> entity = new HttpEntity<>(requestBody, headers);
-
-            log.info("发送请求到: {}", endpointUrl);
-
-            // 发送请求
-            ResponseEntity<byte[]> response = restTemplate.exchange(
-                    endpointUrl,
-                    HttpMethod.POST,
-                    entity,
-                    byte[].class
-            );
-
-            log.info("响应状态: {}", response.getStatusCode());
-
-            // 处理响应
-            byte[] rawResponse = response.getBody();
-            if (rawResponse == null) {
-                return "";
-            }
-
-            // 检查是否gzip压缩
-            String contentEncoding = response.getHeaders().getFirst("Content-Encoding");
-            String responseBody;
-
-            if ("gzip".equalsIgnoreCase(contentEncoding)) {
-                responseBody = decompressGzip(rawResponse);
-                log.info("已解压gzip响应，长度: {} 字符", responseBody.length());
-            } else {
-                responseBody = new String(rawResponse, StandardCharsets.UTF_8);
-                log.info("响应长度: {} 字符", responseBody.length());
-            }
-
-            return responseBody;
-
-        } catch (Exception e) {
-            log.error("WebService调用失败", e);
-            throw new RuntimeException("WebService调用失败: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * 解压缩GZIP内容
-     */
-    private static String decompressGzip(byte[] compressedData) throws IOException {
-        try (GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream(compressedData));
-             InputStreamReader reader = new InputStreamReader(gis, StandardCharsets.UTF_8)) {
-
-            StringBuilder sb = new StringBuilder();
-            char[] buffer = new char[1024];
-            int len;
-            while ((len = reader.read(buffer)) != -1) {
-                sb.append(buffer, 0, len);
-            }
-            return sb.toString();
-        }
-    }
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/util/XxlJobBusinessConfig.java

@@ -1,20 +0,0 @@
-package com.mhd.basic.domain.contractManage.repository.util;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class XxlJobBusinessConfig {
-
-    @Value("${xxl.job.admin.address}")
-    private String adminAddress;
-
-    @Value("${xxl.job.admin.cookie}")
-    private String adminCookie;
-
-    @Bean
-    public XxlJobOpenApiUtil xxlJobOpenApiUtil() {
-        return new XxlJobOpenApiUtil(adminAddress, adminCookie);
-    }
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/repository/util/XxlJobOpenApiUtil.java

@@ -1,218 +0,0 @@
-package com.mhd.basic.domain.contractManage.repository.util;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 调用XXL‑JOB后台页面接口
- * 列表接口返回JSON，不再返回HTML
- */
-@Slf4j
-public class XxlJobOpenApiUtil {
-
-    private final String adminUrl;
-    private final String cookie;
-
-    public XxlJobOpenApiUtil(String adminUrl, String cookie) {
-        this.adminUrl = StrUtil.removeSuffix(adminUrl, "/");
-        this.cookie = cookie;
-    }
-
-    /**
-     * 新增定时任务 POST /jobinfo/add
-     * @param addReq 请求实体，与浏览器payload字段完全对齐
-     * @return true=新增成功，false=失败
-     */
-    public boolean addJob(JobInfoAddReq addReq) {
-        String url = adminUrl + "/jobinfo/add";
-        try {
-            Map<String, Object> formMap = BeanUtil.beanToMap(addReq);
-            HttpResponse response = HttpRequest.post(url)
-                    .header("Authorization", cookie)
-                    .form(formMap)
-                    .execute();
-            int status = response.getStatus();
-            log.info("[XxlJob] addJob status:{}", status);
-            // 新增成功200重定向到列表页
-            return status == 200 || status == 302;
-        } catch (Exception e) {
-            log.error("[XxlJob] addJob异常", e);
-            return false;
-        }
-    }
-
-    /**
-     * 根据【任务描述+执行器参数】查询jobId
-     * 适配返回JSON格式的pageList接口
-     * @param jobDesc 任务描述
-     * @param executorParam 任务参数(业务shipperId)
-     * @return jobId，查不到返回null
-     */
-    public Integer queryJobIdByDescAndParam(String jobDesc, String executorParam,String jobGroup) {
-        StringBuilder querySb = new StringBuilder();
-        // start length必须
-        querySb.append("start=0&length=10");
-
-        // jobGroup：为空就不拼接这个参数！！不要 jobGroup=""
-        // 你们业务固定jobGroup=3，直接写死3，不用传空
-        if(StrUtil.isNotBlank(jobGroup)){
-            querySb.append("&jobGroup=").append(jobGroup);
-        }
-
-        // jobDesc
-        if(StrUtil.isNotBlank(jobDesc)){
-            querySb.append("&jobDesc=").append(cn.hutool.core.net.URLEncodeUtil.encode(jobDesc));
-        }
-        // executorParam
-        if(StrUtil.isNotBlank(executorParam)){
-            querySb.append("&executorParam=").append(cn.hutool.core.net.URLEncodeUtil.encode(executorParam));
-        }
-        // executorHandler为空，直接不携带
-        // triggerStatus=-1
-        querySb.append("&triggerStatus=-1");
-
-        String url = adminUrl + "/jobinfo/pageList?" + querySb;
-        log.info("[XxlJob] pageList请求url:{}",url);
-        try {
-            HttpResponse response = HttpRequest.get(url)
-                    .header("Authorization", cookie)
-                    .execute();
-
-            String jsonStr = response.body();
-            log.info("[XxlJob] pageList响应:{}",jsonStr);
-            if (StrUtil.isBlank(jsonStr)) {
-                log.warn("[XxlJob] pageList返回空响应");
-                return null;
-            }
-            JSONObject jsonObj = JSON.parseObject(jsonStr);
-            JSONArray jsonArray = jsonObj.getJSONArray("data");
-            if(jsonArray == null){
-                return null;
-            }
-            List<JobPageItem> dataList = jsonArray.toList(JobPageItem.class);
-            if (dataList == null || dataList.isEmpty()) {
-                return null;
-            }
-            for (JobPageItem item : dataList) {
-                if (StrUtil.equals(item.jobDesc, jobDesc) && StrUtil.equals(item.executorParam, executorParam)) {
-                    return item.id;
-                }
-            }
-            return null;
-        } catch (Exception e) {
-            log.error("[XxlJob] queryJobId异常", e);
-            return null;
-        }
-    }
-
-
-    /**
-     * 暂停任务 POST /jobinfo/pause
-     * @param jobId xxl任务id
-     * @return true成功
-     */
-    public boolean pauseJob(Integer jobId) {
-        if (jobId == null) {
-            return false;
-        }
-        String url = adminUrl + "/jobinfo/pause";
-        try {
-            HttpResponse response = HttpRequest.post(url)
-                    .header("Authorization", cookie)
-                    .form("id", jobId)
-                    .execute();
-            return response.getStatus() == 200 || response.getStatus() == 302;
-        } catch (Exception e) {
-            log.error("[XxlJob] pauseJob jobId:{}异常", jobId, e);
-            return false;
-        }
-    }
-
-    /**
-     * 开启任务 POST /jobinfo/start
-     * @param jobId xxl任务id
-     * @return true成功
-     */
-    public boolean startJob(Integer jobId) {
-        if (jobId == null) {
-            return false;
-        }
-        String url = adminUrl + "/jobinfo/start";
-        try {
-            HttpResponse response = HttpRequest.post(url)
-                    .header("Authorization", cookie)
-                    .form("id", jobId)
-                    .execute();
-            return response.getStatus() == 200 || response.getStatus() == 302;
-        } catch (Exception e) {
-            log.error("[XxlJob] startJob jobId:{}异常", jobId, e);
-            return false;
-        }
-    }
-
-    /**
-     * 删除任务 POST /jobinfo/remove
-     * @param jobId xxl任务id
-     * @return true成功
-     */
-    public boolean removeJob(Integer jobId) {
-        if (jobId == null) {
-            return false;
-        }
-        String url = adminUrl + "/jobinfo/remove";
-        try {
-            HttpResponse response = HttpRequest.post(url)
-                    .header("Authorization", cookie)
-                    .form("id", jobId)
-                    .execute();
-            return response.getStatus() == 200 || response.getStatus() == 302;
-        } catch (Exception e) {
-            log.error("[XxlJob] removeJob jobId:{}异常", jobId, e);
-            return false;
-        }
-    }
-
-    /**
-     * pageList 返回data数组中每一项实体
-     */
-    @Data
-    public static class JobPageItem {
-        private Integer id;
-        private String jobDesc;
-        private String executorParam;
-    }
-
-    /**
-     * add接口请求实体，与浏览器F12抓包payload字段一一对应
-     */
-    @Data
-    public static class JobInfoAddReq {
-        private Integer jobGroup;
-        private String jobDesc;
-        private String author;
-        private String alarmEmail;
-        private String scheduleType;
-        private String scheduleConf;
-        private String glueType;
-        private String executorHandler;
-        private String executorParam;
-        private String glueRemark;
-        private String glueSource;
-        private String executorRouteStrategy;
-        private Integer childJobId;
-        private String misfireStrategy;
-        private String executorBlockStrategy;
-        private Integer executorTimeout;
-        private Integer executorFailRetryCount;
-    }
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManage/service/ContractManageDomainService.java

@@ -23,7 +23,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -190,22 +193,6 @@ public class ContractManageDomainService {
     }
 
 
-    /**
-     * 同结算客户+同温层+同租赁类型+使用中 的合同数量（用于唯一性校验）
-     */
-    public long countByUniqueKey(Long settlementCustomersId, String warehouseTempLayerType, String contractRentType, Long excludeId) {
-        LambdaQueryWrapper<ContractManage> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ContractManage::getSettlementCustomersId, settlementCustomersId);
-        wrapper.eq(ContractManage::getWarehouseTempLayerType, warehouseTempLayerType);
-        wrapper.eq(ContractManage::getContractRentType, contractRentType);
-        wrapper.eq(ContractManage::getContractState, 2);
-        wrapper.eq(ContractManage::getDelFlag, 1);
-        if (excludeId != null) {
-            wrapper.ne(ContractManage::getContractManageId, excludeId);
-        }
-        return contractManageService.count(wrapper);
-    }
-
     public ContractManagePO getGeneralContract() {
         ContractManagePO contractManagePO = new ContractManagePO();
         LambdaQueryWrapper<ContractManage> queryWrapper = new LambdaQueryWrapper<>();
@@ -241,6 +228,4 @@ public class ContractManageDomainService {
         }
         return contractManagePO;
     }
-
-
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/entity/ContractManageDetail.java

@@ -98,10 +98,4 @@ public class ContractManageDetail extends BaseVOEntity{
     @ApiModelProperty("单据类型")
     private String documentType;
 
-    @ApiModelProperty("费用类别编码")
-    private String serviceItemsCode;
-
-    @ApiModelProperty("费用类别名称")
-    private String serviceItemsName;
-
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/po/ContractManageDetailPO.java

@@ -97,10 +97,4 @@ public class ContractManageDetailPO extends BaseVOEntity{
     @ApiModelProperty("单据类型")
     private String documentType;
 
-    @ApiModelProperty("费用类别编码")
-    private String serviceItemsCode;
-
-    @ApiModelProperty("费用类别名称")
-    private String serviceItemsName;
-
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/repository/todo/ContractManageDetailDO.java

@@ -102,10 +102,4 @@ public class ContractManageDetailDO extends BaseVOEntity{
 
     @ApiModelProperty("单据类型")
     private String documentType;
-
-    @ApiModelProperty("费用类别编码")
-    private String serviceItemsCode;
-
-    @ApiModelProperty("费用类别名称")
-    private String serviceItemsName;
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageDetail/service/ContractManageDetailDomainService.java

@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 /**
  * 合同管理详情
@@ -96,29 +95,5 @@ public class ContractManageDetailDomainService {
         return resultList;
     }
 
-    /**
-     * 根据多个合同管理id批量查询合同科目详情（一次SQL查询，避免逐合同N+1）
-     * @param contractManageIds 合同管理id集合
-     * @return 合同科目详情列表
-     */
-    public List<ContractManageDetailPO> queryListByManageIds(Collection<Long> contractManageIds) {
-        List<ContractManageDetailPO> resultList = new ArrayList<>();
-        if (contractManageIds == null || contractManageIds.isEmpty()) {
-            return resultList;
-        }
-        LambdaQueryWrapper<ContractManageDetail> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(ContractManageDetail::getContractManageId, contractManageIds);
-        queryWrapper.eq(ContractManageDetail::getDelFlag, 1);
-        List<ContractManageDetail> contractManageDetails = contractManageDetailService.list(queryWrapper);
-        if (contractManageDetails != null && contractManageDetails.size() > 0) {
-            for (ContractManageDetail contractManageDetail : contractManageDetails) {
-                ContractManageDetailPO contractManageDetailPO = new ContractManageDetailPO();
-                BeanUtils.copyProperties(contractManageDetail, contractManageDetailPO);
-                resultList.add(contractManageDetailPO);
-            }
-        }
-        return resultList;
-    }
-
 
 }

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageParameters/entity/ContractManageParameters.java

@@ -1,52 +0,0 @@
-package com.mhd.basic.domain.contractManageParameters.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.mhd.common.core.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
-import com.mhd.common.core.web.domain.BaseVOEntity;
-import lombok.Data;
-
-
-/**
- * 合约信息规则维护表
- *
- * @author gen
- * @date 2024-06-07
- */
-
-@Data
-public class ContractManageParameters extends BaseVOEntity {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("合同管理id")
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty("合同管理id")
-    private Long contractManageId;
-
-    @ApiModelProperty("一级组织表ID")
-    @Excel(name = "一级组织表ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("组织表ID")
-    @Excel(name = "组织表ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("合同编号")
-    @Excel(name = "合同编号")
-    private String contractNumber;
-
-    @ApiModelProperty("合同名称")
-    @Excel(name = "合同名称")
-    private String contractName;
-
-    @ApiModelProperty("合约信息规则维护")
-    @Excel(name = "合约信息规则维护表")
-    private String parametersJson;
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageParameters/repository/facade/IContractManageParametersService.java

@@ -1,47 +0,0 @@
-package com.mhd.basic.domain.contractManageParameters.repository.facade;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mhd.basic.domain.contractManageParameters.entity.ContractManageParameters;
-import com.mhd.basic.domain.contractManageParameters.repository.po.ContractManageParametersPO;
-import com.mhd.basic.domain.contractManageParameters.repository.todo.ContractManageParametersDO;
-
-import java.util.List;
-
-/**
- * 合约信息规则维护表Service接口
- *
- * @author gen
- * @date 2024-06-07
- */
-public interface IContractManageParametersService extends IService<ContractManageParameters>
-{
-    /**
-     * 分页查询合约信息规则维护表列表
-     */
-    public List<ContractManageParametersPO> queryList(ContractManageParametersDO contractManageParametersDO);
-
-    /**
-     * 新增合约信息规则维护表
-     */
-    public Boolean insert(ContractManageParametersDO contractManageParametersDO);
-
-    /**
-     * 修改合约信息规则维护表
-     */
-    public Boolean update(ContractManageParametersDO contractManageParametersDO);
-
-    /**
-     * 批量删除合约信息规则维护表
-     */
-    public Boolean delete(Long[] ids);
-
-    /**
-     * 查询合约信息规则维护表
-     */
-    public ContractManageParametersPO getInfo(Long id);
-
-    /**
-     * 根据合同管理id查询合约信息规则维护列表
-     */
-    List<ContractManageParametersPO> getListByContractManageId(Long contractManageId);
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageParameters/repository/mapper/ContractManageParametersMapper.java

@@ -1,26 +0,0 @@
-package com.mhd.basic.domain.contractManageParameters.repository.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mhd.basic.domain.contractManageParameters.entity.ContractManageParameters;
-import com.mhd.basic.domain.contractManageParameters.repository.po.ContractManageParametersPO;
-import com.mhd.basic.domain.contractManageParameters.repository.todo.ContractManageParametersDO;
-import org.apache.ibatis.annotations.Param;
-/**
- * 合约信息规则维护表Mapper接口
- *
- * @author gen
- * @date 2024-06-07
- */
-public interface ContractManageParametersMapper extends BaseMapper<ContractManageParameters>
-{
-    /**
-     * 查询合约信息规则维护表列表
-     */
-    public List<ContractManageParametersPO> queryList(@Param("contractManageParametersDO") ContractManageParametersDO contractManageParametersDO);
-
-    /**
-     * 根据合同管理id查询合约信息规则维护列表
-     */
-    List<ContractManageParametersPO> getListByContractManageId(@Param("contractManageId") Long contractManageId);
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageParameters/repository/persistence/ContractManageParametersImpl.java

@@ -1,86 +0,0 @@
-package com.mhd.basic.domain.contractManageParameters.repository.persistence;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mhd.basic.domain.contractManageParameters.entity.ContractManageParameters;
-import com.mhd.basic.domain.contractManageParameters.repository.facade.IContractManageParametersService;
-import com.mhd.basic.domain.contractManageParameters.repository.mapper.ContractManageParametersMapper;
-import com.mhd.basic.domain.contractManageParameters.repository.po.ContractManageParametersPO;
-import com.mhd.basic.domain.contractManageParameters.repository.todo.ContractManageParametersDO;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 合约信息规则维护表Service业务层处理
- *
- * @author gen
- * @date 2024-06-07
- */
-@Service
-public class ContractManageParametersImpl extends ServiceImpl<ContractManageParametersMapper, ContractManageParameters> implements IContractManageParametersService{
-    @Autowired
-    private ContractManageParametersMapper contractManageParametersMapper;
-
-    /**
-     * 查询合约信息规则维护表列表
-     */
-    @Override
-    public List<ContractManageParametersPO> queryList(ContractManageParametersDO contractManageParametersDO)
-    {
-        return contractManageParametersMapper.queryList(contractManageParametersDO);
-    }
-
-    /**
-     * 新增合约信息规则维护表
-     */
-    @Override
-    public Boolean insert(ContractManageParametersDO contractManageParametersDO) {
-        ContractManageParameters contractManageParameters = new ContractManageParameters();
-        BeanUtils.copyProperties(contractManageParametersDO,contractManageParameters);
-        return this.save(contractManageParameters);
-    }
-
-    /**
-     * 修改合约信息规则维护表
-     */
-    @Override
-    public Boolean update(ContractManageParametersDO contractManageParametersDO) {
-        ContractManageParameters contractManageParameters = new ContractManageParameters();
-        BeanUtils.copyProperties(contractManageParametersDO,contractManageParameters);
-        return this.updateById(contractManageParameters);
-    }
-
-    /**
-     * 批量删除合约信息规则维护表
-     */
-    @Override
-    public Boolean delete(Long[] ids ) {
-        List<ContractManageParameters> list = new ArrayList<>();
-        for (Long id : ids) {
-            ContractManageParameters contractManageParameters = new ContractManageParameters();
-            contractManageParameters.setId(id);
-            contractManageParameters.setDelFlag(2);
-            list.add(contractManageParameters);
-        }
-        return this.updateBatchById(list);
-    }
-
-    /**
-     * 查询合约信息规则维护表
-     */
-    @Override
-    public ContractManageParametersPO getInfo(Long id) {
-        ContractManageParameters contractManageParameters = this.getById(id);
-        ContractManageParametersPO contractManageParametersPO = new ContractManageParametersPO();
-        BeanUtils.copyProperties(contractManageParameters,contractManageParametersPO);
-        return contractManageParametersPO;
-    }
-
-    @Override
-    public List<ContractManageParametersPO> getListByContractManageId(Long contractManageId) {
-        return contractManageParametersMapper.getListByContractManageId(contractManageId);
-    }
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageParameters/repository/po/ContractManageParametersPO.java

@@ -1,51 +0,0 @@
-package com.mhd.basic.domain.contractManageParameters.repository.po;
-
-import com.mhd.common.core.annotation.Excel;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.mhd.common.core.web.domain.BaseVOEntity;
-
-
-/**
- * 合约信息规则维护表对象 contract_manage_parameters
- *
- * @author gen
- * @date 2024-06-07
- */
-
-@Data
-@ApiModel(value = "合约信息规则维护表对象", description = "合约信息规则维护表响应对象")
-public class ContractManageParametersPO extends BaseVOEntity{
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("合同管理id")
-    private Long id;
-
-    @ApiModelProperty("合同管理id")
-    private Long contractManageId;
-
-    @ApiModelProperty("一级组织表ID")
-    @Excel(name = "一级组织表ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("组织表ID")
-    @Excel(name = "组织表ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("合同编号")
-    @Excel(name = "合同编号")
-    private String contractNumber;
-
-    @ApiModelProperty("合同名称")
-    @Excel(name = "合同名称")
-    private String contractName;
-
-    @ApiModelProperty("合约信息规则维护")
-    @Excel(name = "合约信息规则维护表")
-    private String parametersJson;
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageParameters/repository/todo/ContractManageParametersDO.java

@@ -1,49 +0,0 @@
-package com.mhd.basic.domain.contractManageParameters.repository.todo;
-
-import com.mhd.common.core.annotation.Excel;
-import lombok.Data;
-import io.swagger.annotations.ApiModelProperty;
-import com.mhd.common.core.web.domain.BaseVOEntity;
-
-
-/**
- * 合约信息规则维护表对象 contract_manage_parameters
- *
- * @author gen
- * @date 2024-06-07
- */
-
-@Data
-public class ContractManageParametersDO extends BaseVOEntity{
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("合同管理id")
-    private Long id;
-
-    @ApiModelProperty("合同管理id")
-    private Long contractManageId;
-
-    @ApiModelProperty("一级组织表ID")
-    @Excel(name = "一级组织表ID")
-    private Long topOrganizationId;
-
-    @ApiModelProperty("组织表ID")
-    @Excel(name = "组织表ID")
-    private Long organizationId;
-
-    @ApiModelProperty("组织名称")
-    @Excel(name = "组织名称")
-    private String organizationName;
-
-    @ApiModelProperty("合同编号")
-    @Excel(name = "合同编号")
-    private String contractNumber;
-
-    @ApiModelProperty("合同名称")
-    @Excel(name = "合同名称")
-    private String contractName;
-
-    @ApiModelProperty("合约信息规则维护")
-    @Excel(name = "合约信息规则维护表")
-    private String parametersJson;
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/contractManageParameters/service/ContractManageParametersDomainService.java

@@ -1,105 +0,0 @@
-package com.mhd.basic.domain.contractManageParameters.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.mhd.basic.domain.contractManageParameters.entity.ContractManageParameters;
-import com.mhd.basic.domain.contractManageParameters.repository.facade.IContractManageParametersService;
-import com.mhd.basic.domain.contractManageParameters.repository.po.ContractManageParametersPO;
-import com.mhd.basic.domain.contractManageParameters.repository.todo.ContractManageParametersDO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-/**
- * 合约信息规则维护表
- *
- * @author gen
- * @date 2024-06-07
- */
-@Service
-@Slf4j
-public class ContractManageParametersDomainService {
-
-    @Autowired
-    private IContractManageParametersService contractManageParametersService;
-
-
-    /**
-     * 分页查询合约信息规则维护表列表
-     */
-    public List<ContractManageParametersPO> queryList(ContractManageParametersDO contractManageParametersDO) {
-        return contractManageParametersService.queryList(contractManageParametersDO);
-    }
-
-
-    /**
-     * 新增合约信息规则维护表
-     */
-    public Boolean insert(ContractManageParametersDO contractManageParametersDO) {
-
-        return contractManageParametersService.insert(contractManageParametersDO);
-    }
-
-    /**
-     * 修改合约信息规则维护表
-     */
-    public Boolean update(ContractManageParametersDO contractManageParametersDO) {
-        return contractManageParametersService.update(contractManageParametersDO);
-    }
-
-    /**
-     * 批量删除合约信息规则维护表
-     */
-    public Boolean delete(Long[] ids) {
-        return contractManageParametersService.delete(ids);
-    }
-
-    /**
-     * 获取合约信息规则维护表详细信息
-     */
-    public ContractManageParametersPO getInfo(Long id)
-    {
-        return contractManageParametersService.getInfo(id);
-    }
-
-    /**
-     * 根据合同管理id查询合约信息规则维护列表
-     * @param contractManageId
-     * @return
-     */
-    public List<ContractManageParametersPO> queryListByManageId(Long contractManageId) {
-        List<ContractManageParametersPO> resultList = new ArrayList<>();
-        LambdaQueryWrapper<ContractManageParameters> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ContractManageParameters::getContractManageId,contractManageId);
-        queryWrapper.eq(ContractManageParameters::getDelFlag,1);
-        List<ContractManageParameters> contractManageParametersList = contractManageParametersService.list(queryWrapper);
-        if(contractManageParametersList.size()>0){
-            for (ContractManageParameters contractManageParameters : contractManageParametersList) {
-                ContractManageParametersPO contractManageParametersPO = new ContractManageParametersPO();
-                BeanUtils.copyProperties(contractManageParameters,contractManageParametersPO);
-                resultList.add(contractManageParametersPO);
-            }
-        }
-        return resultList;
-    }
-
-    public List<ContractManageParametersPO> queryListByManageIds(Collection<Long> contractManageIds) {
-        List<ContractManageParametersPO> resultList = new ArrayList<>();
-        if (contractManageIds == null || contractManageIds.isEmpty()) {
-            return resultList;
-        }
-        LambdaQueryWrapper<ContractManageParameters> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(ContractManageParameters::getContractManageId, contractManageIds);
-        queryWrapper.eq(ContractManageParameters::getDelFlag, 1);
-        List<ContractManageParameters> entityList = contractManageParametersService.list(queryWrapper);
-        for (ContractManageParameters entity : entityList) {
-            ContractManageParametersPO po = new ContractManageParametersPO();
-            BeanUtils.copyProperties(entity, po);
-            resultList.add(po);
-        }
-        return resultList;
-    }
-}

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/facade/IExpenseAccountService.java

@@ -58,11 +58,6 @@ public interface IExpenseAccountService extends IService<ExpenseAccount>
      */
     ExpenseAccountPO getInfoByCode(ExpenseAccountDO expenseAccountDO);
 
-    /**
-     * 根据费用科目code和组织ID查询费用信息
-     */
-    ExpenseAccountPO getInfoByOrgAndCode(ExpenseAccountDO expenseAccountDO);
-
     public List<QueryExpenseAccountPO> selectExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO);
 
     public List<QueryExpenseAccountPO> selectOtherExpenseAccount(SearchExpenseAccountDO searchExpenseAccountDO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/mapper/ExpenseAccountMapper.java

@@ -39,11 +39,6 @@ public interface ExpenseAccountMapper extends BaseMapper<ExpenseAccount>
      */
     ExpenseAccountPO getInfoByCode(@Param("expenseAccountDO") ExpenseAccountDO expenseAccountDO);
 
-    /**
-     * 根据费用科目code和组织ID查询费用信息
-     */
-    ExpenseAccountPO getInfoByOrgAndCode(@Param("expenseAccountDO") ExpenseAccountDO expenseAccountDO);
-
     public List<QueryExpenseAccountPO> selectExpenseAccount(@Param("searchExpenseAccountDO") SearchExpenseAccountDO searchExpenseAccountDO);
 
     public List<QueryExpenseAccountPO> selectOtherExpenseAccount(@Param("searchExpenseAccountDO") SearchExpenseAccountDO searchExpenseAccountDO);

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/expenseAccount/repository/persistence/ExpenseAccountImpl.java

@@ -129,11 +129,6 @@ public class ExpenseAccountImpl extends ServiceImpl<ExpenseAccountMapper, Expens
         return expenseAccountMapper.getInfoByCode(expenseAccountDO);
     }
 
-    @Override
-    public ExpenseAccountPO getInfoByOrgAndCode(ExpenseAccountDO expenseAccountDO) {
-        return expenseAccountMapper.getInfoByOrgAndCode(expenseAccountDO);
-    }
-
     /**
      * 系统科目查询
      * 社会车辆：service_items_code='SHCL'，upper_subject_code='shcl_clyf'，society_status=1