From 6ad0a522609a7ac77f237b746bf81d93260f8789 Mon Sep 17 00:00:00 2001 From: xjm Date: Thu, 27 Feb 2025 13:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 56 +- README.md | 4 +- build.bat | 6 +- build.sh | 8 +- .../pom.xml | 8 +- .../src/main/java/com/cowr/common/Const.java | 0 .../common/Interceptor/CorsInterceptor.java | 0 .../Interceptor/ReporterInterceptor.java | 0 .../com/cowr/common/base/BaseController.java | 0 .../java/com/cowr/common/base/BaseModel.java | 0 .../com/cowr/common/base/BaseService.java | 0 .../com/cowr/common/cache/RedisArpCache.java | 0 .../com/cowr/common/ctrl/HomeController.java | 0 .../cowr/common/enums/CustomerTypeEnum.java | 0 .../java/com/cowr/common/enums/Enums.java | 0 .../com/cowr/common/enums/OrderStateEnum.java | 0 .../com/cowr/common/enums/OrderTypeEnum.java | 4 +- .../java/com/cowr/common/enums/RoleEnum.java | 0 .../com/cowr/common/enums/TruckRodState.java | 0 .../com/cowr/common/enums/UserTypeEnum.java | 0 .../cowr/common/handler/GlobalHandler.java | 0 .../com/cowr/common/netty/JSONDecoder.java | 0 .../com/cowr/common/netty/JSONEncoder.java | 0 .../main/java/com/cowr/common/oss/OSSKit.java | 31 +- .../cowr/common/plugin/NettyServerPlugin.java | 0 .../com/cowr/common/plugin/QuartzPlugin.java | 0 .../common/plugin/SocketIOServerPlugin.java | 0 .../common/serializer/CowrSerializer.java | 0 .../java/com/cowr/common/utils/AESUtil.java | 0 .../cowr/common/utils/ChineseNumberUtil.java | 0 .../java/com/cowr/common/utils/DataUtil.java | 0 .../com/cowr/common/utils/DateTimeUtil.java | 0 .../java/com/cowr/common/utils/ImageUtil.java | 0 .../java/com/cowr/common/utils/JsonUtil.java | 0 .../java/com/cowr/common/utils/MathUtil.java | 0 .../java/com/cowr/common/utils/ReqUtil.java | 0 .../java/com/cowr/common/utils/StrUtil.java | 0 .../utils/poimerge/PoiDynamicMarge.java | 0 .../cowr/common/utils/poimerge/PoiModel.java | 0 .../common/validator/CrudParamValidator.java | 0 .../common/validator/CustomerIdValidator.java | 0 .../cowr/common/validator/DayValidator.java | 0 .../cowr/common/validator/MonthValidator.java | 0 .../cowr/common/validator/ParamValidator.java | 0 .../cowr/common/validator/PhoneValidator.java | 0 .../StartAndEndIntervalValidator.java | 0 .../validator/StartAndEndTimeValidator.java | 0 .../cowr/common/validator/YearValidator.java | 0 .../com/cowr/common/view/ActionReporter.java | 0 .../com/cowr/common/view/ExcelRender.java | 0 .../cowr/common/view/JsonRenderFactory.java | 0 .../java/com/cowr/common/view/PageParam.java | 0 .../cowr/common/view/ReportExcelStyle.java | 0 .../java/com/cowr/common/view/Result.java | 0 .../java/com/cowr/model/ActionCmdLog.java | 0 .../java/com/cowr/model/AddSubtractItem.java | 0 .../com/cowr/model/AddSubtractItemRecord.java | 0 .../main/java/com/cowr/model/AuthLicense.java | 0 .../main/java/com/cowr/model/AuthResult.java | 0 .../main/java/com/cowr/model/Blacklist.java | 0 .../src/main/java/com/cowr/model/Cctv.java | 0 .../java/com/cowr/model/CctvChannels.java | 0 .../main/java/com/cowr/model/Customer.java | 0 .../java/com/cowr/model/CustomerContact.java | 0 .../cowr/model/CustomerContractSigned.java | 14 + .../cowr/model/CustomerContractSignedLog.java | 0 .../cowr/model/CustomerContractTemplate.java | 0 .../java/com/cowr/model/CustomerDiscount.java | 0 .../java/com/cowr/model/CustomerPact.java | 0 .../java/com/cowr/model/CustomerReceiver.java | 0 .../java/com/cowr/model/CustomerRegister.java | 0 .../model/CustomerSupermarketProduct.java | 0 .../java/com/cowr/model/CustomerType.java | 0 .../java/com/cowr/model/DeviceConfig.java | 0 .../src/main/java/com/cowr/model/Driver.java | 0 .../main/java/com/cowr/model/HbrsmsLog.java | 16 + .../com/cowr/model/InvoiceInvalidVerify.java | 0 .../main/java/com/cowr/model/InvoiceLog.java | 0 .../java/com/cowr/model/InvoiceReceive.java | 0 .../main/java/com/cowr/model/ModifyLog.java | 0 .../main/java/com/cowr/model/OrderEnd.java | 0 .../com/cowr/model/OrderInvalidVerify.java | 0 .../java/com/cowr/model/OrderPurchase.java | 0 .../main/java/com/cowr/model/OrderSeq.java | 0 .../main/java/com/cowr/model/OrderTemp.java | 0 .../java/com/cowr/model/OrderTransfer.java | 0 .../main/java/com/cowr/model/OrderTrash.java | 0 .../java/com/cowr/model/Ordercluster.java | 0 .../com/cowr/model/OrderclusterTruck.java | 0 .../main/java/com/cowr/model/OssfileLog.java | 0 .../com/cowr/model/PostLicenseResult.java | 0 .../java/com/cowr/model/PrepayCustomer.java | 0 .../java/com/cowr/model/PrepayDetail.java | 0 .../cowr/model/PrepayDetailStateHistory.java | 0 .../main/java/com/cowr/model/PrepayTruck.java | 0 .../java/com/cowr/model/PresellOrder.java | 0 .../src/main/java/com/cowr/model/Product.java | 0 .../com/cowr/model/ProductPriceModify.java | 0 .../com/cowr/model/ProductPriceModifyLog.java | 0 .../main/java/com/cowr/model/Purchase.java | 0 .../java/com/cowr/model/RefundDetail.java | 0 .../cowr/model/RefundDetailStateHistory.java | 0 .../main/java/com/cowr/model/Sandfarm.java | 0 .../src/main/java/com/cowr/model/SmsLog.java | 0 .../java/com/cowr/model/SmsNoticeContact.java | 0 .../src/main/java/com/cowr/model/Stock.java | 0 .../java/com/cowr/model/StockModifyLog.java | 0 .../main/java/com/cowr/model/Supermarket.java | 0 .../model/SupermarketCustomerDistance.java | 0 .../com/cowr/model/SupermarketProduct.java | 0 .../com/cowr/model/SupermarketProductLog.java | 14 + .../model/SupermarketReceiverDistance.java | 0 .../model/SupermarketSandfarmDistance.java | 0 .../java/com/cowr/model/SupermarketYield.java | 0 .../main/java/com/cowr/model/SyncTask.java | 0 .../src/main/java/com/cowr/model/Sysuser.java | 0 .../com/cowr/model/TicketInvalidVerify.java | 0 .../main/java/com/cowr/model/TicketLog.java | 0 .../java/com/cowr/model/TicketReceive.java | 0 .../com/cowr/model/TransPriceConfigSale.java | 0 .../cowr/model/TransPriceConfigTransfer.java | 0 .../com/cowr/model/TransPriceConfigTrash.java | 0 .../java/com/cowr/model/TransPriceLog.java | 14 + .../main/java/com/cowr/model/Transport.java | 0 .../java/com/cowr/model/TransportCompany.java | 0 .../src/main/java/com/cowr/model/Truck.java | 0 .../java/com/cowr/model/TruckWeightLimit.java | 0 .../cowr/model/TruckWeightLimitModifyLog.java | 0 .../main/java/com/cowr/model/_MappingKit.java | 8 +- .../com/cowr/model/base/BaseActionCmdLog.java | 0 .../cowr/model/base/BaseAddSubtractItem.java | 0 .../model/base/BaseAddSubtractItemRecord.java | 0 .../com/cowr/model/base/BaseAuthLicense.java | 0 .../com/cowr/model/base/BaseBlacklist.java | 0 .../java/com/cowr/model/base/BaseCctv.java | 0 .../com/cowr/model/base/BaseCctvChannels.java | 0 .../com/cowr/model/base/BaseCustomer.java | 0 .../cowr/model/base/BaseCustomerContact.java | 0 .../base/BaseCustomerContractSigned.java | 225 ++ .../base/BaseCustomerContractSignedLog.java | 0 .../base/BaseCustomerContractTemplate.java | 0 .../cowr/model/base/BaseCustomerDiscount.java | 0 .../com/cowr/model/base/BaseCustomerPact.java | 0 .../cowr/model/base/BaseCustomerReceiver.java | 0 .../cowr/model/base/BaseCustomerRegister.java | 0 .../base/BaseCustomerSupermarketProduct.java | 0 .../com/cowr/model/base/BaseCustomerType.java | 0 .../com/cowr/model/base/BaseDeviceConfig.java | 0 .../java/com/cowr/model/base/BaseDriver.java | 0 .../com/cowr/model/base/BaseHbrsmsLog.java | 108 + .../model/base/BaseInvoiceInvalidVerify.java | 0 .../com/cowr/model/base/BaseInvoiceLog.java | 0 .../cowr/model/base/BaseInvoiceReceive.java | 0 .../com/cowr/model/base/BaseModifyLog.java | 0 .../com/cowr/model/base/BaseOrderEnd.java | 56 +- .../model/base/BaseOrderInvalidVerify.java | 0 .../cowr/model/base/BaseOrderPurchase.java | 0 .../com/cowr/model/base/BaseOrderSeq.java | 0 .../com/cowr/model/base/BaseOrderTemp.java | 0 .../cowr/model/base/BaseOrderTransfer.java | 23 + .../com/cowr/model/base/BaseOrderTrash.java | 0 .../com/cowr/model/base/BaseOrdercluster.java | 0 .../model/base/BaseOrderclusterTruck.java | 0 .../com/cowr/model/base/BaseOssfileLog.java | 0 .../cowr/model/base/BasePrepayCustomer.java | 0 .../com/cowr/model/base/BasePrepayDetail.java | 0 .../base/BasePrepayDetailStateHistory.java | 0 .../com/cowr/model/base/BasePrepayTruck.java | 0 .../com/cowr/model/base/BasePresellOrder.java | 0 .../java/com/cowr/model/base/BaseProduct.java | 22 + .../model/base/BaseProductPriceModify.java | 0 .../model/base/BaseProductPriceModifyLog.java | 0 .../com/cowr/model/base/BasePurchase.java | 0 .../com/cowr/model/base/BaseRefundDetail.java | 0 .../base/BaseRefundDetailStateHistory.java | 0 .../com/cowr/model/base/BaseSandfarm.java | 0 .../java/com/cowr/model/base/BaseSmsLog.java | 0 .../cowr/model/base/BaseSmsNoticeContact.java | 0 .../java/com/cowr/model/base/BaseStock.java | 0 .../cowr/model/base/BaseStockModifyLog.java | 0 .../com/cowr/model/base/BaseSupermarket.java | 0 .../base/BaseSupermarketCustomerDistance.java | 21 + .../model/base/BaseSupermarketProduct.java | 0 .../model/base/BaseSupermarketProductLog.java | 320 +++ .../base/BaseSupermarketReceiverDistance.java | 0 .../base/BaseSupermarketSandfarmDistance.java | 0 .../cowr/model/base/BaseSupermarketYield.java | 0 .../com/cowr/model/base/BaseSyncTask.java | 0 .../java/com/cowr/model/base/BaseSysuser.java | 2 + .../model/base/BaseTicketInvalidVerify.java | 0 .../com/cowr/model/base/BaseTicketLog.java | 0 .../cowr/model/base/BaseTicketReceive.java | 0 .../model/base/BaseTransPriceConfigSale.java | 0 .../base/BaseTransPriceConfigTransfer.java | 0 .../model/base/BaseTransPriceConfigTrash.java | 0 .../cowr/model/base/BaseTransPriceLog.java | 302 +++ .../com/cowr/model/base/BaseTransport.java | 0 .../cowr/model/base/BaseTransportCompany.java | 92 + .../java/com/cowr/model/base/BaseTruck.java | 0 .../cowr/model/base/BaseTruckWeightLimit.java | 0 .../base/BaseTruckWeightLimitModifyLog.java | 0 .../java/com/cowr/sms/AliyunSmsService.java | 0 .../main/java/com/cowr/ssjygl/CacheData.java | 0 .../actioncmdlog/ActionCmdLogController.java | 0 .../actioncmdlog/ActionCmdLogService.java | 5 +- .../AddSubtractItemRecordService.java | 0 .../authlicense/AuthLicensePKValidator.java | 0 .../authlicense/AuthLicenseService.java | 0 .../authlicense/AuthLicenseValidator.java | 0 .../blacklist/BlacklistPKValidator.java | 0 .../ssjygl/blacklist/BlacklistService.java | 0 .../ssjygl/blacklist/BlacklistValidator.java | 0 .../com/cowr/ssjygl/cctv/CctvController.java | 0 .../com/cowr/ssjygl/cctv/CctvService.java | 0 .../ssjygl/customer/CustomerPKValidator.java | 0 .../cowr/ssjygl/customer/CustomerService.java | 0 .../ssjygl/customer/CustomerValidator.java | 0 .../contact/CustomerContactPKValidator.java | 0 .../contact/CustomerContactService.java | 0 .../contact/CustomerContactValidator.java | 0 .../CustomerDiscountController.java | 0 .../CustomerDiscountPKValidator.java | 0 .../CustomerDiscountService.java | 0 .../CustomerDiscountValidator.java | 0 .../pact/CustomerPactPKValidator.java | 0 .../customer/pact/CustomerPactService.java | 0 .../customer/pact/CustomerPactValidator.java | 0 .../receiver/CustomerReceiverPKValidator.java | 0 .../receiver/CustomerReceiverService.java | 0 .../receiver/CustomerReceiverValidator.java | 0 ...CustomerSupermarketProductPKValidator.java | 0 .../CustomerSupermarketProductService.java | 0 .../CustomerSupermarketProductValidator.java | 0 .../customer/type/CustomerTypeController.java | 0 .../type/CustomerTypePKValidator.java | 0 .../customer/type/CustomerTypeService.java | 11 +- .../customer/type/CustomerTypeValidator.java | 0 .../cowr/ssjygl/driver/DriverPKValidator.java | 0 .../com/cowr/ssjygl/driver/DriverService.java | 0 .../cowr/ssjygl/driver/DriverValidator.java | 0 .../InvoiceInvalidBySnVerifyValidator.java | 0 .../InvoiceInvalidVerifyPKValidator.java | 0 .../InvoiceInvalidVerifyService.java | 0 .../InvoiceInvalidVerifyValidator.java | 0 .../invoice/log/InvoiceLogPKValidator.java | 0 .../ssjygl/invoice/log/InvoiceLogService.java | 0 .../invoice/log/InvoiceLogValidator.java | 0 .../receive/InvoiceReceivePKValidator.java | 0 .../receive/InvoiceReceiveService.java | 0 .../receive/InvoiceReceiveValidator.java | 0 .../ssjygl/modifylog/ModifyLogController.java | 0 .../modifylog/ModifyLogPKValidator.java | 0 .../ssjygl/modifylog/ModifyLogService.java | 0 .../ssjygl/order/OrderCancelValidator.java | 0 .../com/cowr/ssjygl/order/OrderService.java | 0 .../cowr/ssjygl/order/OrderSnValidator.java | 0 .../ssjygl/order/OrderStateValidator.java | 0 .../com/cowr/ssjygl/order/SnValidator.java | 0 .../OrderInvalidVerifyPKValidator.java | 0 .../OrderInvalidVerifyService.java | 0 .../OrderInvalidVerifyValidator.java | 0 .../ordercluster/OrderclusterPKValidator.java | 0 .../ordercluster/OrderclusterService.java | 227 +- .../ordercluster/OrderclusterValidator.java | 0 .../PresellOrderclusterValidator.java | 0 .../truck/OrderclusterTruckPKValidator.java | 0 .../truck/OrderclusterTruckService.java | 14 +- .../truck/OrderclusterTruckValidator.java | 0 .../order/orderend/OrderEndService.java | 64 +- .../OrderPurchasePKValidator.java | 0 .../orderpurchase/OrderPurchaseService.java | 0 .../order/ordertemp/OrderTempPKValidator.java | 0 .../order/ordertemp/OrderTempService.java | 10 +- .../OrderTransferPKValidator.java | 0 .../ordertransfer/OrderTransferService.java | 0 .../ordertrash/OrderTrashPKValidator.java | 0 .../order/ordertrash/OrderTrashService.java | 0 .../cowr/ssjygl/overall/OverallService.java | 176 +- .../com/cowr/ssjygl/prepay/PrepayService.java | 2 +- .../prepaycustomer/PrepayCustomerService.java | 0 .../prepaydetail/PrepayDetailPKValidator.java | 0 .../prepaydetail/PrepayDetailService.java | 0 .../prepaydetail/PrepayDetailValidator.java | 0 .../PrepayDetailVerifyValidator.java | 0 .../prepay/prepaytruck/DayValidator.java | 0 .../prepaytruck/PrepayTruckPKValidator.java | 0 .../prepaytruck/PrepayTruckService.java | 0 .../prepaytruck/PrepayTruckValidator.java | 0 .../RefundDetailConfirmValidator.java | 0 .../refunddetail/RefundDetailPKValidator.java | 0 .../refunddetail/RefundDetailService.java | 0 .../refunddetail/RefundDetailValidator.java | 0 .../RefundDetailVerifyValidator.java | 0 .../presellorder/PresellOrderService.java | 315 ++- .../ssjygl/product/ProductPKValidator.java | 0 .../cowr/ssjygl/product/ProductService.java | 22 +- .../cowr/ssjygl/product/ProductValidator.java | 0 .../ProductPriceModifyPKValidator.java | 0 .../ProductPriceModifyService.java | 0 .../ProductPriceModifyValidator.java | 0 .../ssjygl/purchase/PurchasePKValidator.java | 0 .../cowr/ssjygl/purchase/PurchaseService.java | 0 .../ssjygl/purchase/PurchaseValidator.java | 0 .../ssjygl/sandfarm/SandfarmPKValidator.java | 0 .../cowr/ssjygl/sandfarm/SandfarmService.java | 12 + .../ssjygl/sandfarm/SandfarmValidator.java | 0 .../ssjygl/sms/log/SmsLogPKValidator.java | 0 .../cowr/ssjygl/sms/log/SmsLogService.java | 0 .../SmsNoticeContactPKValidator.java | 0 .../SmsNoticeContactValidator.java | 0 .../stat/customer/CustomerStatService.java | 0 .../stat/invoice/InvoiceUseController.java | 0 .../stat/invoice/InvoiceUseService.java | 2 +- .../purchase/OrderPurchaseStatController.java | 0 .../purchase/OrderPurchaseStatService.java | 0 .../ssjygl/stat/sale/OrderStatService.java | 1912 ++++++++++++----- .../transfer/OrderTransferStatController.java | 0 .../transfer/OrderTransferStatService.java | 0 .../supermarket/SupermarketIdValidator.java | 0 .../supermarket/SupermarketPKValidator.java | 0 .../supermarket/SupermarketService.java | 10 +- .../supermarket/SupermarketValidator.java | 0 ...upermarketCustomerDistancePKValidator.java | 0 .../SupermarketCustomerDistanceService.java | 6 +- .../SupermarketCustomerDistanceValidator.java | 0 .../SupermarketProductLogPKValidator.java | 24 + .../product/SupermarketProductLogService.java | 87 + .../SupermarketProductLogValidator.java | 46 + .../product/SupermarketProductService.java | 0 ...upermarketReceiverDistancePKValidator.java | 0 .../SupermarketReceiverDistanceService.java | 0 .../SupermarketReceiverDistanceValidator.java | 0 ...upermarketSandfarmDistancePKValidator.java | 0 .../SupermarketSandfarmDistanceService.java | 141 ++ .../SupermarketSandfarmDistanceValidator.java | 0 .../supermarket/stock/StockPKValidator.java | 0 .../supermarket/stock/StockService.java | 0 .../supermarket/stock/StockValidator.java | 0 .../yield/SupermarketYieldService.java | 0 .../system/sysuser/SysuserPKValidator.java | 0 .../system/sysuser/SysuserValidator.java | 0 .../TicketInvalidVerifyPKValidator.java | 0 .../TicketInvalidVerifyService.java | 6 + .../TicketInvalidVerifyValidator.java | 0 .../ticket/log/TicketLogPKValidator.java | 0 .../ssjygl/ticket/log/TicketLogService.java | 7 +- .../ssjygl/ticket/log/TicketLogValidator.java | 0 .../receive/TicketReceivePKValidator.java | 0 .../ticket/receive/TicketReceiveService.java | 7 +- .../receive/TicketReceiveValidator.java | 0 .../ssjygl/transport/LicenseValidator.java | 0 .../ssjygl/transport/PostWeightValidator.java | 0 .../transport/TransportIdValidator.java | 0 .../ssjygl/transport/TransportService.java | 6 +- .../TransportCompanyPKValidator.java | 3 +- .../TransportCompanyService.java | 8 +- .../TransportCompanyValidator.java | 8 +- .../transprice/CaleTransPriceValidator.java | 0 .../transprice/TransPriceController.java | 4 +- .../ssjygl/transprice/TransPriceModel.java | 0 .../ssjygl/transprice/TransPriceService.java | 66 +- .../TransPriceLogPKValidator.java | 24 + .../transpricelog/TransPriceLogService.java | 77 + .../transpricelog/TransPriceLogValidator.java | 60 + .../cowr/ssjygl/truck/TruckPKValidator.java | 0 .../com/cowr/ssjygl/truck/TruckService.java | 9 +- .../com/cowr/ssjygl/truck/TruckValidator.java | 8 +- .../TruckWeightLimitPKValidator.java | 0 .../TruckWeightLimitValidator.java | 0 .../TruckWeightLimitModifyLogController.java | 0 .../TruckWeightLimitModifyLogPKValidator.java | 0 .../TruckWeightLimitModifyLogService.java | 0 .../TruckWeightLimitModifyLogValidator.java | 0 .../java/generator/BaseModelGenerator.java | 0 .../src/main/java/generator/ColumnMeta.java | 0 .../main/java/generator/CrudGenerator.java | 0 .../generator/DataDictionaryGenerator.java | 0 .../src/main/java/generator/Generator.java | 0 .../src/main/java/generator/Main.java | 0 .../java/generator/MappingKitGenerator.java | 0 .../src/main/java/generator/MetaBuilder.java | 0 .../main/java/generator/ModelGenerator.java | 0 .../src/main/java/generator/TableMeta.java | 0 .../src/main/resources/db.properties | 8 + .../generator/base_model_template.jf | 0 .../generator/controller_template.jf | 0 .../generator/mapping_kit_template.jf | 0 .../resources/generator/model_template.jf | 0 .../generator/pkvalidator_template.jf | 0 .../resources/generator/service_template.jf | 0 .../resources/generator/validator_template.jf | 0 ssjygl-xsct-local/build.sh | 8 + ssjygl-xsct-local/debug.sh | 6 + .../package.xml | 0 .../pom.xml | 12 +- .../actioncmdlog/ActionCmdLogSyncService.java | 0 .../authlicense/AuthLicenseController.java | 0 .../authlicense/AuthLicenseSyncService.java | 0 .../local/ssjygl/base/BaseSyncService.java | 0 .../ssjygl/blacklist/BlacklistController.java | 0 .../blacklist/BlacklistSyncService.java | 0 .../local/ssjygl/cache/CacheController.java | 0 .../ssjygl/customer/CustomerController.java | 2 +- .../customer/CustomerDiscountController.java | 0 .../contact/CustomerContactController.java | 0 .../customer/pact/CustomerPactController.java | 0 .../receiver/CustomerReceiverController.java | 0 .../CustomerSupermarketProductController.java | 0 .../local/ssjygl/devicectrl/common/Const.java | 0 .../devicectrl/common/DeviceThread.java | 6 +- .../devicectrl/controllers/Controller.java | 0 .../devicectrl/controllers/InController.java | 0 .../devicectrl/controllers/OutController.java | 4 +- .../ssjygl/devicectrl/device/AbsScale.java | 0 .../ssjygl/devicectrl/device/Camera.java | 0 .../devicectrl/device/CameraController.java | 398 ++-- .../ssjygl/devicectrl/device/Device.java | 0 .../devicectrl/device/DingsongScale.java | 0 .../ssjygl/devicectrl/device/KeLiScale.java | 0 .../local/ssjygl/devicectrl/device/LED.java | 0 .../ssjygl/devicectrl/device/LEDThread.java | 0 .../local/ssjygl/devicectrl/device/PLC.java | 0 .../ssjygl/devicectrl/device/Printer.java | 0 .../ssjygl/devicectrl/device/XiShuiScale.java | 0 .../ssjygl/devicectrl/device/YaoHuaScale.java | 0 .../devicectrl/printer/CellAddresses.java | 0 .../devicectrl/printer/ExcelHelper.java | 0 .../devicectrl/printer/JsdCellAddresses.java | 0 .../devicectrl/printer/QRcodeZxingUtil.java | 0 .../local/ssjygl/devicectrl/utils/CRC16.java | 0 .../devicectrl/utils/LicenseJPGPair.java | 0 .../local/ssjygl/driver/DriverController.java | 0 .../local/ssjygl/file/OssFileController.java | 0 .../local/ssjygl/hbrsms/BaseHbrsmsLog.java | 108 + .../com/cowr/local/ssjygl/hbrsms/Hbrsms.java | 125 ++ .../cowr/local/ssjygl/hbrsms/HbrsmsJob.java | 19 + .../cowr/local/ssjygl/hbrsms/HbrsmsLog.java | 16 + .../local/ssjygl/hbrsms/HbrsmsService.java | 246 +++ .../InvoiceInvalidVerifyController.java | 0 .../InvoiceInvalidVerifySyncService.java | 0 .../invoice/log/InvoiceLogController.java | 0 .../invoice/log/InvoiceLogSyncService.java | 0 .../receive/InvoiceReceiveController.java | 0 .../jobs/CheckUndonOrderclusterJob.java | 0 .../local/ssjygl/jobs/ClearTempFileJob.java | 7 + .../ssjygl/jobs/CustomerDiscountJob.java | 0 .../com/cowr/local/ssjygl/jobs/SyncJob.java | 0 .../local/ssjygl/main/AuthInterceptor.java | 0 .../cowr/local/ssjygl/main/CliCacheData.java | 0 .../com/cowr/local/ssjygl/main/Config.java | 38 +- .../java/com/cowr/local/ssjygl/main/Main.java | 0 .../modifylog/ModifyLogSyncService.java | 0 .../local/ssjygl/netty/AbstractClient.java | 0 .../com/cowr/local/ssjygl/netty/EndPoint.java | 0 .../cowr/local/ssjygl/netty/NettyClient.java | 0 .../local/ssjygl/netty/SocketIOService.java | 0 .../local/ssjygl/order/LocalOrderService.java | 0 .../OrderInvalidVerifyController.java | 0 .../OrderInvalidVerifySyncService.java | 0 .../ordercluster/OrderclusterController.java | 25 + .../truck/OrderclusterTruckController.java | 5 +- .../OrderPurchaseController.java | 3 +- .../OrderPurchasePayValidator.java | 0 .../OrderPurchaseSyncService.java | 8 +- .../order/orderseq/OrderSeqService.java | 0 .../order/ordertemp/OrderTempController.java | 12 +- .../ordertemp/OrderTempPayValidator.java | 0 .../ordertemp/OrderTempPrepayValidator.java | 0 .../order/ordertemp/OrderTempSyncService.java | 15 +- .../OrderTransferController.java | 5 +- .../OrderTransferPayValidator.java | 2 +- .../OrderTransferSyncService.java | 18 +- .../ordertrash/OrderTrashController.java | 0 .../ordertrash/OrderTrashPayValidator.java | 0 .../ordertrash/OrderTrashSyncService.java | 2 +- .../ssjygl/ossfilelog/OssfileLogService.java | 0 .../ssjygl/overall/OverallController.java | 0 .../local/ssjygl/prepay/PrepayController.java | 0 .../prepaydetail/PrepayDetailController.java | 0 .../prepay/prepaytruck/DayValidator.java | 0 .../prepaytruck/PrepayTruckController.java | 0 .../prepaytruck/PrepayTruckSyncService.java | 0 .../prepaytruck/PrepayTruckValidator.java | 0 .../refunddetail/RefundDetailController.java | 0 .../presellorder/PresellOrderController.java | 13 +- .../ssjygl/product/ProductController.java | 8 +- .../ssjygl/purchase/PurchaseController.java | 2 +- .../ssjygl/sandfarm/SandfarmController.java | 2 +- .../ssjygl/sms/log/SmsLogController.java | 0 .../ssjygl/stat/sale/OrderStatController.java | 18 +- .../supermarket/SupermarketController.java | 2 +- ...SupermarketCustomerDistanceController.java | 0 ...SupermarketReceiverDistanceController.java | 0 ...SupermarketSandfarmDistanceController.java | 8 + .../supermarket/stock/StockController.java | 0 .../supermarket/stock/StockSyncService.java | 6 +- .../yield/SupermarketYieldController.java | 0 .../ssjygl/synctask/SyncTaskService.java | 88 +- .../system/sysuser/SysuserController.java | 0 .../system/sysuser/SysuserSyncService.java | 0 .../TicketInvalidVerifyController.java | 3 +- .../TicketInvalidVerifySyncService.java | 0 .../ticket/log/TicketLogController.java | 3 +- .../ticket/log/TicketLogSyncService.java | 0 .../receive/TicketReceiveController.java | 3 +- .../ssjygl/transport/CmdLicenseValidator.java | 0 .../transport/ManualCreateValidator.java | 0 .../transport/ManualWeightValidator.java | 0 .../local/ssjygl/transport/MemoValidator.java | 0 .../ssjygl/transport/PaySginValidator.java | 0 .../ssjygl/transport/TransportController.java | 0 .../transport/TransportDeviceService.java | 0 .../transport/TransportQueryController.java | 13 +- .../transport/TransportQueryService.java | 60 + .../transport/TransportSyncService.java | 0 .../TransportCompanyController.java | 2 +- .../local/ssjygl/truck/TruckController.java | 4 +- .../TruckWeightLimitController.java | 0 .../TruckWeightLimitSyncService.java | 0 .../src/main/resources/dev/config.properties | 8 +- .../src/main/resources/dev/db.properties | 22 + .../src/main/resources/dev/undertow.txt | 0 .../src/main/resources/job.properties | 6 +- .../src/main/resources/log4j.properties | 8 +- .../src/main/resources/logging.properties | 0 .../src/main/resources/prod/config.properties | 10 +- .../src/main/resources/prod/db.properties | 12 + .../src/main/resources/prod/undertow.txt | 0 .../src/main/resources/tpl.xlsx | Bin .../src/main/resources/tpl_bill_full.xlsx | Bin .../src/main/resources/tpl_完整版.xlsx | Bin .../src/main/resources/tpl_结算单.xlsx | Bin .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.html | 4 +- .../src/main/webapp/index.jsp | 0 .../start.bat | 0 .../start.sh | 0 ssjygl-xsct-service/build.sh | 8 + ssjygl-xsct-service/debug.sh | 6 + .../package.xml | 0 .../pom.xml | 20 +- .../Interceptor/UpdateOnlyListener.java | 1 + .../AddSubtractItemController.java | 0 .../AddSubtractItemPKValidator.java | 0 .../AddSubtractItemService.java | 0 .../AddSubtractItemValidator.java | 0 .../AddSubtractItemRecordController.java | 0 .../AddSubtractItemRecordPKValidator.java | 0 .../AddSubtractItemRecordService.java | 0 .../AddSubtractItemRecordValidator.java | 0 .../authlicense/AuthLicenseSyncService.java | 0 .../service/ssjygl/base/BaseSyncService.java | 0 .../ssjygl/blacklist/BlacklistController.java | 0 .../blacklist/BlacklistSyncService.java | 0 .../service/ssjygl/cache/CacheController.java | 0 .../ssjygl/customer/CustomerController.java | 2 +- .../ssjygl/customer/CustomerSyncService.java | 0 .../contact/CustomerContactController.java | 0 .../contact/CustomerContactSyncService.java | 0 .../CustomerContractSignedController.java | 117 + .../CustomerContractSignedPKValidator.java | 24 + .../CustomerContractSignedService.java | 203 ++ .../CustomerContractSignedValidator.java | 36 + .../CustomerContractSignedLogController.java | 10 +- .../CustomerContractSignedLogPKValidator.java | 0 .../CustomerContractSignedLogService.java | 0 .../CustomerContractSignedLogValidator.java | 0 .../CustomerContractTemplateController.java | 0 .../CustomerContractTemplatePKValidator.java | 0 .../CustomerContractTemplateService.java | 2 +- .../CustomerContractTemplateValidator.java | 0 .../contracttemplate/Word2HtmlStr.java | 5 +- .../CustomerDiscountController.java | 0 .../CustomerDiscountPKValidator.java | 0 .../CustomerDiscountSyncService.java | 0 .../CustomerDiscountValidator.java | 0 .../customer/pact/CustomerPactController.java | 0 .../pact/CustomerPactSyncService.java | 0 .../receiver/CustomerReceiverController.java | 0 .../receiver/CustomerReceiverSyncService.java | 0 .../register/CustomerRegisterController.java | 0 .../register/CustomerRegisterService.java | 0 .../CustomerRegisterVerifyValidator.java | 0 .../CustomerSupermarketProductController.java | 0 ...CustomerSupermarketProductSyncService.java | 0 .../ssjygl/driver/DriverController.java | 0 .../ssjygl/driver/DriverSyncService.java | 0 .../InvoiceInvalidVerifyController.java | 0 .../InvoiceInvalidVerifySyncService.java | 0 .../InvoiceInvalidVerifyValidator.java | 0 .../invoice/log/BatchSaveValidator.java | 0 .../invoice/log/InvoiceLogController.java | 0 .../invoice/log/InvoiceLogSyncService.java | 0 .../receive/InvoiceReceiveController.java | 0 .../receive/InvoiceReceiveSyncService.java | 0 .../ssjygl/jobs/CheckExceptionDataJob.java | 0 .../ssjygl/jobs/CheckPrepaySurplusJob.java | 0 .../jobs/CheckUndonOrderclusterJob.java | 0 .../ssjygl/jobs/CleanOSSBakFileJob.java | 4 +- .../ssjygl/jobs/CustomerDiscountJob.java | 0 .../service/ssjygl/jobs/LoadStatCacheJob.java | 55 + .../cowr/service/ssjygl/jobs/OrderEndJob.java | 0 .../cowr/service/ssjygl/jobs/StatSmsJob.java | 0 .../com/cowr/service/ssjygl/jobs/SyncJob.java | 0 .../service/ssjygl/main/AuthInterceptor.java | 0 .../com/cowr/service/ssjygl/main/Config.java | 8 +- .../com/cowr/service/ssjygl/main/Main.java | 0 .../service/ssjygl/main/SvrCacheData.java | 0 .../service/ssjygl/netty/NettyServer.java | 2 +- .../OrderInvalidVerifyController.java | 0 .../OrderInvalidVerifySyncService.java | 0 .../ordercluster/EditClusterValidator.java | 0 .../EditTempClusterValidator.java | 0 .../ordercluster/ForwardClusterValidator.java | 0 .../ordercluster/ForwardTempValidator.java | 0 .../ordercluster/OrderclusterController.java | 107 +- .../OrderclusterEditValidator.java | 0 .../ordercluster/OrderclusterSyncService.java | 497 ++++- .../ordercluster/SaveClusterValidator.java | 0 .../order/ordercluster/SaveValidator.java | 0 .../truck/OrderclusterTruckController.java | 3 +- .../truck/OrderclusterTruckSyncService.java | 0 .../OrderPurchaseController.java | 0 .../order/ordertemp/OrderTempController.java | 3 +- .../order/ordertemp/OrderTempSyncService.java | 3 +- .../OrderTransferController.java | 0 .../ordertrash/OrderTrashController.java | 0 .../ssjygl/overall/OverallCacheService.java | 0 .../ssjygl/overall/OverallController.java | 12 +- .../ssjygl/prepay/PrepayController.java | 0 .../PrepayCustomerController.java | 0 .../PrepayCustomerSyncService.java | 0 .../prepaydetail/PrepayDetailController.java | 0 .../prepaydetail/PrepayDetailSyncService.java | 0 .../PrepayDetailVerifyValidator.java | 0 .../prepay/prepaytruck/DayValidator.java | 0 .../prepaytruck/PrepayTruckController.java | 0 .../prepaytruck/PrepayTruckSyncService.java | 0 .../prepaytruck/PrepayTruckValidator.java | 0 .../RefundDetailConfirmValidator.java | 0 .../refunddetail/RefundDetailController.java | 0 .../refunddetail/RefundDetailSyncService.java | 0 .../RefundDetailVerifyValidator.java | 0 .../presellorder/PresellOrderController.java | 25 +- .../presellorder/PresellOrderPKValidator.java | 0 .../presellorder/PresellOrderSyncService.java | 523 ++--- .../presellorder/PresellOrderValidator.java | 0 .../ssjygl/product/ProductController.java | 8 +- .../ssjygl/product/ProductSyncService.java | 0 .../ProductPriceModifyController.java | 0 .../ProductPriceModifySyncService.java | 0 .../ProductPriceModifyVerifyValidator.java | 0 .../ssjygl/purchase/PurchaseController.java | 2 +- .../ssjygl/purchase/PurchaseSyncService.java | 0 .../ssjygl/sandfarm/SandfarmController.java | 10 +- .../ssjygl/sandfarm/SandfarmSyncService.java | 0 .../ssjygl/sms/log/SmsLogController.java | 0 .../service/ssjygl/sms/log/SmsService.java | 7 +- .../SmsNoticeContactController.java | 0 .../SmsNoticeContactService.java | 0 .../stat/customer/CustomerStatController.java | 0 .../ssjygl/stat/sale/OrderStatController.java | 86 +- .../supermarket/SupAddProductValidator.java | 0 .../supermarket/SupEditProductValidator.java | 0 .../SupRemoveProductValidator.java | 0 .../supermarket/SupermarketController.java | 2 +- .../supermarket/SupermarketSyncService.java | 9 +- ...SupermarketCustomerDistanceController.java | 8 +- ...upermarketCustomerDistanceSyncService.java | 8 +- .../SupermarketProductLogController.java | 171 ++ .../SupermarketProductLogSyncService.java | 157 ++ ...SupermarketReceiverDistanceController.java | 0 ...upermarketReceiverDistanceSyncService.java | 0 ...SupermarketSandfarmDistanceController.java | 10 + ...upermarketSandfarmDistanceSyncService.java | 3 +- .../supermarket/stock/StockController.java | 0 .../yield/SupermarketYieldController.java | 0 .../yield/SupermarketYieldPKValidator.java | 0 .../yield/SupermarketYieldSyncService.java | 0 .../yield/SupermarketYieldValidator.java | 0 .../ssjygl/synctask/SyncTaskService.java | 23 +- .../system/sysuser/RegisterUserValidator.java | 0 .../system/sysuser/SysuserController.java | 8 +- .../sysuser/SysuserCustomerValidator.java | 0 .../system/sysuser/SysuserSyncService.java | 5 +- .../TicketInvalidVerifyController.java | 3 +- .../TicketInvalidVerifySyncService.java | 0 .../TicketInvalidVerifyValidator.java | 0 .../ticket/log/TicketLogController.java | 3 +- .../ticket/log/TicketLogSyncService.java | 0 .../receive/TicketReceiveController.java | 3 +- .../receive/TicketReceiveSyncService.java | 0 .../transport/TransportQueryController.java | 3 +- .../TransportCompanyController.java | 7 +- .../TransportCompanySyncService.java | 0 .../TransPriceLogController.java | 137 ++ .../TransPriceLogSyncService.java | 7 + .../service/ssjygl/truck/TruckController.java | 8 +- .../ssjygl/truck/TruckSyncService.java | 0 .../TruckWeightLimitController.java | 0 .../TruckWeightLimitService.java | 0 .../main/java/dataadjustment/ExcelUtils.java | 460 ++-- .../src/main/java/dataadjustment/Main.java | 588 ++--- .../src/main/resources/dev/config.properties | 34 +- .../src/main/resources/dev/db.properties | 22 + .../src/main/resources/dev/undertow.txt | 2 +- .../src/main/resources/job.properties | 0 .../src/main/resources/log4j.properties | 10 +- .../src/main/resources/logging.properties | 0 .../src/main/resources/prod/config.properties | 38 +- .../src/main/resources/prod/undertow.txt | 2 +- .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.jsp | 0 .../start.bat | 0 .../start.sh | 0 .../SupermarketSandfarmDistanceService.java | 76 - .../src/main/resources/db.properties | 8 - ssjygl-xsx-local/build.sh | 8 - ssjygl-xsx-local/debug.sh | 6 - .../src/main/resources/dev/db.properties | 22 - .../src/main/resources/prod/db.properties | 11 - ssjygl-xsx-service/build.sh | 8 - ssjygl-xsx-service/debug.sh | 6 - .../service/ssjygl/jobs/LoadStatCacheJob.java | 43 - .../src/main/resources/dev/db.properties | 22 - 725 files changed, 7664 insertions(+), 2202 deletions(-) rename {ssjygl-xsx-common => ssjygl-xsct-common}/pom.xml (96%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/Const.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/base/BaseController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/base/BaseModel.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/base/BaseService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/cache/RedisArpCache.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/ctrl/HomeController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/enums/CustomerTypeEnum.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/enums/Enums.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/enums/OrderStateEnum.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/enums/OrderTypeEnum.java (97%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/enums/RoleEnum.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/enums/TruckRodState.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/enums/UserTypeEnum.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/handler/GlobalHandler.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/netty/JSONDecoder.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/netty/JSONEncoder.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/oss/OSSKit.java (85%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/plugin/QuartzPlugin.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/serializer/CowrSerializer.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/AESUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/DataUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/DateTimeUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/ImageUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/JsonUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/MathUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/ReqUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/StrUtil.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/poimerge/PoiDynamicMarge.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/utils/poimerge/PoiModel.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/CrudParamValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/CustomerIdValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/DayValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/MonthValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/ParamValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/PhoneValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/StartAndEndIntervalValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/validator/YearValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/view/ActionReporter.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/view/ExcelRender.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/view/JsonRenderFactory.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/view/PageParam.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/view/ReportExcelStyle.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/common/view/Result.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/ActionCmdLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/AddSubtractItem.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/AddSubtractItemRecord.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/AuthLicense.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/AuthResult.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Blacklist.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Cctv.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CctvChannels.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Customer.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerContact.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractSigned.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerContractSignedLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerContractTemplate.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerDiscount.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerPact.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerReceiver.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerRegister.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerSupermarketProduct.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/CustomerType.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/DeviceConfig.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Driver.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/model/HbrsmsLog.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/InvoiceInvalidVerify.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/InvoiceLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/InvoiceReceive.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/ModifyLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OrderEnd.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OrderInvalidVerify.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OrderPurchase.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OrderSeq.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OrderTemp.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OrderTransfer.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OrderTrash.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Ordercluster.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OrderclusterTruck.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/OssfileLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/PostLicenseResult.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/PrepayCustomer.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/PrepayDetail.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/PrepayDetailStateHistory.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/PrepayTruck.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/PresellOrder.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Product.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/ProductPriceModify.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/ProductPriceModifyLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Purchase.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/RefundDetail.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/RefundDetailStateHistory.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Sandfarm.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/SmsLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/SmsNoticeContact.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Stock.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/StockModifyLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Supermarket.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/SupermarketCustomerDistance.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/SupermarketProduct.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketProductLog.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/SupermarketReceiverDistance.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/SupermarketYield.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/SyncTask.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Sysuser.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TicketInvalidVerify.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TicketLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TicketReceive.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TransPriceConfigSale.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TransPriceConfigTransfer.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TransPriceConfigTrash.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceLog.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Transport.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TransportCompany.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/Truck.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TruckWeightLimit.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/TruckWeightLimitModifyLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/_MappingKit.java (93%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseActionCmdLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseAddSubtractItem.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseAddSubtractItemRecord.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseAuthLicense.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseBlacklist.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCctv.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCctvChannels.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomer.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerContact.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContractSigned.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerContractSignedLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerContractTemplate.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerDiscount.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerPact.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerRegister.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerSupermarketProduct.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseCustomerType.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseDeviceConfig.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseDriver.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseHbrsmsLog.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseInvoiceInvalidVerify.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseInvoiceLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseModifyLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrderEnd.java (87%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrderPurchase.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrderSeq.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrderTemp.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrderTransfer.java (97%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrderTrash.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrdercluster.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseOssfileLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BasePrepayCustomer.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BasePrepayDetail.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BasePrepayTruck.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BasePresellOrder.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseProduct.java (82%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseProductPriceModify.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseProductPriceModifyLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BasePurchase.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseRefundDetail.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSandfarm.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSmsLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSmsNoticeContact.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseStock.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseStockModifyLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSupermarket.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java (84%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSupermarketProduct.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketProductLog.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSupermarketSandfarmDistance.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSupermarketYield.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSyncTask.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseSysuser.java (98%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTicketLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTicketReceive.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceLog.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTransport.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTransportCompany.java (77%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTruck.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/sms/AliyunSmsService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/CacheData.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java (96%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/addsubtractitemrecord/AddSubtractItemRecordService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/authlicense/AuthLicensePKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/blacklist/BlacklistPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/cctv/CctvController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/cctv/CctvService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/CustomerPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/CustomerService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypePKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java (92%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/driver/DriverPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/driver/DriverService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidBySnVerifyValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceivePKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/OrderCancelValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/OrderService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/OrderSnValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/OrderStateValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/SnValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java (76%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordercluster/PresellOrderclusterValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java (92%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java (80%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchasePKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java (98%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/overall/OverallService.java (77%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java (99%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java (50%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/product/ProductPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/product/ProductService.java (81%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/product/ProductValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/purchase/PurchasePKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java (82%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/sms/log/SmsLogPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/sms/log/SmsLogService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java (99%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java (72%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/SupermarketIdValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/SupermarketPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java (90%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/SupermarketValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistancePKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java (97%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceValidator.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogPKValidator.java create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogService.java create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogValidator.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java (100%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/stock/StockPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java (94%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogService.java (97%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceivePKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java (96%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transport/LicenseValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transport/TransportService.java (96%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyPKValidator.java (94%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java (87%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyValidator.java (91%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transprice/CaleTransPriceValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java (93%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java (78%) create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogPKValidator.java create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogService.java create mode 100644 ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogValidator.java rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/TruckPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/TruckService.java (90%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java (85%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/BaseModelGenerator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/ColumnMeta.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/CrudGenerator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/DataDictionaryGenerator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/Generator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/Main.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/MappingKitGenerator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/MetaBuilder.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/ModelGenerator.java (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/java/generator/TableMeta.java (100%) create mode 100644 ssjygl-xsct-common/src/main/resources/db.properties rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/resources/generator/base_model_template.jf (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/resources/generator/controller_template.jf (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/resources/generator/mapping_kit_template.jf (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/resources/generator/model_template.jf (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/resources/generator/pkvalidator_template.jf (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/resources/generator/service_template.jf (100%) rename {ssjygl-xsx-common => ssjygl-xsct-common}/src/main/resources/generator/validator_template.jf (100%) create mode 100644 ssjygl-xsct-local/build.sh create mode 100644 ssjygl-xsct-local/debug.sh rename {ssjygl-xsx-local => ssjygl-xsct-local}/package.xml (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/pom.xml (95%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/actioncmdlog/ActionCmdLogSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/cache/CacheController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/customer/CustomerController.java (98%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/customer/contact/CustomerContactController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/customer/pact/CustomerPactController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/customer/receiver/CustomerReceiverController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/common/Const.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java (97%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java (99%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Camera.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java (97%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Device.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/DingsongScale.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/KeLiScale.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/XiShuiScale.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/device/YaoHuaScale.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/JsdCellAddresses.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/QRcodeZxingUtil.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/CRC16.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/LicenseJPGPair.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/driver/DriverController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/file/OssFileController.java (100%) create mode 100644 ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/BaseHbrsmsLog.java create mode 100644 ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/Hbrsms.java create mode 100644 ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsJob.java create mode 100644 ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsLog.java create mode 100644 ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsService.java rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/jobs/ClearTempFileJob.java (92%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/jobs/CustomerDiscountJob.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/jobs/SyncJob.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/main/CliCacheData.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/main/Config.java (93%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/main/Main.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/netty/AbstractClient.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/netty/EndPoint.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/netty/SocketIOService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java (84%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchasePayValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java (97%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/orderseq/OrderSeqService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPayValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPrepayValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java (99%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferPayValidator.java (89%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java (95%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashPayValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java (98%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/overall/OverallController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/prepay/PrepayController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/prepay/prepaydetail/PrepayDetailController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/DayValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/presellorder/PresellOrderController.java (72%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/product/ProductController.java (90%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/purchase/PurchaseController.java (97%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/sandfarm/SandfarmController.java (97%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/sms/log/SmsLogController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java (98%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java (97%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java (88%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockSyncService.java (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java (76%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifyController.java (95%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifySyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogController.java (95%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/ticket/receive/TicketReceiveController.java (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/CmdLicenseValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/ManualCreateValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/ManualWeightValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/MemoValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/PaySginValidator.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java (86%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/transportcompany/TransportCompanyController.java (98%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/truck/TruckController.java (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/dev/config.properties (89%) create mode 100644 ssjygl-xsct-local/src/main/resources/dev/db.properties rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/dev/undertow.txt (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/job.properties (84%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/log4j.properties (94%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/logging.properties (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/prod/config.properties (87%) create mode 100644 ssjygl-xsct-local/src/main/resources/prod/db.properties rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/prod/undertow.txt (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/tpl.xlsx (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/tpl_bill_full.xlsx (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/tpl_完整版.xlsx (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/resources/tpl_结算单.xlsx (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/webapp/WEB-INF/web.xml (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/webapp/index.html (97%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/src/main/webapp/index.jsp (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/start.bat (100%) rename {ssjygl-xsx-local => ssjygl-xsct-local}/start.sh (100%) create mode 100644 ssjygl-xsct-service/build.sh create mode 100644 ssjygl-xsct-service/debug.sh rename {ssjygl-xsx-service => ssjygl-xsct-service}/package.xml (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/pom.xml (93%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/Interceptor/UpdateOnlyListener.java (99%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/addsubtractitem/AddSubtractItemController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/addsubtractitem/AddSubtractItemPKValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/addsubtractitem/AddSubtractItemService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/addsubtractitem/AddSubtractItemValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/addsubtractitemrecord/AddSubtractItemRecordController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/addsubtractitemrecord/AddSubtractItemRecordPKValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/addsubtractitemrecord/AddSubtractItemRecordService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/addsubtractitemrecord/AddSubtractItemRecordValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/authlicense/AuthLicenseSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/cache/CacheController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/CustomerController.java (99%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactSyncService.java (100%) create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedController.java create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedPKValidator.java create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedService.java create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/customer/contractsigned/CustomerContractSignedValidator.java rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogController.java (90%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogPKValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contractsignedlog/CustomerContractSignedLogValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplateController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplatePKValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplateService.java (99%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/CustomerContractTemplateValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/contracttemplate/Word2HtmlStr.java (97%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/customerdiscount/CustomerDiscountController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/customerdiscount/CustomerDiscountPKValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/customerdiscount/CustomerDiscountSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/customerdiscount/CustomerDiscountValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/pact/CustomerPactController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/pact/CustomerPactSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterVerifyValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/customer/supermarketproduct/CustomerSupermarketProductSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/driver/DriverSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/invoice/log/BatchSaveValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/jobs/CheckExceptionDataJob.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/jobs/CheckPrepaySurplusJob.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/jobs/CleanOSSBakFileJob.java (95%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/jobs/CustomerDiscountJob.java (100%) create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/jobs/LoadStatCacheJob.java rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/jobs/OrderEndJob.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/jobs/SyncJob.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/main/Config.java (96%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/main/Main.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/main/SvrCacheData.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/netty/NettyServer.java (99%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/invalidverify/OrderInvalidVerifyController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/EditClusterValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/EditTempClusterValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/ForwardClusterValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/ForwardTempValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterController.java (71%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterEditValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java (70%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/SaveClusterValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/SaveValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java (96%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/orderpurchase/OrderPurchaseController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java (95%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java (98%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/overall/OverallCacheService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java (88%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/PrepayController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaycustomer/PrepayCustomerController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaycustomer/PrepayCustomerSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/DayValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/presellorder/PresellOrderController.java (88%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/presellorder/PresellOrderPKValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/presellorder/PresellOrderSyncService.java (91%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/presellorder/PresellOrderValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/product/ProductController.java (95%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/product/ProductSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/productpricemodify/ProductPriceModifyController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/productpricemodify/ProductPriceModifySyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/productpricemodify/ProductPriceModifyVerifyValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java (98%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java (93%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/sms/log/SmsLogController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/sms/log/SmsService.java (99%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/sms/noticecontact/SmsNoticeContactController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/sms/noticecontact/SmsNoticeContactService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/stat/customer/CustomerStatController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java (87%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/SupAddProductValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/SupEditProductValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/SupRemoveProductValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java (99%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java (97%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java (90%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceSyncService.java (91%) create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/productlog/SupermarketProductLogController.java create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/productlog/SupermarketProductLogSyncService.java rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java (93%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java (84%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/stock/StockController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldPKValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java (97%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/system/sysuser/RegisterUserValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java (97%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserCustomerValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java (99%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/ticket/invalidverify/TicketInvalidVerifyController.java (94%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/ticket/invalidverify/TicketInvalidVerifySyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/ticket/invalidverify/TicketInvalidVerifyValidator.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/ticket/log/TicketLogController.java (97%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/ticket/log/TicketLogSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/ticket/receive/TicketReceiveController.java (97%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/ticket/receive/TicketReceiveSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/transport/TransportQueryController.java (91%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java (95%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanySyncService.java (100%) create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/transpricelog/TransPriceLogController.java create mode 100644 ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/transpricelog/TransPriceLogSyncService.java rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/truck/TruckController.java (94%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitService.java (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/dataadjustment/ExcelUtils.java (97%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/java/dataadjustment/Main.java (97%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/resources/dev/config.properties (84%) create mode 100644 ssjygl-xsct-service/src/main/resources/dev/db.properties rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/resources/dev/undertow.txt (89%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/resources/job.properties (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/resources/log4j.properties (93%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/resources/logging.properties (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/resources/prod/config.properties (79%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/resources/prod/undertow.txt (89%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/webapp/WEB-INF/web.xml (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/src/main/webapp/index.jsp (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/start.bat (100%) rename {ssjygl-xsx-service => ssjygl-xsct-service}/start.sh (100%) delete mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java delete mode 100644 ssjygl-xsx-common/src/main/resources/db.properties delete mode 100644 ssjygl-xsx-local/build.sh delete mode 100644 ssjygl-xsx-local/debug.sh delete mode 100644 ssjygl-xsx-local/src/main/resources/dev/db.properties delete mode 100644 ssjygl-xsx-local/src/main/resources/prod/db.properties delete mode 100644 ssjygl-xsx-service/build.sh delete mode 100644 ssjygl-xsx-service/debug.sh delete mode 100644 ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/LoadStatCacheJob.java delete mode 100644 ssjygl-xsx-service/src/main/resources/dev/db.properties diff --git a/.gitignore b/.gitignore index 60d4f11..0b704cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,38 +1,38 @@ .idea/ *.iml -/ssjygl-xsx-common/target/ -/ssjygl-xsx-local/target/ -/ssjygl-xsx-service/target/ -/ssjygl-xsx-devicectrl/target/ +/ssjygl-xsct-common/target/ +/ssjygl-xsct-local/target/ +/ssjygl-xsct-service/target/ +/ssjygl-xsct-devicectrl/target/ /logs/ -/ssjygl-xsx-common/logs/ -/ssjygl-xsx-local/logs/ -/ssjygl-xsx-service/logs/ -/ssjygl-xsx-devicectrl/logs/ +/ssjygl-xsct-common/logs/ +/ssjygl-xsct-local/logs/ +/ssjygl-xsct-service/logs/ +/ssjygl-xsct-devicectrl/logs/ -/ssjygl-xsx-common/out/ -/ssjygl-xsx-local/out/ -/ssjygl-xsx-service/out/ -/ssjygl-xsx-devicectrl/out/ +/ssjygl-xsct-common/out/ +/ssjygl-xsct-local/out/ +/ssjygl-xsct-service/out/ +/ssjygl-xsct-devicectrl/out/ -/ssjygl-xsx-common/upload/ -/ssjygl-xsx-local/upload/ -/ssjygl-xsx-service/upload/ -/ssjygl-xsx-devicectrl/upload/ +/ssjygl-xsct-common/upload/ +/ssjygl-xsct-local/upload/ +/ssjygl-xsct-service/upload/ +/ssjygl-xsct-devicectrl/upload/ -/ssjygl-xsx-common/.idea/ -/ssjygl-xsx-local/.idea/ -/ssjygl-xsx-service/.idea/ -/ssjygl-xsx-devicectrl/.idea/ +/ssjygl-xsct-common/.idea/ +/ssjygl-xsct-local/.idea/ +/ssjygl-xsct-service/.idea/ +/ssjygl-xsct-devicectrl/.idea/ /gern -/ssjygl-xsx-common/imgfile/ -/ssjygl-xsx-local/imgfile/ -/ssjygl-xsx-common/xlsfile/ -/ssjygl-xsx-local/xlsfile/ -/ssjygl-xsx-common/KHT_Log/ -/ssjygl-xsx-local/KHT_Log/ +/ssjygl-xsct-common/imgfile/ +/ssjygl-xsct-local/imgfile/ +/ssjygl-xsct-common/xlsfile/ +/ssjygl-xsct-local/xlsfile/ +/ssjygl-xsct-common/KHT_Log/ +/ssjygl-xsct-local/KHT_Log/ -/ssjygl-xsx-local/lib/bocommjava/log -/ssjygl-xsx-local/src/main/webapp/upload \ No newline at end of file +/ssjygl-xsct-local/lib/bocommjava/log +/ssjygl-xsct-local/src/main/webapp/upload diff --git a/README.md b/README.md index ea2d8a4..a2ecc25 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ #砂石经营管理2.0 -##浠水县后端服务 +##浠水城投后端服务 1. ssjygl-xs-common 本地和云端后端服务公用代码 2. ssjygl-xs-local 本地后端服务 3. ssjygl-xs-service 云端后端服务 -2021年7月改版开发分支 \ No newline at end of file +2021年7月改版开发分支 diff --git a/build.bat b/build.bat index e8db785..315625d 100644 --- a/build.bat +++ b/build.bat @@ -1,7 +1,7 @@ -cd ../ssjygl-xsx-local +cd ../ssjygl-xsct-local start mvn clean package -cd ../ssjygl-xsx-service +cd ../ssjygl-xsct-service start mvn clean package -cd .. \ No newline at end of file +cd .. diff --git a/build.sh b/build.sh index ef11fa9..1f6fb50 100644 --- a/build.sh +++ b/build.sh @@ -1,10 +1,10 @@ -cd ssjygl-xsx-common +cd ssjygl-xsct-common mvn clean package install -cd ../ssjygl-xsx-local +cd ../ssjygl-xsct-local mvn clean package -cd ../ssjygl-xsx-service +cd ../ssjygl-xsct-service mvn clean package -cd .. \ No newline at end of file +cd .. diff --git a/ssjygl-xsx-common/pom.xml b/ssjygl-xsct-common/pom.xml similarity index 96% rename from ssjygl-xsx-common/pom.xml rename to ssjygl-xsct-common/pom.xml index f4e900d..b9624d0 100644 --- a/ssjygl-xsx-common/pom.xml +++ b/ssjygl-xsct-common/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.cowr.ssjygl-xsx-common - ssjygl-xsx-common + com.cowr.ssjygl-xsct-common + ssjygl-xsct-common 1.0 jar - 砂石经营管理-浠水县-公用代码 + 砂石经营管理-浠水城投-公用代码 UTF-8 @@ -146,4 +146,4 @@ - \ No newline at end of file + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/Const.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/Const.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/Const.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/Const.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseController.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/base/BaseController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/base/BaseController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseModel.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/base/BaseModel.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseModel.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/base/BaseModel.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/base/BaseService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/base/BaseService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/cache/RedisArpCache.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/cache/RedisArpCache.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/cache/RedisArpCache.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/cache/RedisArpCache.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/ctrl/HomeController.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/ctrl/HomeController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/ctrl/HomeController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/ctrl/HomeController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/CustomerTypeEnum.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/enums/CustomerTypeEnum.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/enums/CustomerTypeEnum.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/enums/CustomerTypeEnum.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/Enums.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/enums/Enums.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/enums/Enums.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/enums/Enums.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderStateEnum.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/enums/OrderStateEnum.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderStateEnum.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/enums/OrderStateEnum.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java similarity index 97% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java index 9a1b783..33c0da5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java @@ -17,8 +17,8 @@ public enum OrderTypeEnum { TEMP(3), TRASH(4), PURCHASE(5), - PRESELL(6); - + PRESELL(6), + ALL(7); OrderTypeEnum(int typeid) { this.typeid = typeid; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/RoleEnum.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/enums/RoleEnum.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/enums/RoleEnum.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/enums/RoleEnum.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/TruckRodState.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/enums/TruckRodState.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/enums/TruckRodState.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/enums/TruckRodState.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/UserTypeEnum.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/enums/UserTypeEnum.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/enums/UserTypeEnum.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/enums/UserTypeEnum.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/handler/GlobalHandler.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/handler/GlobalHandler.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/handler/GlobalHandler.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/handler/GlobalHandler.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/netty/JSONDecoder.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/netty/JSONDecoder.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/netty/JSONDecoder.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/netty/JSONDecoder.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/netty/JSONEncoder.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/netty/JSONEncoder.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/netty/JSONEncoder.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/netty/JSONEncoder.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/oss/OSSKit.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/oss/OSSKit.java similarity index 85% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/oss/OSSKit.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/oss/OSSKit.java index e62f10f..721dc7d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/oss/OSSKit.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/common/oss/OSSKit.java @@ -1,6 +1,7 @@ package com.cowr.common.oss; import com.aliyun.oss.OSSClient; +import com.aliyun.oss.model.OSSObject; import com.aliyun.oss.model.ObjectListing; import com.aliyun.oss.model.ObjectMetadata; import com.jfinal.kit.StrKit; @@ -10,16 +11,16 @@ import java.io.File; import java.net.URLEncoder; public class OSSKit { - private static Log log = Log.getLog(OSSKit.class); + private static Log log = Log.getLog(OSSKit.class); private static OSSClient _ossClient; - private static String bucketName; + private static String bucketName; private static String endpoint; - private static String accessKeyId = "LTAIqQ3TXBgNGBWi"; + private static String accessKeyId = "LTAIqQ3TXBgNGBWi"; private static String accessKeySecret = "CGbPXdfX4xca3uaN2cOmTzjsG4jd6O"; public static void init(String endpoint, String bucketName) { - OSSKit.endpoint = endpoint; + OSSKit.endpoint = endpoint; OSSKit.bucketName = bucketName; } @@ -72,6 +73,26 @@ public class OSSKit { return true; } + public static OSSObject getFile(String key) { + if (_ossClient == null) { + log.error("没有初始化 OSSMgrClient"); + + OSSKit.start(); + + if (_ossClient == null) { + log.error("OSSMgrClient 初始化失败"); + return null; + } + } + + if (!StrKit.notBlank(key)) { + return null; + } + + return _ossClient.getObject(bucketName, key); + + } + public static boolean putObject(String bucketName, String key, File file) throws Exception { if (_ossClient == null) { log.error("没有初始化 OSSMgrClient"); @@ -113,7 +134,7 @@ public class OSSKit { return true; } - public static ObjectListing list(String prefix){ + public static ObjectListing list(String prefix) { if (_ossClient == null) { log.error("没有初始化 OSSMgrClient"); return null; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/QuartzPlugin.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/plugin/QuartzPlugin.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/QuartzPlugin.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/plugin/QuartzPlugin.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/serializer/CowrSerializer.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/serializer/CowrSerializer.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/serializer/CowrSerializer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/serializer/CowrSerializer.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/AESUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/AESUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/AESUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/AESUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DataUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/DataUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DataUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/DataUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/ImageUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/ImageUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/JsonUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/JsonUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/JsonUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/JsonUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/MathUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/MathUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/MathUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/MathUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ReqUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/ReqUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ReqUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/ReqUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/StrUtil.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/StrUtil.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/StrUtil.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/StrUtil.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/poimerge/PoiDynamicMarge.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/poimerge/PoiDynamicMarge.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/poimerge/PoiDynamicMarge.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/poimerge/PoiDynamicMarge.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/poimerge/PoiModel.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/utils/poimerge/PoiModel.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/utils/poimerge/PoiModel.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/utils/poimerge/PoiModel.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/CrudParamValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/CrudParamValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/CrudParamValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/CrudParamValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/CustomerIdValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/CustomerIdValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/CustomerIdValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/CustomerIdValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/DayValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/DayValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/DayValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/DayValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/MonthValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/MonthValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/MonthValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/MonthValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/ParamValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/ParamValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/ParamValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/ParamValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/PhoneValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/PhoneValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/PhoneValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/PhoneValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndIntervalValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/StartAndEndIntervalValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndIntervalValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/StartAndEndIntervalValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/YearValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/validator/YearValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/YearValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/validator/YearValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ActionReporter.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/view/ActionReporter.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/view/ActionReporter.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/view/ActionReporter.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ExcelRender.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/view/ExcelRender.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/view/ExcelRender.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/view/ExcelRender.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/JsonRenderFactory.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/view/JsonRenderFactory.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/view/JsonRenderFactory.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/view/JsonRenderFactory.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/PageParam.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/view/PageParam.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/view/PageParam.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/view/PageParam.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ReportExcelStyle.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/view/ReportExcelStyle.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/view/ReportExcelStyle.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/view/ReportExcelStyle.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/Result.java b/ssjygl-xsct-common/src/main/java/com/cowr/common/view/Result.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/view/Result.java rename to ssjygl-xsct-common/src/main/java/com/cowr/common/view/Result.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/ActionCmdLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/ActionCmdLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/ActionCmdLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/ActionCmdLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/AddSubtractItem.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/AddSubtractItem.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/AddSubtractItem.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/AddSubtractItem.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/AddSubtractItemRecord.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/AddSubtractItemRecord.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/AddSubtractItemRecord.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/AddSubtractItemRecord.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/AuthLicense.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/AuthLicense.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/AuthLicense.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/AuthLicense.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/AuthResult.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/AuthResult.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/AuthResult.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/AuthResult.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Blacklist.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Blacklist.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Blacklist.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Blacklist.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Cctv.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Cctv.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Cctv.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Cctv.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CctvChannels.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CctvChannels.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CctvChannels.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CctvChannels.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Customer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Customer.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Customer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Customer.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerContact.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContact.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerContact.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContact.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractSigned.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractSigned.java new file mode 100644 index 0000000..467ca78 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractSigned.java @@ -0,0 +1,14 @@ +package com.cowr.model; + +import com.cowr.model.base.BaseCustomerContractSigned; + +/** + * Generated by COWR Wed Nov 17 15:39:45 CST 2021 + * TableName: customer_contract_signed_log + * Remarks: + * PrimaryKey: id + */ +@SuppressWarnings("serial") +public class CustomerContractSigned extends BaseCustomerContractSigned { + public static final CustomerContractSigned dao = new CustomerContractSigned().dao(); +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerContractSignedLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractSignedLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerContractSignedLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractSignedLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerContractTemplate.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractTemplate.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerContractTemplate.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerContractTemplate.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerDiscount.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerDiscount.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerDiscount.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerDiscount.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerPact.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerPact.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerPact.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerPact.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerReceiver.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerReceiver.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerReceiver.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerReceiver.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerRegister.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerRegister.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerRegister.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerRegister.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerSupermarketProduct.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerSupermarketProduct.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerSupermarketProduct.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerSupermarketProduct.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerType.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerType.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/CustomerType.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/CustomerType.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/DeviceConfig.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/DeviceConfig.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/DeviceConfig.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/DeviceConfig.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Driver.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Driver.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Driver.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Driver.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/model/HbrsmsLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/HbrsmsLog.java new file mode 100644 index 0000000..264f352 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/HbrsmsLog.java @@ -0,0 +1,16 @@ +package com.cowr.model; + +import com.cowr.model.base.BaseHbrsmsLog; + +/** + * Description: + * Created by XuSan on 2024/10/10. + * + * @author XuSan + * @version 1.0 + */ +public class HbrsmsLog extends BaseHbrsmsLog { + + public static final HbrsmsLog dao = new HbrsmsLog().dao(); + +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/InvoiceInvalidVerify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/InvoiceInvalidVerify.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/InvoiceInvalidVerify.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/InvoiceInvalidVerify.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/InvoiceLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/InvoiceLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/InvoiceLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/InvoiceLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/InvoiceReceive.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/InvoiceReceive.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/InvoiceReceive.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/InvoiceReceive.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/ModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/ModifyLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/ModifyLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/ModifyLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderEnd.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OrderEnd.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OrderEnd.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OrderEnd.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderInvalidVerify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OrderInvalidVerify.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OrderInvalidVerify.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OrderInvalidVerify.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderPurchase.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OrderPurchase.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OrderPurchase.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OrderPurchase.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderSeq.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OrderSeq.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OrderSeq.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OrderSeq.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTemp.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OrderTemp.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTemp.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OrderTemp.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTransfer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OrderTransfer.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTransfer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OrderTransfer.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTrash.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OrderTrash.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTrash.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OrderTrash.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Ordercluster.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Ordercluster.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Ordercluster.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Ordercluster.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderclusterTruck.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OrderclusterTruck.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OrderclusterTruck.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OrderclusterTruck.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OssfileLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/OssfileLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/OssfileLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/OssfileLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/PostLicenseResult.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/PostLicenseResult.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/PostLicenseResult.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/PostLicenseResult.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayCustomer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/PrepayCustomer.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayCustomer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/PrepayCustomer.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayDetail.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/PrepayDetail.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayDetail.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/PrepayDetail.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayDetailStateHistory.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/PrepayDetailStateHistory.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayDetailStateHistory.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/PrepayDetailStateHistory.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayTruck.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/PrepayTruck.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayTruck.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/PrepayTruck.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/PresellOrder.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/PresellOrder.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/PresellOrder.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/PresellOrder.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Product.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Product.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Product.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Product.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/ProductPriceModify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/ProductPriceModify.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/ProductPriceModify.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/ProductPriceModify.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/ProductPriceModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/ProductPriceModifyLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/ProductPriceModifyLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/ProductPriceModifyLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Purchase.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Purchase.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Purchase.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Purchase.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/RefundDetail.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/RefundDetail.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/RefundDetail.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/RefundDetail.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/RefundDetailStateHistory.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/RefundDetailStateHistory.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/RefundDetailStateHistory.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/RefundDetailStateHistory.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Sandfarm.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Sandfarm.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Sandfarm.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Sandfarm.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SmsLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SmsLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/SmsLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/SmsLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SmsNoticeContact.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SmsNoticeContact.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/SmsNoticeContact.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/SmsNoticeContact.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Stock.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Stock.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Stock.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Stock.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/StockModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/StockModifyLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/StockModifyLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/StockModifyLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Supermarket.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Supermarket.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Supermarket.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Supermarket.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketCustomerDistance.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketCustomerDistance.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketCustomerDistance.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketCustomerDistance.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketProduct.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketProduct.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketProduct.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketProduct.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketProductLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketProductLog.java new file mode 100644 index 0000000..a956641 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketProductLog.java @@ -0,0 +1,14 @@ +package com.cowr.model; + +import com.cowr.model.base.BaseSupermarketProductLog; + +/** + * Generated by COWR Sun Apr 12 21:56:10 CST 2020 + * TableName: supermarket_product + * Remarks: 基础配置 - 超市单价修改审核表 + * PrimaryKey: id + */ +@SuppressWarnings("serial") +public class SupermarketProductLog extends BaseSupermarketProductLog { + public static final SupermarketProductLog dao = new SupermarketProductLog().dao(); +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketReceiverDistance.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketReceiverDistance.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketReceiverDistance.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketReceiverDistance.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketYield.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketYield.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketYield.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/SupermarketYield.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SyncTask.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/SyncTask.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/SyncTask.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/SyncTask.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Sysuser.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Sysuser.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Sysuser.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Sysuser.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TicketInvalidVerify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TicketInvalidVerify.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TicketInvalidVerify.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TicketInvalidVerify.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TicketLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TicketLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TicketLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TicketLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TicketReceive.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TicketReceive.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TicketReceive.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TicketReceive.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigSale.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceConfigSale.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigSale.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceConfigSale.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTransfer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceConfigTransfer.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTransfer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceConfigTransfer.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTrash.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceConfigTrash.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTrash.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceConfigTrash.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceLog.java new file mode 100644 index 0000000..694565e --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/TransPriceLog.java @@ -0,0 +1,14 @@ +package com.cowr.model; + +import com.cowr.model.base.BaseTransPriceLog; + +/** + * Generated by COWR Sun Apr 12 21:56:10 CST 2020 + * TableName: customer + * Remarks: 客户相关 - 客户 + * PrimaryKey: id + */ +@SuppressWarnings("serial") +public class TransPriceLog extends BaseTransPriceLog { + public static final TransPriceLog dao = new TransPriceLog().dao(); +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Transport.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Transport.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Transport.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Transport.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransportCompany.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TransportCompany.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TransportCompany.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TransportCompany.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/Truck.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/Truck.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/Truck.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/Truck.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimit.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TruckWeightLimit.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimit.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TruckWeightLimit.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimitModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/TruckWeightLimitModifyLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimitModifyLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/TruckWeightLimitModifyLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/_MappingKit.java similarity index 93% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/_MappingKit.java index 96803dc..2587833 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/_MappingKit.java @@ -1,5 +1,7 @@ package com.cowr.model; +import com.cowr.model.base.BaseHbrsmsLog; +import com.cowr.model.base.BaseTransPriceLog; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; /** @@ -14,7 +16,7 @@ import com.jfinal.plugin.activerecord.ActiveRecordPlugin; * */ public class _MappingKit { - + public static void mapping(ActiveRecordPlugin arp) { arp.addMapping("auth_license", "truck_license", AuthLicense.class); arp.addMapping("transport", "id", Transport.class); @@ -32,6 +34,7 @@ public class _MappingKit { arp.addMapping("sandfarm", "id", Sandfarm.class); // Composite Primary Key order: supermarket_id,product_id arp.addMapping("supermarket_product", "supermarket_id,product_id", SupermarketProduct.class); + arp.addMapping("supermarket_product_log", "id", SupermarketProductLog.class); // Composite Primary Key order: supermarket_id,customer_id arp.addMapping("supermarket_customer_distance", "supermarket_id,customer_id", SupermarketCustomerDistance.class); // Composite Primary Key order: supermarket_id,year @@ -88,6 +91,7 @@ public class _MappingKit { arp.addMapping("truck_weight_limit", "truck_license", TruckWeightLimit.class); arp.addMapping("truck_weight_limit_modify_log", "id", TruckWeightLimitModifyLog.class); arp.addMapping("customer_contract_signed_log", "id", CustomerContractSignedLog.class); + arp.addMapping(CustomerContractSigned.tablename, "id", CustomerContractSigned.class); arp.addMapping("customer_contract_template", "id", CustomerContractTemplate.class); arp.addMapping("add_subtract_item", "id", AddSubtractItem.class); @@ -95,6 +99,8 @@ public class _MappingKit { arp.addMapping("product_price_modify", "id", ProductPriceModify.class); arp.addMapping("product_price_modify_log", "id", ProductPriceModifyLog.class); arp.addMapping("presell_order", "id", PresellOrder.class); + arp.addMapping(BaseHbrsmsLog.tablename, "sn", HbrsmsLog.class); + arp.addMapping(BaseTransPriceLog.tablename, "id", TransPriceLog.class); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAddSubtractItem.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseAddSubtractItem.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAddSubtractItem.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseAddSubtractItem.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAddSubtractItemRecord.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseAddSubtractItemRecord.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAddSubtractItemRecord.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseAddSubtractItemRecord.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAuthLicense.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseAuthLicense.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAuthLicense.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseAuthLicense.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseBlacklist.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseBlacklist.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseBlacklist.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseBlacklist.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctv.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCctv.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctv.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCctv.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctvChannels.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCctvChannels.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctvChannels.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCctvChannels.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomer.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomer.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContact.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContact.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContact.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContact.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContractSigned.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContractSigned.java new file mode 100644 index 0000000..9d7c828 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContractSigned.java @@ -0,0 +1,225 @@ +package com.cowr.model.base; + +import com.alibaba.fastjson.annotation.JSONField; +import com.cowr.common.base.BaseModel; +import com.jfinal.plugin.activerecord.IBean; + +/** + * Generated by COWR Wed Nov 17 15:39:45 CST 2021 + * TableName: customer_contract_signed_log + * Remarks: + * PrimaryKey: id + */ +@SuppressWarnings("serial") +public abstract class BaseCustomerContractSigned> extends BaseModel implements IBean { + + public static final String tablename = "customer_contract_signed"; + + @JSONField(serialize=false) + public String getTablename(){ + return tablename; + } + + /** + * name: id + * type: INT UNSIGNED(10) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * @param id 主键 + */ + @JSONField(name="id") + public void setId(Integer id) { + set("id", id); + } + + + /** + * @return id 主键 + */ + @JSONField(name="id") + public Integer getId() { + return getInt("id"); + } + + /** + * name: create_id + * type: INT UNSIGNED(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param createId 用户id + */ + @JSONField(name="create_id") + public void setCreateId(Integer createId) { + set("create_id", createId); + } + + + /** + * @return create_id 用户id + */ + @JSONField(name="create_id") + public Integer getCreateId() { + return getInt("create_id"); + } + + /** + * name: create_name + * type: VARCHAR(20) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param createName 用户姓名 + */ + @JSONField(name="create_name") + public void setCreateName(String createName) { + set("create_name", createName); + } + + + /** + * @return user_name 用户姓名 + */ + @JSONField(name="create_name") + public String getCreateName() { + return getStr("create_name"); + } + + /** + * name: create_time + * type: TIMESTAMP(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * + * @param createTime 最后修改时间 + */ + @JSONField(name = "create_time") + public void setCreateTime(java.util.Date createTime) { + set("create_time", createTime); + } + + + /** + * @return create_time 最后修改时间 + */ + @JSONField(name = "create_time") + public java.util.Date getCreateTime() { + return get("create_time"); + } + + /** + * name: name + * type: VARCHAR(200) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param name 姓名 + */ + @JSONField(name="name") + public void setName(String name) { + set("name", name); + } + + + /** + * @return customer_id 用户关联公司id + */ + @JSONField(name="name") + public String getName() { + return getStr("name"); + } + + /** + * name: attachment + * type: VARCHAR(255) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param attachment 附件 + */ + @JSONField(name="attachment") + public void setAttachment(String attachment) { + set("attachment", attachment); + } + + + /** + * @return attachment 附件 + */ + @JSONField(name="attachment") + public String getAttachment() { + return getStr("attachment"); + } + + /** + * name: htmlstr + * type: TEXT(65535) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param htmlstr word转成的html字符串 + */ + @JSONField(name="htmlstr") + public void setHtmlstr(String htmlstr) { + set("htmlstr", htmlstr); + } + + + /** + * @return htmlstr word转成的html字符串 + */ + @JSONField(name="htmlstr") + public String getHtmlstr() { + return getStr("htmlstr"); + } + + /** + * name: state + * type: SMALLINT(5) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: 1 + * + * @param state 1，启用；(后台自动设置) + * 0，禁用； + */ + @JSONField(name = "state") + public void setState(Integer state) { + set("state", state); + } + + + /** + * @return state 1，启用；(后台自动设置) + * * 0，禁用； + */ + @JSONField(name = "state") + public Integer getState() { + return getInt("state"); + } + + + /** + * name: del + * type: INT(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: 0 + * @param del 逻辑删除标记位 + */ + @JSONField(name="del") + public void setDel(Integer del) { + set("del", del); + } + + + /** + * @return del 逻辑删除标记位 + */ + @JSONField(name="del") + public Integer getDel() { + return getInt("del"); + } +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContractSignedLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContractSignedLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContractSignedLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContractSignedLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContractTemplate.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContractTemplate.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContractTemplate.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerContractTemplate.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerDiscount.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerDiscount.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerDiscount.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerDiscount.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerPact.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerPact.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerPact.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerPact.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerRegister.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerRegister.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerRegister.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerRegister.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerSupermarketProduct.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerSupermarketProduct.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerSupermarketProduct.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerSupermarketProduct.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerType.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerType.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerType.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseCustomerType.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDeviceConfig.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseDeviceConfig.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDeviceConfig.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseDeviceConfig.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDriver.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseDriver.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDriver.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseDriver.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseHbrsmsLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseHbrsmsLog.java new file mode 100644 index 0000000..b7dab31 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseHbrsmsLog.java @@ -0,0 +1,108 @@ +package com.cowr.model.base; + +/** + * Description: + * Created by XuSan on 2024/12/6. + * + * @author XuSan + * @version 1.0 + */ + +import com.alibaba.fastjson.annotation.JSONField; +import com.cowr.common.base.BaseModel; +import com.jfinal.plugin.activerecord.IBean; + +import java.util.Date; + +public abstract class BaseHbrsmsLog> extends BaseModel implements IBean { + + + public static final String tablename = "hbrsms_log"; + + @JSONField(serialize = false) + public String getTablename() { + return tablename; + } + + /** + * name: sn + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * + * @param sn sn + */ + @JSONField(name = "sn") + public void setSn(String sn) { + set("sn", sn); + } + + + /** + * @return id + */ + @JSONField(name = "sn") + public String getSn() { + return getStr("sn"); + } + + + @JSONField(name = "createdate") + public void setCreatedate(Date createdate) { + set("createdate", createdate); + } + + + /** + * @return id + */ + @JSONField(name = "createdate") + public Date getCreatedate() { + return get("createdate"); + } + + @JSONField(name = "reqData") + public void setReqData(String reqData) { + set("reqData", reqData); + } + + + /** + * @return id + */ + @JSONField(name = "reqData") + public String getReqData() { + return getStr("reqData"); + } + + @JSONField(name = "respData") + public void setRespData(String respData) { + set("respData", respData); + } + + + /** + * @return id + */ + @JSONField(name = "respData") + public String getrespData() { + return getStr("respData"); + } + + + @JSONField(name = "status") + public void setStatus(String status) { + set("status", status); + } + + + /** + * @return id + */ + @JSONField(name = "status") + public String getStatus() { + return getStr("status"); + } + + +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceInvalidVerify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseInvoiceInvalidVerify.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceInvalidVerify.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseInvoiceInvalidVerify.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseInvoiceLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseInvoiceLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseModifyLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseModifyLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderEnd.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderEnd.java similarity index 87% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderEnd.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderEnd.java index 37139e0..1de67bb 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderEnd.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderEnd.java @@ -26,7 +26,7 @@ public abstract class BaseOrderEnd> extends BaseModel< * type: varchar(20) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: * @param id 主键id */ @@ -34,7 +34,7 @@ public abstract class BaseOrderEnd> extends BaseModel< public void setId(String id) { set("id", id); } - + /** * @return id 主键id @@ -50,14 +50,14 @@ public abstract class BaseOrderEnd> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: * @param customerId 客户编号 */ @JSONField(name="customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** * @return customer_id 客户编号 @@ -72,14 +72,14 @@ public abstract class BaseOrderEnd> extends BaseModel< * type: DATE(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: * @param date 日期 */ @JSONField(name="date") public void setDate(java.util.Date date) { set("date", date); } - + /** * @return date 日期 @@ -94,14 +94,14 @@ public abstract class BaseOrderEnd> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: * @param supermarketId 超市id */ @JSONField(name="supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 超市id @@ -116,14 +116,14 @@ public abstract class BaseOrderEnd> extends BaseModel< * type: DECIMAL(12,4) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: * @param weight 购买重量 */ @JSONField(name="weight") public void setWeight(java.math.BigDecimal weight) { set("weight", weight); } - + /** * @return weight 购买重量 @@ -138,14 +138,14 @@ public abstract class BaseOrderEnd> extends BaseModel< * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: * @param totalPrice 总价 */ @JSONField(name="total_price") public void setTotalPrice(java.math.BigDecimal totalPrice) { set("total_price", totalPrice); } - + /** * @return total_price 总价 @@ -160,17 +160,17 @@ public abstract class BaseOrderEnd> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: * @param saleType 0：正常配额订单，1：预售配额订单 */ @JSONField(name="sale_type") public void setSaleType(Integer saleType) { set("sale_type", saleType); } - + /** - * @return sale_type 0：正常配额订单，1：预售配额订单 + * @return sale_type 0：正常配额订单，1：预售配额订单，3：外销配额订单 */ @JSONField(name="sale_type") public Integer getSaleType() { @@ -182,14 +182,14 @@ public abstract class BaseOrderEnd> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: * @param count 订单总数 */ @JSONField(name="count") public void setCount(Integer count) { set("count", count); } - + /** * @return count 订单总数 @@ -242,5 +242,27 @@ public abstract class BaseOrderEnd> extends BaseModel< return getInt("invoice_type"); } + /** + * name: ordercluster_id + * type: INT(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param orderclusterId + */ + @JSONField(name="ordercluster_id") + public void setOrderclusterId(Integer orderclusterId) { + set("ordercluster_id", orderclusterId); + } + + + /** + * @return ordercluster_id + */ + @JSONField(name="ordercluster_id") + public Integer getOrderclusterId() { + return getInt("ordercluster_id"); + } + } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderPurchase.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderPurchase.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderPurchase.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderPurchase.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSeq.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderSeq.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSeq.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderSeq.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTemp.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderTemp.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTemp.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderTemp.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java similarity index 97% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java index af60317..d4ae68f 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java @@ -677,4 +677,27 @@ public abstract class BaseOrderTransfer> extends } + /** + * name: old_sn + * type: CHAR(13) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * + * @param oldSn 兼容旧系统的数据 + */ + @JSONField(name = "old_sn") + public void setOldSn(String oldSn) { + set("old_sn", oldSn); + } + + + /** + * @return old_sn 兼容旧系统的数据 + */ + @JSONField(name = "old_sn") + public String getOldSn() { + return getStr("old_sn"); + } + } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTrash.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderTrash.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTrash.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderTrash.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOssfileLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOssfileLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOssfileLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseOssfileLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayCustomer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePrepayCustomer.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayCustomer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePrepayCustomer.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetail.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePrepayDetail.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetail.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePrepayDetail.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayTruck.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePrepayTruck.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayTruck.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePrepayTruck.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePresellOrder.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePresellOrder.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePresellOrder.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePresellOrder.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProduct.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseProduct.java similarity index 82% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProduct.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseProduct.java index 79a57cb..29e23d5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProduct.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseProduct.java @@ -43,6 +43,28 @@ public abstract class BaseProduct> extends BaseModel return getInt("id"); } + /** + * name: type + * type: INT(10) + * isNullable: NO + * defaultValue: + * + * @param type + */ + @JSONField(name = "type") + public void setType(java.lang.Integer type) { + set("type", type); + } + + + /** + * @return type + */ + @JSONField(name = "type") + public java.lang.Integer getType() { + return getInt("type"); + } + /** * name: name * type: VARCHAR(255) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProductPriceModify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseProductPriceModify.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProductPriceModify.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseProductPriceModify.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProductPriceModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseProductPriceModifyLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProductPriceModifyLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseProductPriceModifyLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePurchase.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePurchase.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePurchase.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BasePurchase.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetail.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseRefundDetail.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetail.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseRefundDetail.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSandfarm.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSandfarm.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSandfarm.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSandfarm.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSmsLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSmsLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsNoticeContact.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSmsNoticeContact.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsNoticeContact.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSmsNoticeContact.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStock.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseStock.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStock.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseStock.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStockModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseStockModifyLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStockModifyLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseStockModifyLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarket.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarket.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarket.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarket.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java similarity index 84% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java index 618747c..f0fe042 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java @@ -90,4 +90,25 @@ public abstract class BaseSupermarketCustomerDistance> extends BaseModel implements IBean { + + public static final String tablename = "supermarket_product_log"; + + @JSONField(serialize = false) + public String getTablename() { + return tablename; + } + + /** + * name: id + * type: INT(10) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * @param id 主键id + + */ + @JSONField(name="id") + public void setId(java.lang.Integer id) { + set("id", id); + } + + + /** + * @return id 主键id + + */ + @JSONField(name="id") + public java.lang.Integer getId() { + return getInt("id"); + } + + /** + * name: supermarket_id + * type: INT(10) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * + * @param supermarketId 砂站id + */ + @JSONField(name = "supermarket_id") + public void setSupermarketId(Integer supermarketId) { + set("supermarket_id", supermarketId); + } + + + /** + * @return supermarket_id 砂站id + */ + @JSONField(name = "supermarket_id") + public Integer getSupermarketId() { + return getInt("supermarket_id"); + } + + /** + * name: product_id + * type: INT(10) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * + * @param productId 商品id + */ + @JSONField(name = "product_id") + public void setProductId(Integer productId) { + set("product_id", productId); + } + + + /** + * @return product_id 商品id + */ + @JSONField(name = "product_id") + public Integer getProductId() { + return getInt("product_id"); + } + + /** + * name: unit_price + * type: DECIMAL(12,2) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * + * @param unitPrice 修改后单价 + */ + @JSONField(name = "unit_price") + public void setUnitPrice(java.math.BigDecimal unitPrice) { + set("unit_price", unitPrice); + } + + + /** + * @return unit_price 修改后单价 + */ + @JSONField(name = "unit_price") + public java.math.BigDecimal getUnitPrice() { + return get("unit_price"); + } + + /** + * name: old_price + * type: DECIMAL(12,2) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * + * @param oldPrice 修改前单价 + */ + @JSONField(name = "old_price") + public void setOldPrice(java.math.BigDecimal oldPrice) { + set("old_price", oldPrice); + } + + + /** + * @return unit_price 修改前单价 + */ + @JSONField(name = "old_price") + public java.math.BigDecimal getOldPrice() { + return get("old_price"); + } + + + /** + * name: create_id + * type: INT UNSIGNED(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param createId 用户id + */ + @JSONField(name="create_id") + public void setCreateId(Integer createId) { + set("create_id", createId); + } + + + /** + * @return create_id 用户id + */ + @JSONField(name="create_id") + public Integer getCreateId() { + return getInt("create_id"); + } + + /** + * name: create_time + * type: DATETIME(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * @param createTime 创建时间 + */ + @JSONField(name="create_time") + public void setCreateTime(java.util.Date createTime) { + set("create_time", createTime); + } + + + /** + * @return create_time 创建时间 + */ + @JSONField(name="create_time") + public java.util.Date getCreateTime() { + return get("create_time"); + } + /** + * name: auditor_id + * type: INT UNSIGNED(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param auditorId 用户id + */ + @JSONField(name="auditor_id") + public void setAuditorId(Integer auditorId) { + set("auditor_id", auditorId); + } + + + /** + * @return auditor_id 用户id + */ + @JSONField(name="auditor_id") + public Integer getAuditorId() { + return getInt("auditor_id"); + } + + /** + * name: auditor_time + * type: DATETIME(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * @param auditorTime 创建时间 + */ + @JSONField(name="auditor_time") + public void setAuditorTime(java.util.Date auditorTime) { + set("auditor_time", auditorTime); + } + + + /** + * @return auditor_time 创建时间 + */ + @JSONField(name="auditor_time") + public java.util.Date getAuditorTime() { + return get("auditor_time"); + } + + /** + * name: state + * type: SMALLINT(5) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: 0 + * + * @param state 审核状态 0:未通过,1:已通过 + */ + @JSONField(name = "state") + public void setState(Integer state) { + set("state", state); + } + + + /** + * @return state 审核状态 0:未通过,1:已通过 + */ + @JSONField(name = "state") + public Integer getState() { + return getInt("state"); + } + + + /** + * name: del + * type: INT(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: 0 + * @param del 逻辑删除标记位 + */ + @JSONField(name="del") + public void setDel(Integer del) { + set("del", del); + } + + + /** + * @return del 逻辑删除标记位 + */ + @JSONField(name="del") + public Integer getDel() { + return getInt("del"); + } + + + /** + * name: htmlstr + * type: TEXT(65535) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param htmlstr word转成的html字符串 + */ + @JSONField(name="htmlstr") + public void setHtmlstr(String htmlstr) { + set("htmlstr", htmlstr); + } + + + /** + * @return htmlstr word转成的html字符串 + */ + @JSONField(name="htmlstr") + public String getHtmlstr() { + return getStr("htmlstr"); + } + + + /** + * name: attachment + * type: VARCHAR(255) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param attachment 附件 + */ + @JSONField(name="attachment") + public void setAttachment(String attachment) { + set("attachment", attachment); + } + + + /** + * @return attachment 附件 + */ + @JSONField(name="attachment") + public String getAttachment() { + return getStr("attachment"); + } + + +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketSandfarmDistance.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketSandfarmDistance.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketSandfarmDistance.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketSandfarmDistance.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketYield.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketYield.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketYield.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSupermarketYield.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSyncTask.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSyncTask.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSyncTask.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSyncTask.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSysuser.java similarity index 98% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSysuser.java index 78d1c1f..4eee6c1 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseSysuser.java @@ -127,6 +127,7 @@ public abstract class BaseSysuser> extends BaseModel * 修改操作不允许修改此字段 * 4. 司机 * 5. 楚和公司用户，可以查看管理全部砂站情况 + * 6. 取土场客户 */ @JSONField(name = "type") public void setType(java.lang.Integer type) { @@ -143,6 +144,7 @@ public abstract class BaseSysuser> extends BaseModel * 修改操作不允许修改此字段 * 4. 司机 * 5. 楚和公司用户，可以查看管理全部砂站情况 + * 6. 取土场客户 */ @JSONField(name = "type") public java.lang.Integer getType() { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketInvalidVerify.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketReceive.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketReceive.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTicketReceive.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTicketReceive.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTransfer.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigTrash.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceLog.java new file mode 100644 index 0000000..d5a33f3 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransPriceLog.java @@ -0,0 +1,302 @@ +package com.cowr.model.base; + +import com.alibaba.fastjson.annotation.JSONField; +import com.cowr.common.base.BaseModel; +import com.jfinal.plugin.activerecord.IBean; + +/** + * Generated by COWR Fri Apr 17 16:59:35 CST 2020 + * TableName: trans_price_log + * Remarks: 系统配置 - 运费结算记录 + *

+ * PrimaryKey: id + */ +@SuppressWarnings("serial") +public abstract class BaseTransPriceLog> extends BaseModel implements IBean { + + public static final String tablename = "trans_price_log"; + + @JSONField(serialize = false) + public String getTablename() { + return tablename; + } + + /** + * name: id + * type: INT(10) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * + * @param id + */ + @JSONField(name = "id") + public void setId(Integer id) { + set("id", id); + } + + + /** + * @return id + */ + @JSONField(name = "id") + public Integer getId() { + return getInt("id"); + } + + + /** + * name: trans_co_id + * type: INT(10) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * + * @param transCoId 物流公司 + */ + @JSONField(name = "trans_co_id") + public void setTransCoId(Integer transCoId) { + set("trans_co_id", transCoId); + } + + + /** + * @return trans_co_id 物流公司 + */ + @JSONField(name = "trans_co_id") + public Integer getTransCoId() { + return getInt("trans_co_id"); + } + + /** + * name: trans_co_name + * type: VARCHAR(128) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * + * @param transCoName + */ + @JSONField(name = "trans_co_name") + public void setTransCoName(String transCoName) { + set("trans_co_name", transCoName); + } + + + /** + * @return trans_co_name + */ + @JSONField(name = "trans_co_name") + public String getTransCoName() { + return getStr("trans_co_name"); + } + + + /** + * name: trans_name + * type: varchar(15) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * + * @param transName 联系人姓名 + */ + @JSONField(name = "trans_name") + public void setTransName(String transName) { + set("trans_name", transName); + } + + + /** + * @return trans_name 联系人姓名 + */ + @JSONField(name = "trans_name") + public String getTransName() { + return getStr("trans_name"); + } + + /** + * name: trans_phone + * type: VARCHAR(128) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * + * @param transPhone + */ + @JSONField(name = "trans_phone") + public void setTransPhone(String transPhone) { + set("trans_phone", transPhone); + } + + + /** + * @return trans_co_name + */ + @JSONField(name = "trans_phone") + public String getTransPhone() { + return getStr("trans_phone"); + } + + /** + * name: settlement_dates + * type: VARCHAR(128) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * + * @param v + */ + @JSONField(name = "settlement_dates") + public void setSettlementDates(String v) { + set("settlement_dates", v); + } + + + /** + * @return trans_co_name + */ + @JSONField(name = "settlement_dates") + public String getSettlementDates() { + return getStr("settlement_dates"); + } + + + /** + * name: bank_sn + * type: VARCHAR(128) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: 流水号 + * + * @param v + */ + @JSONField(name = "bank_sn") + public void setBankSn(String v) { + set("bank_sn", v); + } + + + /** + * @return bank_sn + */ + @JSONField(name = "bank_sn") + public String getBankSn() { + return getStr("bank_sn"); + } + + + /** + * name: bank_name + * type: VARCHAR(128) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * + * @param v + */ + @JSONField(name = "bank_name") + public void setBankName(String v) { + set("bank_name", v); + } + + + /** + * @return bank_name + */ + @JSONField(name = "bank_name") + public String getBankName() { + return getStr("bank_name"); + } + + + /** + * name: del + * type: INT(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: 0 + * + * @param del 逻辑删除标志 + */ + @JSONField(name = "del") + public void setDel(java.lang.Integer del) { + set("del", del); + } + + + /** + * @return del 逻辑删除标志 + */ + @JSONField(name = "del") + public java.lang.Integer getDel() { + return getInt("del"); + } + /** + * name: pay_date + * type: DATETIME(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * @param createTime 付款时间 + */ + @JSONField(name="pay_date") + public void setPayDate(java.util.Date createTime) { + set("pay_date", createTime); + } + + + /** + * @return create_time 创建时间 + */ + @JSONField(name="pay_date") + public java.util.Date getPayDate() { + return get("pay_date"); + } + + /** + * name: create_time + * type: DATETIME(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * @param createTime 创建时间 + */ + @JSONField(name="create_time") + public void setCreateTime(java.util.Date createTime) { + set("create_time", createTime); + } + + + /** + * @return create_time 创建时间 + */ + @JSONField(name="create_time") + public java.util.Date getCreateTime() { + return get("create_time"); + } + + /** + * name: memo + * type: VARCHAR(20) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param memo 单位 + */ + @JSONField(name="memo") + public void setMemo(String memo) { + set("memo", memo); + } + + + /** + * @return memo 备注 + */ + @JSONField(name="memo") + public String getMemo() { + return getStr("memo"); + } + + +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransport.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransport.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransport.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransport.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java similarity index 77% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java index fd45ab1..2d56c74 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java @@ -65,6 +65,28 @@ public abstract class BaseTransportCompany> ex public java.lang.String getName() { return getStr("name"); } + /** + * name: contact + * type: VARCHAR(128) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * + * @param contact + */ + @JSONField(name = "contact") + public void setContact(java.lang.String contact) { + set("contact", contact); + } + + + /** + * @return contact + */ + @JSONField(name = "contact") + public java.lang.String getContact() { + return getStr("contact"); + } /** * name: lgtd @@ -320,4 +342,74 @@ public abstract class BaseTransportCompany> ex } + /** + * name: create_id + * type: INT UNSIGNED(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param createId 用户id + */ + @JSONField(name="create_id") + public void setCreateId(Integer createId) { + set("create_id", createId); + } + + + /** + * @return create_id 用户id + */ + @JSONField(name="create_id") + public Integer getCreateId() { + return getInt("create_id"); + } + + + /** + * name: create_time + * type: TIMESTAMP(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * + * @param createTime 最后修改时间 + */ + @JSONField(name = "create_time") + public void setCreateTime(java.util.Date createTime) { + set("create_time", createTime); + } + + + /** + * @return create_time 最后修改时间 + */ + @JSONField(name = "create_time") + public java.util.Date getCreateTime() { + return get("create_time"); + } + + + /** + * name: update_time + * type: DATETIME(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * @param updateTime 更新时间 + */ + @JSONField(name="update_time") + public void setUpdateTime(java.util.Date updateTime) { + set("update_time", updateTime); + } + + + /** + * @return update_time 更新时间 + */ + @JSONField(name="update_time") + public java.util.Date getUpdateTime() { + return get("update_time"); + } + + } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruck.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruck.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruck.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruck.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java b/ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java rename to ssjygl-xsct-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java b/ssjygl-xsct-common/src/main/java/com/cowr/sms/AliyunSmsService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/sms/AliyunSmsService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/CacheData.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/CacheData.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/CacheData.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/CacheData.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java similarity index 96% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java index 14135db..2759bae 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/actioncmdlog/ActionCmdLogService.java @@ -48,9 +48,8 @@ public class ActionCmdLogService { public Page findRodLog(PageParam pp, String create_user_name, String stm, String etm) { String selectsql = "select * "; - String fromsql = "from action_cmd_log t where " + - "AND t.cmd = 'rodUp'"; -// "t.content -> '$.cmd' = 'rodUp' "; + String fromsql = "from action_cmd_log t where t.content -> '$.cmd' = 'rodUp' "; + List paraList = new ArrayList<>(); if (StrKit.notBlank(create_user_name)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/addsubtractitemrecord/AddSubtractItemRecordService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/addsubtractitemrecord/AddSubtractItemRecordService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/addsubtractitemrecord/AddSubtractItemRecordService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/addsubtractitemrecord/AddSubtractItemRecordService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicensePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicensePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicensePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicensePKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/cctv/CctvController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/cctv/CctvController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/cctv/CctvService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/cctv/CctvService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/CustomerPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/CustomerPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypePKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java similarity index 92% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java index 046ca37..ede99f5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeService.java @@ -9,11 +9,10 @@ import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; import org.apache.commons.collections4.CollectionUtils; -import java.util.*; -import java.util.stream.Collectors; - -import static java.util.stream.Collectors.mapping; -import static java.util.stream.Collectors.toList; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; /** * Generated by COWR Mon Jul 26 16:28:30 CST 2021 @@ -57,7 +56,7 @@ public class CustomerTypeService extends BaseService { // }); out.sort(Comparator.comparing(o -> - Objects.nonNull(o.getInt("id"))? CustomerTypeEnum.getSortById(String.valueOf(o.getInt("id"))) : Integer.valueOf(-1))); + Objects.nonNull(o.getInt("id"))? CustomerTypeEnum.getSortById(String.valueOf(o.getStr("id"))) : Integer.valueOf(-1))); List root = new ArrayList<>(); root.add(new Record().set("id", -1).set("name", "全部").set("children", out)); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/customer/type/CustomerTypeValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/driver/DriverPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/driver/DriverPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/driver/DriverService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/driver/DriverService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidBySnVerifyValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidBySnVerifyValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidBySnVerifyValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidBySnVerifyValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceivePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceivePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceivePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceivePKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderCancelValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/OrderCancelValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderCancelValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/OrderCancelValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/OrderService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/OrderService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderSnValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/OrderSnValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderSnValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/OrderSnValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderStateValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/OrderStateValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderStateValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/OrderStateValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/SnValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/SnValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/SnValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/SnValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/invalidverify/OrderInvalidVerifyValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java similarity index 76% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java index 8ad4b95..731f6eb 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java @@ -20,6 +20,7 @@ import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -82,6 +83,10 @@ public class OrderclusterService extends BaseService { if (state != null) { fromsql += " and t.state = ? "; paraList.add(state); + }else{ + fromsql += " and t.state in (?,?) "; + paraList.add(OrderStateEnum.INITIAL.getStateid()); + paraList.add(OrderStateEnum.ENTERED.getStateid()); } if (StrKit.notBlank(customer_name)) { @@ -94,7 +99,7 @@ public class OrderclusterService extends BaseService { paraList.add(product_id); } - if (sale_type != null && (sale_type == 0 || sale_type == 1)) { + if (sale_type != null && (sale_type == 0 || sale_type == 1|| sale_type == 2)) { fromsql += " and t.sale_type = ? \n"; paraList.add(sale_type); } @@ -134,6 +139,91 @@ public class OrderclusterService extends BaseService { return page; } + public Page findTemp2(PageParam pp, + Integer supermarket_id, + String customer_id, + String customer_name, + String stm, + String etm, + Integer state, + Integer product_id, + Integer sale_type + ) { + String selectsql = "select t.*, s.name supermarket_name "; + String fromsql = "from ordercluster t \n" + + " left join supermarket s on s.id = t.supermarket_id \n" + + " where s.type = 1 \n "; + List paraList = new ArrayList<>(); + + if (supermarket_id != null) { + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + + if (state != null) { + fromsql += " and t.state = ? "; + paraList.add(state); + }else{ + fromsql += " and t.state in (?,?) "; + paraList.add(OrderStateEnum.INITIAL.getStateid()); + paraList.add(OrderStateEnum.ENTERED.getStateid()); + } + + if (StrKit.notBlank(customer_name)) { + fromsql += " and t.customer_name like ? \n"; + paraList.add("%" + customer_name.trim() + "%"); + } + + if (StrKit.notBlank(customer_id)) { + fromsql += " and t.customer_id = ? \n"; + paraList.add( customer_id.trim()); + } + +// if (product_id != null) { +// fromsql += " and t.product_id = ? \n"; +// paraList.add(product_id); +// } + +// if (sale_type != null && (sale_type == 0 || sale_type == 1|| sale_type == 2)) { +// fromsql += " and t.sale_type = ? \n"; +// paraList.add(sale_type); +// } + + if (StrKit.notBlank(stm)) { + fromsql += " and t.cutoff_time >= ? \n"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.cutoff_time <= ? \n"; + paraList.add(etm); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && Ordercluster.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } else { + findSql += " order by t.create_time desc"; + } + + Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + List list = page.getList(); + + setOverWeight(list); + setTruckNum(list); + + return page; + } + public Page findCluster(PageParam pp, Integer supermarket_id, Integer trans_co_id, @@ -166,6 +256,10 @@ public class OrderclusterService extends BaseService { if (state != null) { fromsql += " and t.state = ? "; paraList.add(state); + }else{ + fromsql += " and t.state in (?,?) "; + paraList.add(OrderStateEnum.INITIAL.getStateid()); + paraList.add(OrderStateEnum.ENTERED.getStateid()); } if (StrKit.notBlank(customer_name)) { @@ -193,7 +287,101 @@ public class OrderclusterService extends BaseService { paraList.add(product_id); } - if (sale_type != null && (sale_type == 0 || sale_type == 1)) { + if (sale_type != null && (sale_type == 0 || sale_type == 1|| sale_type == 2)) { + fromsql += " and t.sale_type = ? \n"; + paraList.add(sale_type); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && Ordercluster.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } else { + findSql += " order by t.create_time desc"; + } + + Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + List list = page.getList(); + + setOverWeight(list); + setTruckNum(list); + + return page; + } + + + public Page findCluster2(PageParam pp, + Integer supermarket_id, + Integer trans_co_id, + Integer customer_id, + String customer_name, + String stm, + String etm, + Integer state, + Integer product_id, + Integer sale_type + ) { + String selectsql = "select t.*, s.name supermarket_name,c.customer_type_id "; + String fromsql = "from ordercluster t \n" + + " left join supermarket s on s.id = t.supermarket_id \n " + + " left join supermarket c on c.id = t.customer_id \n " + + " where t.customer_id > -1 " ; +// "is not null \n "; + List paraList = new ArrayList<>(); + + if (supermarket_id != null) { + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + + if (trans_co_id != null) { + fromsql += " and t.trans_co_id = ? "; + paraList.add(trans_co_id); + } + + if (state != null) { + fromsql += " and t.state = ? "; + paraList.add(state); + }else{ + fromsql += " and t.state in (?,?) "; + paraList.add(OrderStateEnum.INITIAL.getStateid()); + paraList.add(OrderStateEnum.ENTERED.getStateid()); + } + + if (StrKit.notBlank(customer_name)) { + fromsql += " and t.customer_name like ? \n"; + paraList.add("%" + customer_name.trim() + "%"); + } + + if (customer_id != null) { + fromsql += " and t.customer_id = ? \n"; + paraList.add(customer_id); + } + + if (StrKit.notBlank(stm)) { + fromsql += " and t.create_time >= ? \n"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.create_time <= ? \n"; + paraList.add(etm); + } + + if (product_id != null) { + fromsql += " and t.product_id = ? \n"; + paraList.add(product_id); + } + + if (sale_type != null && (sale_type == 0 || sale_type == 1|| sale_type == 2)) { fromsql += " and t.sale_type = ? \n"; paraList.add(sale_type); } @@ -303,6 +491,41 @@ public class OrderclusterService extends BaseService { return page; } + public BigDecimal getCustomerOverTotalPrice(int customer_id) { + BigDecimal out = Db.queryBigDecimal("SELECT\n" + + "\tm1.total_price - m2.total_price AS price_difference \n" + + "FROM\n" + + "\t(\n" + + "\tSELECT\n" + + "\t\tIFNULL( SUM( oc.unit_price * oc.total_weight ), 0 ) AS total_price,\n" + + "\t\toc.customer_id \n" + + "\tFROM\n" + + "\t\tordercluster oc \n" + + "\tWHERE\n" + + "\t\toc.customer_id = ? \n" + + "\t\tAND oc.state < 5 \n" + + "\t\tAND oc.sale_type = 0 \n" + + "\tGROUP BY\n" + + "\t\toc.customer_id \n" + + "\t) AS m1\n" + + "\tLEFT JOIN (\n" + + "\tSELECT\n" + + "\t\tIFNULL( SUM( ot.total_price ), 0 ) AS total_price,\n" + + "\t\toc.customer_id \n" + + "\tFROM\n" + + "\t\tordercluster oc\n" + + "\t\tLEFT JOIN order_temp ot ON ot.ordercluster_id = oc.id \n" + + "\tWHERE\n" + + "\t\toc.customer_id = ? \n" + + "\t\tAND oc.state < 5 \n" + + "\t\tAND oc.sale_type = 0 \n" + + "\t\tAND ot.state = 5 \n" + + "\tGROUP BY\n" + + "\toc.customer_id \n" + + "\t) AS m2 ON m1.customer_id = m2.customer_id;", customer_id,customer_id); + return out == null ? new BigDecimal(0) : out.setScale(2, RoundingMode.HALF_UP); + } + /** * 指定砂站未执行完成的集团订单 * diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/PresellOrderclusterValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/PresellOrderclusterValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/PresellOrderclusterValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/PresellOrderclusterValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java similarity index 92% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java index 0791fa3..824b487 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java @@ -13,7 +13,6 @@ import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; import java.util.List; @@ -26,7 +25,7 @@ import java.util.List; public class OrderclusterTruckService extends BaseService { public static final OrderclusterTruckService me = new OrderclusterTruckService(); - public Page find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state) { + public Page find(PageParam pp, String stm, String etm, String customer_name, String truck_license, Integer state, Integer supermarket_type) { String selectsql = "select t.id, t.truck_license" + ", c.uuid, c.total_weight, c.avg_weight, c.create_time, c.start_time, c.cutoff_time, c.complete_time" + ", c.unit_price, c.state, c.supermarket_id, c.trans_distance, c.pay_type, c.create_user_id" + @@ -44,6 +43,10 @@ public class OrderclusterTruckService extends BaseService { " where 1=1 "; List paraList = new ArrayList<>(); + if (supermarket_type != null) { + fromsql += " and s.type = ? \n"; + paraList.add(supermarket_type); + } if (StrKit.notBlank(stm)) { fromsql += " and c.create_time >= ? \n"; paraList.add(stm); @@ -67,6 +70,10 @@ public class OrderclusterTruckService extends BaseService { if (state != null) { fromsql += " and c.state = ? \n"; paraList.add(state); + }else{ + fromsql += " and c.state in (?,?) "; + paraList.add(OrderStateEnum.INITIAL.getStateid()); + paraList.add(OrderStateEnum.ENTERED.getStateid()); } String totalRowSql = "select count(*) " + fromsql; @@ -108,13 +115,14 @@ public class OrderclusterTruckService extends BaseService { return OrderclusterTruck.dao.findFirst("select * from ordercluster_truck t\n" + " left join ordercluster c on c.id = t.ordercluster_id \n" + - " where c.supermarket_id = ? \n" + + " where (c.supermarket_id = ? OR c.customer_id = ? )\n" + " and c.state < ?" + " and c.start_time <= ? \n" + " and c.cutoff_time >= ? \n" + " and t.truck_license = ? \n" + " limit 0,1", supermarket_id, + supermarket_id, OrderStateEnum.RECEIVED.getStateid(), // 只有未完成的订单才有效 tm, tm, diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java similarity index 80% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java index 60a22b7..bcde899 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/orderend/OrderEndService.java @@ -14,8 +14,10 @@ import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -113,6 +115,9 @@ public class OrderEndService extends BaseService { return OrderEnd.dao.find(sql,paraList.toArray()); } + + static boolean isInit = false; + public void initialize(){ // 有数据无需全量同步 @@ -120,7 +125,7 @@ public class OrderEndService extends BaseService { if (count > 0) { return; } - + isInit = true; // 开始同步历史数据 syncOrderTemp(null); } @@ -150,7 +155,7 @@ public class OrderEndService extends BaseService { } processing(tm,customerId,tempList); } - public void queryList(String tm,String customerId,String supermarketId,Integer saleType) { + public void queryList(String tm,String customerId,String supermarketId,Integer saleType,Integer invoiceType,Integer productId,Integer orderclusterId) { // 获取历史数据 @@ -158,8 +163,19 @@ public class OrderEndService extends BaseService { if (CollectionUtils.isEmpty(tempList)) { log.info("数据结果为空"); - if (StrKit.notBlank(customerId) &&StrKit.notBlank(tm) &&StrKit.notBlank(supermarketId) &&StrKit.notBlank(String.valueOf(saleType)) ){ - String id = customerId + "_" + tm + "_" + supermarketId + "_" + saleType; + if (StrKit.notBlank(customerId) &&StrKit.notBlank(tm) &&StrKit.notBlank(supermarketId) + &&StrKit.notBlank(String.valueOf(saleType)) + &&StrKit.notBlank(String.valueOf(invoiceType)) + &&StrKit.notBlank(String.valueOf(productId)) + &&StrKit.notBlank(String.valueOf(orderclusterId)) + ){ + String id = customerId + + "_" + tm + + "_" + supermarketId + + "_" + saleType + + "_" + invoiceType + + "_" + productId + + "_" + orderclusterId; Record first = Db.findFirst("select * from order_end WHERE ID = '" + id + "'"); if (first != null){ first.set("weight","0"); @@ -185,8 +201,8 @@ public class OrderEndService extends BaseService { List tempList = OrderTempService.me.getOrderTempGroupBy(tm,customerId); if (CollectionUtils.isEmpty(tempList)) { - log.info("数据结果为空"); - throw new IllegalArgumentException("数据结果为空"); + log.info("数据结果为空 " + tm + " " + customerId); + return; } processing(tm,customerId,tempList); } @@ -201,7 +217,8 @@ public class OrderEndService extends BaseService { "_" + o.getSupermarketId() + "_" + o.getSaleType() + "_" + o.getInvoiceType() + - "_" + o.getProductId()); + "_" + o.getProductId() + + "_" + o.getOrderclusterId()); return o; }) .collect(toList()); @@ -255,15 +272,17 @@ public class OrderEndService extends BaseService { } - + orderEnds = filterFormerYear(orderEnds); // 新增 + // 不能再修改往年数据 if (CollectionUtils.isNotEmpty(orderEnds)){ // 存库 addOrderEnd(orderEnds); } - if (CollectionUtils.isNotEmpty(updates)){ + List filterUpdates = filterFormerYear(updates); // 修改 + if (CollectionUtils.isNotEmpty(filterUpdates)){ // 更新 - updateOrderEnd(updates); + updateOrderEnd(filterUpdates); } if (CollectionUtils.isNotEmpty(deletes)){ @@ -275,20 +294,39 @@ public class OrderEndService extends BaseService { orderEnd.setTotalPrice(BigDecimal.ZERO); return orderEnd; }).collect(toList()); - updateOrderEnd(updateData); + + updateData = filterFormerYear(updateData); // 删除 + if (CollectionUtils.isNotEmpty(updateData)){ + updateOrderEnd(updateData); + } // 更新 // deleteOrderEnd(deletes); } + isInit = false; } + private List filterFormerYear(List orderEnds){ + if (CollectionUtils.isEmpty(orderEnds) || isInit){ + return orderEnds; + } + int year = LocalDate.now().getYear(); + log.info("当前年份:" + year); + return orderEnds.stream().filter(o -> { + String yearStr = o.get("id").toString().split("_")[1].split("-")[0]; + log.info("数据年份:" + yearStr); + return year == Integer.parseInt(yearStr); + }).collect(toList()); + } private void addOrderEnd(List orderEnds){ - boolean add = Db.tx(() -> orderEnds.size() == Db.batchSave(orderEnds,orderEnds.size()).length); + ListUtils.partition(orderEnds, 2000).forEach(list -> { + boolean add = Db.tx(() -> list.size() == Db.batchSave(list,list.size()).length); - log.info("添加数据结果: %s %s", add, orderEnds.size()); + log.info("添加数据结果: %s %s", add, list.size()); + }); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchasePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchasePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchasePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchasePKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java similarity index 98% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 9ce2ebb..8ea4f08 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -87,6 +87,7 @@ public class OrderTempService extends BaseService { String sn, String truck_license, Integer supermarket_id, + Integer supermarket_type, Integer customer_id, String customer_name, String stm, @@ -123,6 +124,11 @@ public class OrderTempService extends BaseService { paraList.add(supermarket_id); } + if (supermarket_type != null) { + fromsql += " and s.type = ? \n"; + paraList.add(supermarket_type); + } + if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; paraList.add("%" + truck_license.trim() + "%"); @@ -471,9 +477,9 @@ public class OrderTempService extends BaseService { paraList.add(customerId); } if (stm != null && etm != null) { - findSql += " AND CREATE_TIME BETWEEN ? AND ? \n"; System.out.println("stm:" + stm); System.out.println("etm:" + etm); + findSql += " AND CREATE_TIME BETWEEN ? AND ? \n"; paraList.add(stm + STM_SUFFIX); paraList.add(etm + ETM_SUFFIX); } else if (tm != null) { @@ -495,6 +501,7 @@ public class OrderTempService extends BaseService { "SALE_TYPE,\n" + "PRODUCT_ID,\n" + "INVOICE_TYPE,\n" + + "ORDERCLUSTER_ID,\n" + "ifnull(COUNT( SN ), 0 ) COUNT \n" + "FROM\n" + "ORDER_TEMP \n" + @@ -512,6 +519,7 @@ public class OrderTempService extends BaseService { "PRODUCT_ID,\n" + "INVOICE_TYPE,\n" + "SALE_TYPE,\n" + + "ORDERCLUSTER_ID,\n" + "DATE_FORMAT( CREATE_TIME, '%Y-%m-%d' )"; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java similarity index 77% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java index 7a52c27..cce1dd9 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java @@ -151,6 +151,98 @@ group by date year_total_price = 1000 * 10000; } + c.setTime(now); + c.add(Calendar.DAY_OF_MONTH, -1); + + String nowmonttm = DateTimeUtil.sd.get().format(now); // 当月 + String nowdaytm = DateTimeUtil.sdf.get().format(now); // 当日 + String predaytm = DateTimeUtil.sdf.get().format(c.getTime()); // 前一日 + + c.add(Calendar.DAY_OF_MONTH, 1); + c.add(Calendar.MONTH, -1); + + String premonthtm = DateTimeUtil.sd.get().format(c.getTime()); // 前一月 + + // 参数 + List params2 = new ArrayList<>(); + + + String sql_by_customer = "\n" + + " select\n" + + " t.customer_id,\n" + + " ifnull(max(case when t.customer_id is null then null else t.customer_name end), '零散客户') customer_name,\n" + + " sum(t.weight) weight,\n" + + " sum(t.total_price) total_price,\n" + + " count(*) truck_cnt,\n" + + " \n" + + " ifnull(sum(case when t.create_time like '" + nowmonttm + "%' then t.weight end), 0) month_weight,\n" + + " ifnull(sum(case when t.create_time like '" + nowdaytm + "%' then t.weight end), 0) day_weight,\n" + + " \n" + + " ifnull(sum(case when t.create_time like '" + nowmonttm + "%' then t.total_price end), 0) month_total_price,\n" + + " ifnull(sum(case when t.create_time like '" + nowdaytm + "%' then t.total_price end), 0) day_total_price,\n" + + " \n" + + " count(case when t.create_time like '" + nowmonttm + "%' then t.sn end) month_truck_cnt,\n" + + " count(case when t.create_time like '" + nowdaytm + "%' then t.sn end) day_truck_cnt,\n" + + " \n" + + " ifnull(sum(case when t.create_time like '" + premonthtm + "%' then t.weight end), 0) before_month_weight,\n" + + " ifnull(sum(case when t.create_time like '" + predaytm + "%' then t.weight end), 0) before_day_weight,\n" + + " \n" + + " ifnull(sum(case when t.create_time like '" + premonthtm + "%' then t.total_price end), 0) before_month_total_price,\n" + + " ifnull(sum(case when t.create_time like '" + predaytm + "%' then t.total_price end), 0) before_day_total_price,\n" + + " \n" + + " count(case when t.create_time like '" + premonthtm + "%' then t.sn end) before_month_truck_cnt,\n" + + " count(case when t.create_time like '" + predaytm + "%' then t.sn end) before_day_truck_cnt\n" + + " from order_temp t\n" + + " where t.state = ?\n"; + + + String sql_by_supermarket = " select \n" + + " s.id supermarket_id,\n" + + " s.name supermarket_name,\n" + + " ifnull(s.name2,s.name) supermarket_name2,\n" + + " ifnull(a.total_price, 0) total_price,\n" + + " ifnull(a.month_total_price, 0) month_total_price,\n" + + " ifnull(a.before_day_truck_cnt, 0) before_day_truck_cnt,\n" + + " ifnull(a.month_truck_cnt, 0) month_truck_cnt,\n" + + " ifnull(a.truck_cnt, 0) truck_cnt,\n" + + " ifnull(a.day_total_price, 0) day_total_price,\n" + + " ifnull(a.weight, 0) weight,\n" + + " ifnull(a.before_day_total_price, 0) before_day_total_price,\n" + + " ifnull(a.month_weight, 0) month_weight,\n" + + " ifnull(a.before_month_total_price, 0) before_month_total_price,\n" + + " ifnull(a.before_month_weight, 0) before_month_weight,\n" + + " ifnull(a.day_weight, 0) day_weight,\n" + + " ifnull(a.before_month_truck_cnt, 0) before_month_truck_cnt,\n" + + " ifnull(a.before_day_weight, 0) before_day_weight,\n" + + " ifnull(a.day_truck_cnt, 0) day_truck_cnt" + + " from supermarket s\n" + + " left join (\n" + + " select\n" + + " t.supermarket_id,\n" + + " sum(t.weight) weight,\n" + + " sum(t.total_price) total_price,\n" + + " count(*) truck_cnt,\n" + + " \n" + + " ifnull(sum(case when t.create_time like '" + nowmonttm + "%' then t.weight end), 0) month_weight,\n" + + " ifnull(sum(case when t.create_time like '" + nowdaytm + "%' then t.weight end), 0) day_weight,\n" + + " \n" + + " ifnull(sum(case when t.create_time like '" + nowmonttm + "%' then t.total_price end), 0) month_total_price,\n" + + " ifnull(sum(case when t.create_time like '" + nowdaytm + "%' then t.total_price end), 0) day_total_price,\n" + + " \n" + + " count(case when t.create_time like '" + nowmonttm + "%' then t.sn end) month_truck_cnt,\n" + + " count(case when t.create_time like '" + nowdaytm + "%' then t.sn end) day_truck_cnt,\n" + + " \n" + + " ifnull(sum(case when t.create_time like '" + premonthtm + "%' then t.weight end), 0) before_month_weight,\n" + + " ifnull(sum(case when t.create_time like '" + predaytm + "%' then t.weight end), 0) before_day_weight,\n" + + " \n" + + " ifnull(sum(case when t.create_time like '" + premonthtm + "%' then t.total_price end), 0) before_month_total_price,\n" + + " ifnull(sum(case when t.create_time like '" + predaytm + "%' then t.total_price end), 0) before_day_total_price,\n" + + " \n" + + " count(case when t.create_time like '" + premonthtm + "%' then t.sn end) before_month_truck_cnt,\n" + + " count(case when t.create_time like '" + predaytm + "%' then t.sn end) before_day_truck_cnt\n" + + " from order_temp t\n" + + " where t.state = ?\n"; + String sql_ordercluster = "select \n" + " ifnull(sum(g.total_weight), 0) total_weight,\n" + " ifnull(sum(g.total_price), 0) total_price,\n" + @@ -166,33 +258,12 @@ group by date " ifnull(sum(g.day_truck_cnt), 0) day_truck_cnt\n" + " from \n" + " (\n" + -// " select \n" + -// " ifnull(sum(t.weight), 0) total_weight,\n" + -// " ifnull(sum(t.total_price), 0) total_price,\n" + -// " ifnull(count(t.sn), 0) truck_cnt,\n" + -// " ifnull(sum(case when t.create_time >= ? and t.sale_type = 0 then t.weight end ), 0) year_total_weight,\n" + -// " ifnull(sum(case when t.create_time >= ? and t.sale_type = 0 then t.total_price end ), 0) year_total_price,\n" + -// " ifnull(sum(case when t.create_time >= ? and t.sale_type = 0 then 1 else 0 end ), 0) year_truck_cnt,\n" + -// " ifnull(sum(case when t.create_time >= ? then t.weight end ), 0) month_total_weight,\n" + -// " ifnull(sum(case when t.create_time >= ? then t.total_price end ), 0) month_total_price,\n" + -// " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) month_truck_cnt,\n" + -// " ifnull(sum(case when t.create_time >= ? then t.weight end ), 0) day_total_weight,\n" + -// " ifnull(sum(case when t.create_time >= ? then t.total_price end ), 0) day_total_price,\n" + -// " ifnull(sum(case when t.create_time >= ? then 1 else 0 end ), 0) day_truck_cnt\n" + -// " from order_temp t\n" + -// " where t.state = 5\n" + -// " and t.sale_type = 0\n" + -// " and t.product_id != 4\n" + " select \n" + " ifnull(sum(t.weight), 0) total_weight,\n" + -// " ifnull(sum(t.total_price), 0) total_price,\n" + " ifnull( sum( CASE WHEN t.sale_type = 0 THEN t.total_price END ), 0 ) total_price,\n" + " ifnull(sum(t.count), 0) truck_cnt,\n" + -// " ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.weight end ), 0) year_total_weight,\n" + " ifnull(sum(case when t.date >= ? then t.weight end ), 0) year_total_weight,\n" + -// " ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.total_price end ), 0) year_total_price,\n" + " ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.total_price end ), 0) year_total_price,\n" + -// " ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.count else 0 end ), 0) year_truck_cnt,\n" + " ifnull(sum(case when t.date >= ? then t.count else 0 end ), 0) year_truck_cnt,\n" + " ifnull(sum(case when t.date >= ? then t.weight end ), 0) month_total_weight,\n" + " ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.total_price end ), 0) month_total_price,\n" + @@ -200,59 +271,52 @@ group by date " ifnull(sum(case when t.date >= ? then t.weight end ), 0) day_total_weight,\n" + " ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.total_price end ), 0) day_total_price,\n" + " ifnull(sum(case when t.date >= ? then t.count else 0 end ), 0) day_truck_cnt\n" + -// " 0 day_total_weight,\n" + -// " 0 day_total_price,\n" + -// " 0 day_truck_cnt\n" + " from order_end t\n" + -// " WHERE t.sale_type = 0 \n" + - " UNION\n" + -// " SELECT\n" + -// " ifnull( sum( t.weight ), 0 ) total_weight,\n" + -//// " ifnull( sum( t.total_price ), 0 ) total_price,\n" + -// " ifnull( sum( CASE WHEN t.sale_type = 0 THEN t.total_price END ), 0 ) total_price,\n" + -// " ifnull( count( t.sn ), 0 ) truck_cnt,\n" + -// " ifnull( sum( t.weight ), 0 ) year_total_weight,\n" + -// " ifnull( sum(case when t.sale_type = 0 then t.total_price end ), 0 ) year_total_price,\n" + -// " ifnull( count( t.sn ), 0 ) year_truck_cnt,\n" + -// " ifnull( sum( t.weight ), 0 ) month_total_weight,\n" + -// " ifnull( sum( case when t.sale_type = 0 then t.total_price end ), 0 ) month_total_price,\n" + -// " ifnull( count( t.sn ), 0 ) month_truck_cnt,\n" + -// " ifnull( sum( t.weight ), 0 ) day_total_weight,\n" + -// " ifnull( sum( case when t.sale_type = 0 then t.total_price end ), 0 ) day_total_price,\n" + -// " ifnull( count( t.sn ), 0 ) day_truck_cnt \n" + -// " FROM\n" + -// " order_temp t \n" + -// " WHERE\n" + -// " t.state = 5 \n" + -// " AND t.create_time >= ? " + -//// " and t.sale_type = 0 \n" + -// " union\n" + " select \n" + " 0 total_weight,\n" + " ifnull(sum(p.presell_amount), 0) total_price,\n" + " 0 truck_cnt,\n" + " 0 year_total_weight,\n" + -// " ifnull(sum(case when p.presell_date >= ? then p.presell_amount end ), 0) year_total_price,\n" + " 0 year_total_price,\n" + " 0 year_truck_cnt,\n" + " 0 month_total_weight,\n" + -// " ifnull(sum(case when p.presell_date >= ? then p.presell_amount end ), 0) month_total_price,\n" + " 0 month_total_price,\n" + " 0 month_truck_cnt,\n" + " 0 day_total_weight,\n" + -// " ifnull(sum(case when p.presell_date >= ? then p.presell_amount end ), 0) day_total_price,\n" + " 0 day_total_price,\n" + " 0 day_truck_cnt\n" + " from presell_order p\n" + " where p.del = 0\n" + " ) g"; - Record ocout = Db.findFirst(sql_ordercluster, year, year, year, month, month, month, day - , day, day -// day, -// , year, month, day - ); + List by_supermarket_list; + + if (supermarket_id != null) { + sql_ordercluster += " and t.supermarket_id = ? "; + sql_by_customer += " and t.supermarket_id = ? "; + + params2.add(supermarket_id); + + by_supermarket_list = Db.find(sql_by_supermarket + + " and t.supermarket_id = ? " + + " group by t.supermarket_id\n" + + " ) a on a.supermarket_id = s.id \n" + + " where s.id = ? " + +// "AND s.type = 0" + + "", OrderStateEnum.RECEIVED.getStateid(), supermarket_id, supermarket_id); + } else { + by_supermarket_list = Db.find(sql_by_supermarket + + " group by t.supermarket_id\n" + + " ) a on a.supermarket_id = s.id" + +// " AND s.type = 0" + + "", OrderStateEnum.RECEIVED.getStateid()); + } + +// out.set("by_customer", Db.find(sql_by_customer + " group by t.customer_id", params2.toArray())); + out.set("by_supermarket", by_supermarket_list); + + Record ocout = Db.findFirst(sql_ordercluster, year, year, year, month, month, month, day, day, day); out.set("ordercluster", ocout); return out; @@ -594,6 +658,8 @@ group by date String[] ds = new String[]{start, end}; List ss = Supermarket.dao.findAll(); +// List ss = Supermarket.dao.find("select * from supermarket where del = 0 AND type = 0"); + List list = Db.find("select date_format(t.create_time, '%Y-%m-%d') date, count(t.sn) total_cnt, sum(t.weight) total_weight, sum(t.total_price) total_price, t.supermarket_id id\n" + " from order_temp t\n" + " where t.create_time like ?\n" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java similarity index 99% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java index 1acab31..a891ea0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java @@ -141,7 +141,7 @@ public class PrepayService { //获取账户可用余额 BigDecimal availableBalance = RefundDetailService.me.getAvailableBalance(prepayCustomer.getCustomerId(), prepayCustomer.getSurplus()); if (ordercluster.getSaleType() == 1) { - availableBalance = PresellOrderService.me.getPresellCustomerSurplus2ById(ordercluster.getCustomerId()); + availableBalance = PresellOrderService.me.getPresellCustomerSurplus2ByIdLocal(ordercluster.getCustomerId()); //local } out.set("prepay_truck", true); out.set("prepay_threshold", prepayCustomer.getThreshold()); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java similarity index 50% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java index e397e3f..6c74b43 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java @@ -16,13 +16,99 @@ import java.util.List; /** * Generated by COWR Wed Dec 15 11:37:33 CST 2021 * TableName: presell_order - * Remarks: + * Remarks: * PrimaryKey: id */ public class PresellOrderService extends BaseService { public static final PresellOrderService me = new PresellOrderService(); public Page find(PageParam pp, Integer customer_id, Integer supermarket_id, Integer del, String name, String stm, String etm, Integer type) { + String selectsql = "select t.*, c.name customer_name, s.name supermarket_name, c.texpayer_name, c.texpayer_num,\n" + + " ifnull(g.total_price, 0) yth_amount \n"; + String fromsql = " from presell_order t \n" + + " left join customer c on t.customer_id = c.id \n" + + " left join supermarket s on t.supermarket_id = s.id \n" + + " left join ( \n" + + "SELECT\n" + + " o.presell_order_id,\n" + + " ifnull(SUM(d.total_price), 0) total_price\n" + + "FROM\n" + +// " `order_temp` d\n" + + " `order_end` d\n" + + "LEFT JOIN ordercluster o ON d.ordercluster_id = o.id\n" + + "WHERE\n" + + " d.sale_type = 1\n" + +// "AND d.state = 5\n" + + "GROUP BY\n" + + " o.presell_order_id" + ") g on g.presell_order_id = t.id\n" + + " where 1=1 \n"; + List paraList = new ArrayList<>(); + + if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) { + fromsql += " and t.del = ? \n"; + paraList.add(del); + } + + if (StrKit.notBlank(name)) { + fromsql += " and c.name like ? \n"; + paraList.add("%" + name.trim() + "%"); + } + + if (supermarket_id != null) { + fromsql += " and s.id = ?"; + paraList.add(supermarket_id); + } + + if (customer_id != null) { + fromsql += " and c.id = ?"; + paraList.add(customer_id); + } + + if (StrKit.notBlank(stm)) { + fromsql += " and t.presell_date >= ?"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.presell_date <= ?"; + paraList.add(etm); + } + + if (type != null && (type == 0 || type == 1)) { + if (type == 0) { + fromsql += " and t.presell_amount - ifnull(g.total_price, 0) > 0\n"; + } else { + fromsql += " and t.presell_amount <= g.total_price \n"; + } + }else{ + fromsql += " and t.presell_amount - ifnull(g.total_price, 0) > 0\n"; + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && PresellOrder.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } else { + findSql += " order by t.create_time desc"; + } + + Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + List list = page.getList(); + + setSurplus(list); // service + + return page; + } + + public Page findLocal(PageParam pp, Integer customer_id, Integer supermarket_id, Integer del, String name, String stm, String etm, Integer type) { String selectsql = "select t.*, c.name customer_name, s.name supermarket_name, c.texpayer_name, c.texpayer_num,\n" + " ifnull(g.total_price, 0) yth_amount \n"; String fromsql = " from presell_order t \n" + @@ -73,12 +159,15 @@ public class PresellOrderService extends BaseService { paraList.add(etm); } +// if (type != null && (type == 0 || type == 1)) { if (type != null && (type == 0 || type == 1)) { if (type == 0) { fromsql += " and t.presell_amount - ifnull(g.total_price, 0) > 0\n"; } else { fromsql += " and t.presell_amount = g.total_price \n"; } + }else{ + fromsql += " and t.presell_amount - ifnull(g.total_price, 0) > 0\n"; } String totalRowSql = "select count(*) " + fromsql; @@ -100,12 +189,79 @@ public class PresellOrderService extends BaseService { Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); List list = page.getList(); - setSurplus(list); + setSurplusLocal(list); return page; } public List list(Integer customer_id, Integer supermarket_id, Integer del, String name, String stm, String etm, Integer type) { + String sql = "select t.*, c.name customer_name, s.name supermarket_name, c.texpayer_name, c.texpayer_num,\n" + + " ifnull(g.total_price, 0) yth_amount \n" + + " from presell_order t \n" + + " left join customer c on t.customer_id = c.id \n" + + " left join supermarket s on t.supermarket_id = s.id \n" + + " left join ( \n" + + "SELECT\n" + + " o.presell_order_id,\n" + + " ifnull(SUM(d.total_price), 0) total_price\n" + + "FROM\n" + +// " `order_temp` d\n" + + " `order_end` d\n" + + "LEFT JOIN ordercluster o ON d.ordercluster_id = o.id\n" + + "WHERE\n" + + " d.sale_type = 1\n" + + "AND d.state = 5\n" + + "GROUP BY\n" + + " o.presell_order_id" + ") g on g.presell_order_id = t.id\n" + + " where 1=1 \n"; + List paraList = new ArrayList<>(); + + if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) { + sql += " and t.del = ? \n"; + paraList.add(del); + } + + if (StrKit.notBlank(name)) { + sql += " and c.name like ? \n"; + paraList.add("%" + name.trim() + "%"); + } + + if (supermarket_id != null) { + sql += " and s.id = ?"; + paraList.add(supermarket_id); + } + + if (customer_id != null) { + sql += " and c.id = ?"; + paraList.add(customer_id); + } + + if (StrKit.notBlank(stm)) { + sql += " and t.presell_date >= ?"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + sql += " and t.presell_date <= ?"; + paraList.add(etm); + } + + if (type != null && (type == 0 || type == 1)) { + if (type == 0) { + sql += " and t.presell_amount - ifnull(g.total_price, 0) > 0\n"; + } else { + sql += " and t.presell_amount = g.total_price \n"; + } + } + + List list = Db.find(sql, paraList.toArray()); + + setSurplus(list); + + return list; + } + + public List listLoacl(Integer customer_id, Integer supermarket_id, Integer del, String name, String stm, String etm, Integer type) { String sql = "select t.*, c.name customer_name, s.name supermarket_name, c.texpayer_name, c.texpayer_num,\n" + " ifnull(g.total_price, 0) yth_amount \n" + " from presell_order t \n" + @@ -166,7 +322,7 @@ public class PresellOrderService extends BaseService { List list = Db.find(sql, paraList.toArray()); - setSurplus(list); + setSurplusLocal(list); return list; } @@ -179,8 +335,24 @@ public class PresellOrderService extends BaseService { for (Record r : list) { Integer customer_id = r.getInt("customer_id"); if (customer_id != null) { - BigDecimal surplus = getPresellCustomerSurplus2ById(customer_id); - BigDecimal kep_surplus = getPresellCustomerSurplusById(customer_id); + BigDecimal surplus = getPresellCustomerSurplus2ById(customer_id); // service + BigDecimal kep_surplus = getPresellCustomerSurplusById(customer_id); // service + r.set("surplus", surplus); + r.set("kep_surplus", kep_surplus); + } + } + } + + public void setSurplusLocal(List list) { + if (list == null || list.isEmpty()) { + return; + } + + for (Record r : list) { + Integer customer_id = r.getInt("customer_id"); + if (customer_id != null) { + BigDecimal surplus = getPresellCustomerSurplus2ByIdLocal(customer_id); // local + BigDecimal kep_surplus = getPresellCustomerSurplusByIdLocal(customer_id); // local r.set("surplus", surplus); r.set("kep_surplus", kep_surplus); } @@ -199,6 +371,86 @@ public class PresellOrderService extends BaseService { params.add(id); params.add(id); + String sql = "SELECT\n" + + " IFNULL(\n" + + " (\n" + + " SELECT\n" + + " (\n" + + " IFNULL(\n" + + " (\n" + + " SELECT\n" + + " sum(t.presell_amount)\n" + + " FROM\n" + + " presell_order t\n" + + " WHERE\n" + + " t.del = 0\n" + + " AND t.customer_id = ?\n" + + " ),\n" + + " 0\n" + + " )\n" + + " ) - (\n" + + " IFNULL(\n" + + " (\n" + + " SELECT\n" + + " sum(t.total_price)\n" + + " FROM\n" + +// " order_temp t\n" + + " order_end t\n" + + " WHERE\n" + + " t.sale_type = 1\n" + +// " AND t.state = 5\n" + + " AND t.customer_id = ?\n" + + " AND NOT EXISTS (\n" + + " SELECT\n" + + " *\n" + + " FROM\n" + + " ordercluster c\n" + + " WHERE\n" + + " c.sale_type = 1\n" + + " AND c.state < 5\n" + + " AND c.customer_id = ?\n" + + " AND t.ordercluster_id = c.id\n" + + " )\n" + + " ),\n" + + " 0\n" + + " )\n" + + " ) - (\n" + + " IFNULL(\n" + + " (\n" + + " SELECT\n" + + " sum(\n" + + " t.total_weight * t.unit_price\n" + + " )\n" + + " FROM\n" + + " ordercluster t\n" + + " WHERE\n" + + " t.sale_type = 1\n" + + " AND t.state < 5\n" + + " AND t.customer_id = ?\n" + + " ),\n" + + " 0\n" + + " )\n" + + " )\n" + + " ),\n" + + " 0\n" + + " ) AS suplus"; + + BigDecimal out = Db.queryBigDecimal(sql, params.toArray()); + + return out == null ? new BigDecimal(0) : out.setScale(2, BigDecimal.ROUND_HALF_UP); + } + /** + * 根据客户id查询客户的可配金额 + * @param id + * @return + */ + public BigDecimal getPresellCustomerSurplusByIdLocal(Integer id) { + List params = new ArrayList<>(); + params.add(id); + params.add(id); + params.add(id); + params.add(id); + String sql = "SELECT\n" + " IFNULL(\n" + " (\n" + @@ -277,6 +529,59 @@ public class PresellOrderService extends BaseService { params.add(id); params.add(id); + String sql = "SELECT\n" + + " IFNULL(\n" + + " (\n" + + " SELECT\n" + + " (\n" + + " IFNULL(\n" + + " (\n" + + " SELECT\n" + + " sum(t.presell_amount)\n" + + " FROM\n" + + " presell_order t\n" + + " WHERE\n" + + " t.del = 0\n" + + " AND t.customer_id = ?\n" + + " ),\n" + + " 0\n" + + " )\n" + + " ) - (\n" + + " IFNULL(\n" + + " (\n" + + " SELECT\n" + + " sum(\n" + + " t.total_price\n" + + " )\n" + + " FROM\n" + +// " order_temp t\n" + + " order_end t\n" + + " WHERE\n" + + " t.sale_type = 1\n" + +// " AND t.state = 5\n" + + " AND t.customer_id = ?\n" + + " ),\n" + + " 0\n" + + " )\n" + + " )\n" + + " ),\n" + + " 0\n" + + " ) AS suplus"; + + BigDecimal out = Db.queryBigDecimal(sql, params.toArray()); + + return out == null ? new BigDecimal(0) : out.setScale(2, BigDecimal.ROUND_HALF_UP); + } + /** + * 根据客户id查询客户的可用余额 + * @param id + * @return + */ + public BigDecimal getPresellCustomerSurplus2ByIdLocal(Integer id) { + List params = new ArrayList<>(); + params.add(id); + params.add(id); + String sql = "SELECT\n" + " IFNULL(\n" + " (\n" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductService.java similarity index 81% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductService.java index dc86dd4..673d685 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductService.java @@ -3,9 +3,7 @@ package com.cowr.ssjygl.product; import com.cowr.common.Const; import com.cowr.common.base.BaseService; import com.cowr.common.view.PageParam; -import com.cowr.common.view.Result; import com.cowr.model.Product; -import com.cowr.model.Sysuser; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Page; @@ -13,7 +11,6 @@ import com.jfinal.plugin.activerecord.Record; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -25,7 +22,7 @@ import java.util.List; public class ProductService extends BaseService { public static final ProductService me = new ProductService(); - public Page find(PageParam pp, String name, Integer del) { + public Page find(PageParam pp, String name, Integer del, Integer type) { String selectsql = "select * "; String fromsql = "from product t where 1=1 \n"; List paraList = new ArrayList<>(); @@ -34,6 +31,10 @@ public class ProductService extends BaseService { fromsql += " and t.del = ? \n"; paraList.add(del); } + if (type != null ) { + fromsql += " and t.type = ? \n"; + paraList.add(type); + } if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; @@ -57,8 +58,17 @@ public class ProductService extends BaseService { return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); } - public List list() { - return Product.dao.find("select * from product t where t.del = 0 "); + public List list( Integer type) { + String fromsql = "select * from product t where t.del = 0 "; + List paraList = new ArrayList<>(); + + if (type != null ) { + fromsql += " and t.type = ? \n"; + paraList.add(type); + } + + List products = Product.dao.find(fromsql, paraList.toArray()); + return products; } public BigDecimal getUnitPrice(Integer product_id, Integer supermarket_id) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/product/ProductValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/productpricemodify/ProductPriceModifyValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchasePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/purchase/PurchasePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchasePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/purchase/PurchasePKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java similarity index 82% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java index bf8e4bd..b5a03e4 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java @@ -56,4 +56,16 @@ public class SandfarmService extends BaseService { public List list() { return Sandfarm.dao.find("select * from sandfarm t where t.del = 0 "); } + + public List getListBySupermarketId() { + return Sandfarm.dao.find("SELECT\n" + + "\tt.* \n" + + "FROM\n" + + "\tsandfarm t\n" + + "\tLEFT JOIN supermarket s ON s.id = t.supermarket_id \n" + + "WHERE\n" + + "\tt.del = 0 \n" + + "\tAND t.supermarket_id > 0 \n" + + "\tAND s.del = 0"); + } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sms/log/SmsLogPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sms/log/SmsLogPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sms/log/SmsLogPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sms/log/SmsLogPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sms/log/SmsLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sms/log/SmsLogService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sms/log/SmsLogService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sms/log/SmsLogService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/sms/noticecontact/SmsNoticeContactValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/customer/CustomerStatService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java similarity index 99% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java index 6161315..e219627 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/invoice/InvoiceUseService.java @@ -76,7 +76,7 @@ public class InvoiceUseService { paramord.add(tm); paramord.add(tm); - if (sale_type != null && (sale_type == 0 || sale_type == 1)) { + if (sale_type != null && (sale_type == 0 || sale_type == 1|| sale_type == 2)) { logsql += " and o.sale_type = ? \n"; ordsql += " and t.sale_type = ? \n"; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java similarity index 72% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 0315be7..e6685db 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -527,7 +527,7 @@ public class OrderStatService { * * @return */ - public List salestat(String tm, Integer sale_type) { + public List salestat(String tm, Integer sale_type, Integer type) { String saleParams = ""; List params = new ArrayList<>(); @@ -540,13 +540,19 @@ public class OrderStatService { }else { // saleParams += " and t.sale_type = 0 \n"; } + + if (type != null){ + saleParams += " and s.type = ? \n"; + params.add(type); + } + String sql = "select s.id, s.name, s.name2, p.id product_id, p.`name` product_name, ifnull(a.orderCount, 0) as orderCount, ifnull(a.totalPrice, 0) as totalPrice, ifnull(a.weight, 0) as weight\n" + " from supermarket_product t\n" + " left join (\n" + " select t.id, t.product_id, count(*) as orderCount, sum(t.total_price) as totalPrice, sum(t.weight) as weight\n" + " from (\n" + " select t.supermarket_id as id, t.paid, t.total_price, t.weight, t.product_id\n" + - " from order_temp t\n" + + " from order_temp t LEFT JOIN supermarket s on t.supermarket_id = s.id\n" + " where t.state = 5 \n" + // " and t.create_time like ? \n" + " and t.create_time between ? and ? \n" + @@ -555,7 +561,7 @@ public class OrderStatService { " group by t.id, t.product_id\n" + " ) a on a.id = t.supermarket_id and a.product_id = t.product_id\n" + " left join supermarket s on s.id = t.supermarket_id\n" + - " left join product p on p.id = t.product_id"; + " left join product p on p.id = t.product_id AND p.del = 0"; List dblist = Db.find(sql, params.toArray()); @@ -579,6 +585,98 @@ public class OrderStatService { return dblist; } + /** + * 取土场日、月销售统计 + * + * @return + */ + public Record salestat1(String tm) { + List params = new ArrayList<>(); + + addTm(tm, params); + return salestat1(params.get(0).toString(),params.get(1).toString()); + } + public Record salestat1(String stm,String etm) { + + List sups = Db.find("select t.* from supermarket t \n" + + " where t.type = 0"); + + + // 查询取土场站订单信息 + List sale_list = Db.find("SELECT \n" + + "\tg.sandfarm_id," + + " s.name sandfarm_name,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.count END ), 0 ) xsl_1,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.weight END ), 0 ) xse_1,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.source_weight END ), 0 ) xss_1,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 4 THEN g.count END ), 0 ) xsl_4,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 4 THEN g.weight END ), 0 ) xse_4,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 4 THEN g.source_weight END ), 0 ) xss_4,\n" + + " ifnull( sum( g.weight), 0 ) weight\n" + + " FROM (\n" + + "SELECT\n" + + "\tt.supermarket_id,\n" + + "\tso.NAME out_name,\n" + + "\tt.sandfarm_id,\n" + + "\tsi.NAME in_name,\n" + + "\tcount( t.sn ) count,\n" + + "\tsum( t.weight ) weight,\n" + + "\tsum( t.source_weight ) source_weight \n" + + "FROM\n" + + "\torder_transfer t\n" + + "\tLEFT JOIN supermarket so ON t.sandfarm_id = so.id \n" + + "\tAND so.del = 0\n" + + "\tLEFT JOIN supermarket si ON t.supermarket_id = si.id \n" + + "\tAND si.del = 0 \n" + + "WHERE\n" + + "\tt.state = 5 " + + "\tAND t.create_time >= ? \n" + + "\tAND t.create_time <= ? \n" + + "GROUP BY\n" + + "\tsandfarm_id,\n" + + "\tsupermarket_id\n" + + ") g" + + " LEFT JOIN supermarket s ON s.id = g.sandfarm_id" + + " GROUP BY g.sandfarm_id" + + " ORDER BY g.sandfarm_id", stm,etm); + + + + double all_xsl_1 = 0.0; + double all_xse_1 = 0.0; + double all_xss_1 = 0.0; + double all_xsl_4 = 0.0; + double all_xse_4 = 0.0; + double all_xss_4 = 0.0; + double all_weight = 0.0; + + for (Record record : sale_list) { + + all_xsl_1 += DataUtil.getDefaultByRecord(record, "xsl_1"); + all_xse_1 += DataUtil.getDefaultByRecord(record, "xse_1"); + all_xss_1 += DataUtil.getDefaultByRecord(record, "xss_1"); + all_xsl_4 += DataUtil.getDefaultByRecord(record, "xsl_4"); + all_xse_4 += DataUtil.getDefaultByRecord(record, "xse_4"); + all_xss_4 += DataUtil.getDefaultByRecord(record, "xss_4"); + all_weight += DataUtil.getDefaultByRecord(record, "weight"); + } + + Record record = new Record(); + + record.set("sandfarm_name", "合计"); + record.set("xsl_1", all_xsl_1); + record.set("xse_1", all_xse_1); + record.set("xss_1", all_xss_1); + record.set("xsl_4", all_xsl_4); + record.set("xse_4", all_xse_4); + record.set("xss_4", all_xss_4); + record.set("weight", all_weight); + + sale_list.add(record); + + return new Record().set("data", sale_list).set("supermarket", sups); + } + /** * 按客户分类 * @@ -662,7 +760,7 @@ public class OrderStatService { " from order_temp t\n" + " left join customer c on c.id = t.customer_id \n" + " where t.state = ? \n" + -// " and t.create_time like ? \n" + +// " and t.create_time like ? \n" + " and t.create_time between ? and ? \n" + saleParams; if (customer_id != null) { @@ -734,7 +832,7 @@ public class OrderStatService { return dblist; } - public Workbook daysalestatExport(String tm, Integer sale_type) { + public Workbook daysalestatExport(String tm, Integer sale_type, Integer type) { String title = "销售日统计"; @@ -748,10 +846,26 @@ public class OrderStatService { subtitle += title; - return salestatExport(tm, title, subtitle, sale_type); + return salestatExport(tm, title, subtitle, sale_type,type); } - public Workbook monthsalestatExport(String tm, Integer sale_type) { + + public Workbook daysalestatExport1(String tm ) { + String title = "销售日统计"; + + +// // 副标题 start +// String subtitle = ""; +// try { +// subtitle += DateTimeUtil.sdfymd.get().format(DateTimeUtil.sdf.get().parse(tm)); +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// } + + return salestatExport1(tm, title); + } + + public Workbook monthsalestatExport(String tm, Integer sale_type, Integer type) { String title = "销售月统计"; // 副标题 start @@ -764,10 +878,26 @@ public class OrderStatService { subtitle += title; - return salestatExport(tm, title, subtitle, sale_type); + return salestatExport(tm, title, subtitle, sale_type,type); } - public Workbook yearsalestatExport(String tm, Integer sale_type) { + public Workbook monthsalestatExport1(String tm) { + String title = "销售月统计"; + + // 副标题 start + String subtitle = ""; + try { + subtitle += DateTimeUtil.sdfym.get().format(DateTimeUtil.sd.get().parse(tm)); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + subtitle += title; + + return salestatExport1(tm, title); // 月 + } + + public Workbook yearsalestatExport1(String tm) { String title = "销售年统计"; // 副标题 start @@ -780,9 +910,25 @@ public class OrderStatService { subtitle += title; - return salestatExport(tm, title, subtitle, sale_type); + return salestatExport1(tm, title); // 年 } +// public Workbook yearsalestatExport(String tm, Integer sale_type) { +// String title = "销售年统计"; +// +// // 副标题 start +// String subtitle = ""; +// try { +// subtitle += DateTimeUtil.sdfym.get().format(DateTimeUtil.sd.get().parse(tm)); +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// } +// +// subtitle += title; +// +// return salestatExport(tm, title, subtitle, sale_type); +// } + /** * 销售日、月统计 @@ -790,8 +936,8 @@ public class OrderStatService { * @param tm * @return */ - public Workbook salestatExport(String tm, String title, String subtitle, Integer sale_type) { - List list = salestat(tm, sale_type); + public Workbook salestatExport(String tm, String title, String subtitle, Integer sale_type, Integer type) { + List list = salestat(tm, sale_type,type); Workbook wb = new XSSFWorkbook(); Sheet sheet = wb.createSheet(title); @@ -846,6 +992,105 @@ public class OrderStatService { return wb; } + + /** + * 取土场销售日、月统计 + * + * @param tm + * @return + */ + public Workbook salestatExport1(String tm, String title) { + return salestatExport1(salestat1(tm),title); + } + public Workbook salestatExport1(String stm,String etm, String title) { + return salestatExport1(salestat1(stm,etm),title); + } + public Workbook salestatExport1(Record data, String title) { + List list = data.get("data"); + List sups = data.get("supermarket"); + Workbook wb = new XSSFWorkbook(); + Sheet sheet = wb.createSheet(title); + + // 表头 start + Row row = sheet.createRow(0); + + int a = 0; + row.createCell(a++).setCellValue("取土场名称"); + sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0)); + + Row row2 = sheet.createRow(1); + int a2 = 1; + + for (int i = 0; i < sups.size(); i++) { + Record s = sups.get(i); + + row.createCell(a).setCellValue(s.getStr("name")); + + sheet.addMergedRegion(new CellRangeAddress(0, 0, a, a + 2)); + a += 3; + + row2.createCell(a2++).setCellValue("运输车次"); + row2.createCell(a2++).setCellValue("出场净重（吨）"); + row2.createCell(a2++).setCellValue("到场净重(吨)"); + } + sheet.addMergedRegion(new CellRangeAddress(0, 1, a, a)); + row.createCell(a++).setCellValue("总运输量(吨)"); + + + int datalen = list.size(); + int colcnt = a; + int rowcnt = 2; + for (int i = 0; i < datalen; i++) { + Record record = list.get(i); + row = sheet.createRow(rowcnt++); + + a = 0; + row.createCell(a++).setCellValue(record.getStr("sandfarm_name")); + for (Record s : sups) { + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "xsl_" + s.getInt("id"))); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "xse_" + s.getInt("id"))); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "xss_" + s.getInt("id"))); + } + + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "weight")); + + + } + + // 通用单元格格式 + Font font = wb.createFont(); + CellStyle cellStyle = wb.createCellStyle(); + cellStyle.setBorderBottom(BorderStyle.THIN); + cellStyle.setBorderLeft(BorderStyle.THIN); + cellStyle.setBorderTop(BorderStyle.THIN); + cellStyle.setBorderRight(BorderStyle.THIN); + cellStyle.setAlignment(HorizontalAlignment.CENTER);//水平居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中 + cellStyle.setFont(font); + + for (int r = 0; r < rowcnt; r++) { + row = sheet.getRow(r); + if (row == null) { + row = sheet.createRow(r); + } + for (int c = 0; c < colcnt; c++) { + Cell cell = row.getCell(c); + + if (cell == null) { + cell = row.createCell(c); + } + cell.setCellStyle(cellStyle); + } + } + + for (int i = 0; i < 30; i++) { + sheet.setColumnWidth(i, 15 * 256); + } + + + return wb; + } + /** * 销售日、月统计 按客户 * @@ -1742,7 +1987,7 @@ public class OrderStatService { } else { row.createCell(a++).setCellValue(""); } - row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "weight")); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "total_weight")); row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "total_price")); } @@ -1939,6 +2184,198 @@ public class OrderStatService { } + + public List yearStatByCustomerLocal(String year, Boolean stat_product, Integer customer_id, Integer customer_type_id, Integer sale_type) { + List list; + String saleParams = ""; + List paraList = new ArrayList<>(); + if (sale_type != null && (sale_type == 0 || sale_type == 1)) { + saleParams += " and t.sale_type = ? \n"; + paraList.add(sale_type); + } + if (StrKit.notBlank(year)) { + if (stat_product) { +// paraList.add(year + "%"); + addTm(year, paraList); + String sql = "select ifnull(a.customer_name, '零散') name, a.*, p.surplus totalSurplus ,a.product_id,a.product_name from (\n" + +// " select ifnull(t.customer_id, -1) id," + + " select ifnull(c.id, -1) id," + + " count(t.sn) orderCount, " + +// " sum(t.count) orderCount, " + + "sum(t.total_price) totalPrice, sum(weight) weight,t.product_id," + +// "t.product_name," + + "p.name product_name," + + "c.name customer_name \n" + + " from order_temp t\n" + +// " from order_end t\n" + + " LEFT JOIN product p ON p.id = t.product_id " + + " left join customer c on c.id = t.customer_id\n" + + " where t.state = 5\n" + + " where 1 = 1\n" + + saleParams + +// " and t.create_time like ? \n"; + " and t.create_time between ? and ? \n"; +// " and t.date between ? and ? \n"; + + if (customer_id != null) { + sql += " and c.id = ? \n"; + paraList.add(customer_id); + } else if (customer_type_id != null) { + if (customer_type_id == 99) { + sql += " and t.customer_id is null \n"; +// sql += " AND c.id IS NULL \n"; + } else { + sql += " and c.customer_type_id = ? \n"; + paraList.add(customer_type_id); + } + } + + sql += " group by t.customer_id,t.product_id," + +// "t.product_name\n" + + "p.name \n" + + " ) a\n" + + " left join prepay_customer p on p.customer_id = a.id"; + list = Db.find(sql, paraList.toArray()); + } else { +// paraList.add(year + "%"); + addTm(year, paraList); + String sql = "select ifnull(a.customer_name, '零散') name, a.*, p.surplus totalSurplus from (\n" + +// " select ifnull(t.customer_id, -1) id," + + " select ifnull(c.id, -1) id," + + "count(t.sn) orderCount, " + +// " sum(t.count) orderCount, " + + "sum(t.total_price) totalPrice, sum(weight) weight, c.name customer_name \n" + + " from order_temp t\n" + +// " from order_end t\n" + + " left join customer c on c.id = t.customer_id\n" + + " where t.state = 5\n" + + " where 1 = 1\n" + + saleParams + +// " and t.create_time like ? \n"; + " and t.create_time between ? and ? \n"; +// " and t.date between ? and ? \n"; + + if (customer_id != null) { + sql += " and c.id = ? \n"; + paraList.add(customer_id); + } else if (customer_type_id != null) { + if (customer_type_id == 99) { +// sql += " and t.customer_id is null \n"; + sql += " AND c.id IS NULL \n"; + } else { + sql += " and c.customer_type_id = ? \n"; + paraList.add(customer_type_id); + } + } + + sql += " group by t.customer_id\n" + + " ) a\n" + + " left join prepay_customer p on p.customer_id = a.id"; + + list = Db.find(sql, paraList.toArray()); + } + + } else { + if (stat_product) { + String sql = "select ifnull(a.customer_name, '零散') name, a.*, p.surplus totalSurplus,a.product_id,a.product_name from (\n" + +// " select ifnull(t.customer_id, -1) id," + + " select ifnull(c.id, -1) id," + + "count(t.sn) orderCount, " + +// " sum(t.count) orderCount, " + + "sum(t.total_price) totalPrice, sum(weight) weight,t.product_id," + +// "t.product_name," + + "p.name product_name," + + " c.name customer_name \n" + + " from order_temp t\n" + +// " from order_end t\n" + + " LEFT JOIN product p ON p.id = t.product_id " + + " left join customer c on c.id = t.customer_id\n" + + " where t.state = 5\n" + + " where 1 = 1\n" + saleParams; + + if (customer_id != null) { + sql += " and c.id = ? \n"; + paraList.add(customer_id); + } else if (customer_type_id != null) { + if (customer_type_id == 99) { +// sql += " and t.customer_id is null \n"; + sql += " AND c.id IS NULL \n"; } else { + sql += " and c.customer_type_id = ? \n"; + paraList.add(customer_type_id); + } + } + + sql += " group by t.customer_id,t.product_id," + +// "t.product_name\n" + + "p.name \n" + + " ) a\n" + + " left join prepay_customer p on p.customer_id = a.id"; + + list = Db.find(sql, paraList.toArray()); + } else { + String sql = "select ifnull(a.customer_name, '零散') name, a.*, p.surplus totalSurplus from (\n" + +// " select ifnull(t.customer_id, -1) id," + + " select ifnull(c.id, -1) id," + + "count(t.sn) orderCount, " + +// " sum(t.count) orderCount, " + + "sum(t.total_price) totalPrice, sum(weight) weight, c.name customer_name \n" + + " from order_temp t\n" + +// " from order_end t\n" + + " left join customer c on c.id = t.customer_id\n" + + " where t.state = 5\n" + + " where 1 = 1\n" + saleParams; + + if (customer_id != null) { + sql += " and c.id = ? \n"; + paraList.add(customer_id); + } else if (customer_type_id != null) { + if (customer_type_id == 99) { + sql += " and t.customer_id is null \n"; + } else { + sql += " and c.customer_type_id = ? \n"; + paraList.add(customer_type_id); + } + } + + sql += " group by t.customer_id\n" + + " ) a\n" + + " left join prepay_customer p on p.customer_id = a.id"; + list = Db.find(sql, paraList.toArray()); + } + + } + + Record hj = new Record(); + hj.set("id", 0); + hj.set("name", "合计"); + hj.set("orderCount", 0); + hj.set("totalPrice", new BigDecimal(0)); + hj.set("weight", new BigDecimal(0)); + hj.set("totalSurplus", new BigDecimal(0)); + + for (Record record : list) { + if (record.get("orderCount") != null) { + hj.set("orderCount", hj.getInt("orderCount") + record.getInt("orderCount")); + } + if (record.get("totalPrice") != null) { + hj.set("totalPrice", hj.getBigDecimal("totalPrice").add(record.getBigDecimal("totalPrice"))); + } + if (record.get("weight") != null) { + hj.set("weight", hj.getBigDecimal("weight").add(record.getBigDecimal("weight"))); + } + if (record.get("totalSurplus") != null) { + hj.set("totalSurplus", hj.getBigDecimal("totalSurplus").add(record.getBigDecimal("totalSurplus"))); + } + } + + hj.set("total_account_surplus", hj.getBigDecimal("totalSurplus").add(hj.getBigDecimal("totalPrice"))); + + list.add(hj); + + return list; + } + + public Workbook yearStatByCustomerExport(String year, Boolean stat_product, Integer customer_id, Integer customer_type_id, Integer sale_type) { List list = yearStatByCustomer(year, stat_product, customer_id, customer_type_id, sale_type); Workbook wb = new XSSFWorkbook(); @@ -1999,6 +2436,66 @@ public class OrderStatService { } + public Workbook yearStatByCustomerExportLocal(String year, Boolean stat_product, Integer customer_id, Integer customer_type_id, Integer sale_type) { + List list = yearStatByCustomerLocal(year, stat_product, customer_id, customer_type_id, sale_type); + Workbook wb = new XSSFWorkbook(); + Sheet sheet; + + if (StrKit.notBlank(year)) { + sheet = wb.createSheet(year + "年销售汇总"); + } else { + sheet = wb.createSheet("销售汇总"); + } + + + // 表头 start + Row row = sheet.createRow(0); + int a = 0; + row.createCell(a++).setCellValue("名称"); + row.createCell(a++).setCellValue("订单量"); + row.createCell(a++).setCellValue("总销售吨数"); + row.createCell(a++).setCellValue("总销售额"); + row.createCell(a++).setCellValue("客户总余额"); + + int end_col = 5; + int datalen = list.size(); + Record hj = null; + + for (int i = 0; i < datalen; i++) { + Record order = list.get(i); + + row = sheet.createRow(i + 1); + a = 0; + + if (order.getInt("id") == 0) { + hj = order; + } + + row.createCell(a++).setCellValue(order.getStr("name")); + row.createCell(a++).setCellValue(order.getInt("orderCount")); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "weight")); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "totalPrice")); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "totalSurplus")); + } + + if (hj != null) { + row = sheet.createRow(datalen + 1); + a = 0; + + row.createCell(a++).setCellValue("账户总余额"); + row.createCell(a++).setCellValue(""); + row.createCell(a++).setCellValue(""); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(hj, "total_account_surplus")); + row.createCell(a++).setCellValue(""); + } + + sheet.addMergedRegion(new CellRangeAddress(datalen + 1, datalen + 1, 3, 4));// 下标从0开始 起始行号，终止行号， 起始列号，终止列号 + ReportExcelStyle.setCommonCellStyle(wb, sheet, datalen + 1, end_col); + + return wb; + } + + public List yearStatByCustomer(String stm, String etm, Boolean stat_product, Integer product_id, Integer customer_id, Integer customer_type_id, Integer sale_type) { List list; String paramsSql = ""; @@ -2287,6 +2784,130 @@ public class OrderStatService { return wb; } + + public Workbook trafficStatisticsOfEachSandStationExport1(String stm, String etm) { + Record data = trafficStatisticsOfEachSandStation1(stm, etm); + List list = data.get("data"); + List hj_children = new ArrayList<>(); + hj_children.add(list.get(list.size() - 1).set("trans_name", "合计")); + list.get(list.size() - 1).set("children", hj_children); + List sups = data.get("supermarket"); + Workbook wb = new XSSFWorkbook(); + + Sheet sheet = wb.createSheet(stm.substring(0, 10) + " ~ " + etm.substring(0, 10) + "各取土场运输量统计表"); + + // 表头 start + Row row = sheet.createRow(0); + + int a = 0; + row.createCell(a++).setCellValue("序号"); + row.createCell(a++).setCellValue("车队名称"); + row.createCell(a++).setCellValue("车牌号"); + row.createCell(a++).setCellValue("运输车次"); + row.createCell(a++).setCellValue("运输砂量(吨)"); + row.createCell(a++).setCellValue("总运输费(元)"); + + Row row2 = sheet.createRow(1); + int a2 = 6; + + for (int i = 0; i < sups.size(); i++) { + Record s = sups.get(i); + + row.createCell(a).setCellValue(s.getStr("name")); + + sheet.addMergedRegion(new CellRangeAddress(0, 0, a, a + 2)); + a += 3; + + row2.createCell(a2++).setCellValue("总出场(吨)"); + row2.createCell(a2++).setCellValue("总进场吨)"); + row2.createCell(a2++).setCellValue("运输费(元)"); + } + + sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0)); + sheet.addMergedRegion(new CellRangeAddress(0, 1, 1, 1)); + sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 2)); + sheet.addMergedRegion(new CellRangeAddress(0, 1, 3, 3)); + sheet.addMergedRegion(new CellRangeAddress(0, 1, 4, 4)); + sheet.addMergedRegion(new CellRangeAddress(0, 1, 5, 5)); + + int datalen = list.size(); + int colcnt = a; + int rowcnt = 2; + for (int i = 0; i < datalen; i++) { + int startrow = rowcnt; + Record sales = list.get(i); + row = sheet.createRow(rowcnt++); + List children = sales.get("children"); + + row.createCell(0).setCellValue(i + 1); + row.createCell(1).setCellValue(sales.getStr("trans_name")); + + if (children == null) { + continue; + } + + for (int c = 0; c < children.size(); c++) { + if (c > 0) { + row = sheet.createRow(rowcnt++); + } + + Record record = children.get(c); + a = 0; + + row.createCell(a++).setCellValue(i + 1); + row.createCell(a++).setCellValue(sales.getStr("trans_name")); + row.createCell(a++).setCellValue(record.getStr("license")); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "count")); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "weight")); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "trans_price")); + + for (Record s : sups) { + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "xss_" + s.getInt("id"))); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "xsw_" + s.getInt("id"))); + row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(record, "xst_" + s.getInt("id"))); + } + } + + if (startrow + children.size() - 1 > startrow) { + sheet.addMergedRegion(new CellRangeAddress(startrow, startrow + children.size() - 1, 0, 0)); + sheet.addMergedRegion(new CellRangeAddress(startrow, startrow + children.size() - 1, 1, 1)); + } + } + // 通用单元格格式 + Font font = wb.createFont(); + CellStyle cellStyle = wb.createCellStyle(); + cellStyle.setBorderBottom(BorderStyle.THIN); + cellStyle.setBorderLeft(BorderStyle.THIN); + cellStyle.setBorderTop(BorderStyle.THIN); + cellStyle.setBorderRight(BorderStyle.THIN); + cellStyle.setAlignment(HorizontalAlignment.CENTER);//水平居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中 + cellStyle.setFont(font); + + for (int r = 0; r < rowcnt; r++) { + row = sheet.getRow(r); + if (row == null) { + row = sheet.createRow(r); + } + for (int c = 0; c < colcnt; c++) { + Cell cell = row.getCell(c); + + if (cell == null) { + cell = row.createCell(c); + } + cell.setCellStyle(cellStyle); + } + } + + for (int i = 1; i < 30; i++) { + sheet.setColumnWidth(i, 20 * 256); + } + + sheet.setColumnWidth(1, 30 * 256); + + return wb; + } + /** * 各砂站运输量统计表 */ @@ -2297,24 +2918,10 @@ public class OrderStatService { year = tm.substring(0, 4); } - Record rec = new Record() - .set("id", 99).set("name", "石畈处置砂").set("isdeploy", 1).set("del", 0); List sups = Db.find("select t.*, s.yield from supermarket t \n" + " left join supermarket_yield s on s.supermarket_id = t.id and s.year = ? \n" + - " where id <= 6 or id = 11 or id = 12 ", year); - if (sups.size() > 0) { - sups.add(rec); - sups.add(new Record() - .set("id", 98).set("name", "竹瓦处置砂").set("isdeploy", 1).set("del", 0) - ); - sups.add(new Record() - .set("id", 97).set("name", "河东湾处置砂").set("isdeploy", 1).set("del", 0) - ); - sups.add(new Record() - .set("id", 96).set("name", "团陂处置砂").set("isdeploy", 1).set("del", 0) - ); - } + " where t.type = 0", year); String paramsSql = ""; String saleParam = ""; @@ -2327,319 +2934,12 @@ public class OrderStatService { saleParam += " and t.sale_type = ? \n"; } - String union_4 = ""; - String union_99 = ""; - String union_98 = ""; - String union_97 = ""; - String today = ""; - - // 石畈处置砂 - union_99 = " union select\n" + - " ifnull(t.customer_id, 0) customer_id,\n" + - " 99 supermarket_id,\n" + - " ifnull(sum(t.weight), 0) weight,\n" + - " ifnull(sum(t.total_price), 0) total_price\n" + - " from order_temp t\n" + - " where t.state = 5\n" + - " and t.product_id = 4\n" ; - if (invoice_type != null) { - union_99 += "and t.invoice_type = " + invoice_type + " \n"; - } - - if (sale_type != null && (sale_type == 0 || sale_type == 1)) { - union_99 += " and t.sale_type = " + sale_type + " \n"; - }else{ - union_99 += " and t.sale_type = 0 \n"; - } - - union_99 += " and t.supermarket_id = 4\n" + - " and t.create_time >= ? \n" + - " and t.create_time <= ?\n" + - " group by t.customer_id\n"; - - // 竹瓦处置砂 - union_98 = " union select\n" + - " ifnull(t.customer_id, 0) customer_id,\n" + - " 98 supermarket_id,\n" + - " ifnull(sum(t.weight), 0) weight,\n" + - " ifnull(sum(t.total_price), 0) total_price\n" + - " from order_temp t\n" + - " where t.state = 5\n" + - " and t.product_id = 4\n" ; - if (invoice_type != null) { - union_98 += "and t.invoice_type = " + invoice_type + " \n"; - } - - if (sale_type != null && (sale_type == 0 || sale_type == 1)) { - union_98 += " and t.sale_type = " + sale_type + " \n"; - }else{ - union_98 += " and t.sale_type = 0 \n"; - } - - union_98 += " and t.supermarket_id = 1\n" + - " and t.create_time >= ? \n" + - " and t.create_time <= ?\n" + - " group by t.customer_id\n"; - - // 河东湾处置砂 - union_97 = " union select\n" + - " ifnull(t.customer_id, 0) customer_id,\n" + - " 97 supermarket_id,\n" + - " ifnull(sum(t.weight), 0) weight,\n" + - " ifnull(sum(t.total_price), 0) total_price\n" + - " from order_temp t\n" + - " where t.state = 5\n" + - " and t.product_id = 4\n" ; - if (invoice_type != null) { - union_97 += "and t.invoice_type = " + invoice_type + " \n"; - } - - if (sale_type != null && (sale_type == 0 || sale_type == 1)) { - union_97 += " and t.sale_type = " + sale_type + " \n"; - }else{ - union_97 += " and t.sale_type = 0 \n"; - } - - union_97 += " and t.supermarket_id = 10\n" + - " and t.create_time >= ? \n" + - " and t.create_time <= ?\n" + - " group by t.customer_id\n"; - - -// String endDay = etm.split(" ")[0]; -// if (LocalDate.now().toString().equals(endDay)) { -// -// union_4 = "union select\n" + -// " ifnull(t.customer_id, 0) customer_id,\n" + -// " t.supermarket_id,\n" + -// " ifnull(sum(t.weight), 0) weight,\n" + -// " ifnull(sum(t.total_price), 0) total_price\n" + -// " from order_temp t\n" + -// " where t.state = 5\n"; -//// " and t.product_id != 4\n" + -// -// if (invoice_type != null) { -// union_4 += "and t.invoice_type = " + invoice_type + " \n"; -// } -// -// if (sale_type != null && (sale_type == 0 || sale_type == 1)) { -// union_4 += " and t.sale_type = " + sale_type + " \n"; -// }else{ -//// union_4 += " and t.sale_type = 0 \n"; -// } -// -// union_4 += " AND t.create_time >= CONCAT( CURDATE(), ' 00:00:00' )" + -// " group by t.customer_id\n"; -// -// } - - - -// - -// String endDay = etm.split(" ")[0]; -// if (LocalDate.now().toString().equals(endDay)) { -// -// union_4 = "union select\n" + -// " ifnull(t.customer_id, 0) customer_id,\n" + -// " t.supermarket_id,\n" + -// " ifnull(sum(t.weight), 0) weight,\n" + -// " ifnull(sum(t.total_price), 0) total_price\n" + -// " from order_temp t\n" + -// " where t.state = 5\n"; -//// " and t.product_id != 4\n" + -// -// if (invoice_type != null) { -// union_4 += "and t.invoice_type = " + invoice_type + " \n"; -// } -// -// if (sale_type != null && (sale_type == 0 || sale_type == 1)) { -// union_4 += " and t.sale_type = " + sale_type + " \n"; -// }else{ -// union_4 += " and t.sale_type = 0 \n"; -// } -// -// union_4 += " and t.supermarket_id = 4\n" + -// " and (t.create_time < '2021-09-08 00:00:00'\n" + -// " or t.create_time > '2021-10-15 23:59:59')\n" + -// " AND t.create_time >= CONCAT( CURDATE(), ' 00:00:00' )" + -//// " and t.create_time >= ? \n" + -//// " and t.create_time <= ?\n" + -// " and (t.create_time < '2021-10-20 00:00:00' or t.create_time > '2021-10-20 23:59:59')\n" + -// " group by t.customer_id\n"; -// -// union_99 = " union select\n" + -// " ifnull(t.customer_id, 0) customer_id,\n" + -// " 99 supermarket_id,\n" + -// " ifnull(sum(t.weight), 0) weight,\n" + -// " ifnull(sum(t.total_price), 0) total_price\n" + -// " from order_temp t\n" + -// " where t.state = 5\n" ; -//// " and t.product_id != 4\n" + -// if (invoice_type != null) { -// union_99 += "and t.invoice_type = " + invoice_type + " \n"; -// } -// -// if (sale_type != null && (sale_type == 0 || sale_type == 1)) { -// union_99 += " and t.sale_type = " + sale_type + " \n"; -// }else{ -// union_99 += " and t.sale_type = 0 \n"; -// } -// -// union_99 += " and t.supermarket_id = 4\n" + -// " and ((t.create_time >= '2021-09-08 00:00:00' and t.create_time <= '2021-10-15 23:59:59') \n" + -// " or (t.create_time >= '2021-10-20 00:00:00' and t.create_time <= '2021-10-20 23:59:59'))\n" + -// " AND t.create_time >= CONCAT( CURDATE(), ' 00:00:00' ) \n" + -//// " and t.create_time >= ? \n" + -//// " and t.create_time <= ?\n" + -// " group by t.customer_id\n"; -// -// today = " select\n" + -// " ifnull(t.customer_id, 0) customer_id,\n" + -// " t.supermarket_id,\n" + -// " ifnull(sum(t.weight), 0) weight,\n" + -// " ifnull(sum(t.total_price), 0) total_price\n" + -// " from order_temp t\n" + -// " where t.state = 5\n" ; -//// " and t.product_id != 4\n" + -// if (invoice_type != null) { -// today += "and t.invoice_type = " + invoice_type + " \n"; -// } -// -// if (sale_type != null && (sale_type == 0 || sale_type == 1)) { -// today += " and t.sale_type = " + sale_type + " \n"; -// }else{ -// today += " and t.sale_type = 0 \n"; -// } -// -// today += " and t.supermarket_id != 4\n" + -// " AND t.create_time >= CONCAT( CURDATE(), ' 00:00:00' ) \n" + -//// " and t.create_time>= ? \n" + -//// " and t.create_time<= ?\n" + -//// paramsSql + -// " group by t.customer_id, t.supermarket_id \n " + -// " union \n "; -// } - - -// union_4 += " UNION\n" + -// " SELECT\n" + -// " ifnull( t.customer_id, 0 ) customer_id,\n" + -// " t.supermarket_id,\n" + -// " ifnull( sum( t.weight ), 0 ) weight,\n" + -// " ifnull( sum( t.total_price ), 0 ) total_price \n" + -// " FROM\n" + -// " order_temp t \n" + -// " WHERE\n" + -// " t.supermarket_id != 4 \n" + -// " AND t.state = 5 \n" + -// " AND t.create_time >= ? \n" + -// " AND t.create_time <= ? \n" + -// " and (t.create_time < '2021-09-08'\n" + -// " or t.create_time > '2021-10-15')\n" + -// " and (t.create_time < '2021-10-20' or t.date > '2021-10-20')\n" + -// saleParam + -// " GROUP BY\n" + -// " t.customer_id,\n" + -// " t.supermarket_id"; - - -// union_99 += " union SELECT\n" + -// " ifnull( t.customer_id, 0 ) customer_id,\n" + -// " t.supermarket_id,\n" + -// " ifnull( sum( t.weight ), 0 ) weight,\n" + -// " ifnull( sum( t.total_price ), 0 ) total_price \n" + -// " FROM\n" + -// " order_temp t \n" + -// " WHERE\n" + -// " t.supermarket_id = 4 \n" + -// " AND t.state = 5 \n" + -//// " AND ( t.create_time < '2021-09-08 00:00:00' OR t.create_time > '2021-10-15 23:59:59' ) \n" + -// " AND t.create_time >= ? \n" + -// " AND t.create_time <= ? \n" + -//// " AND ( t.create_time < '2021-10-20 00:00:00' OR t.create_time > '2021-10-20 23:59:59' ) \n" + -// saleParam + -// " GROUP BY\n" + -// " t.customer_id "; - -// String order_sql = ""; - -// String sql = "select\n" + -// " g.customer_id,\n" + -// " ifnull(sum(g.weight), 0) weight,\n" + -// " ifnull(sum(g.total_price), 0) total_price,\n" + -// " ifnull(sum(case when g.supermarket_id = 1 or g.supermarket_id = 7 then g.weight end), 0) xsl_1,\n" + -// " ifnull(sum(case when g.supermarket_id = 2 then g.weight end), 0) xsl_2,\n" + -// " ifnull(sum(case when g.supermarket_id = 3 then g.weight end), 0) xsl_3,\n" + -// " ifnull(sum(case when g.supermarket_id = 4 then g.weight end), 0) xsl_4,\n" + -// " ifnull(sum(case when g.supermarket_id = 5 or g.supermarket_id = 9 then g.weight end), 0) xsl_5,\n" + -// " ifnull(sum(case when g.supermarket_id = 6 or g.supermarket_id = 8 or g.supermarket_id = 10 then g.weight end), 0) xsl_6,\n" + -// " ifnull(sum(case when g.supermarket_id = 11 then g.weight end), 0) xsl_11,\n" + -// " ifnull(sum(case when g.supermarket_id = 12 then g.weight end), 0) xsl_12,\n" + -// " ifnull(sum(case when g.supermarket_id = 97 then g.weight end), 0) xsl_97,\n" + -// " ifnull(sum(case when g.supermarket_id = 98 then g.weight end), 0) xsl_98,\n" + -// " ifnull(sum(case when g.supermarket_id = 99 then g.weight end), 0) xsl_99,\n" + -// " ifnull(sum(case when g.supermarket_id = 1 or g.supermarket_id = 7 then g.total_price end), 0) xse_1,\n" + -// " ifnull(sum(case when g.supermarket_id = 2 then g.total_price end), 0) xse_2,\n" + -// " ifnull(sum(case when g.supermarket_id = 3 then g.total_price end), 0) xse_3,\n" + -// " ifnull(sum(case when g.supermarket_id = 4 then g.total_price end), 0) xse_4,\n" + -// " ifnull(sum(case when g.supermarket_id = 5 or g.supermarket_id = 9 then g.total_price end), 0) xse_5,\n" + -// " ifnull(sum(case when g.supermarket_id = 6 or g.supermarket_id = 8 or g.supermarket_id = 10 then g.total_price end), 0) xse_6,\n" + -// " ifnull(sum(case when g.supermarket_id = 11 then g.total_price end), 0) xse_11,\n" + -// " ifnull(sum(case when g.supermarket_id = 12 then g.total_price end), 0) xse_12,\n" + -// " ifnull(sum(case when g.supermarket_id = 97 then g.total_price end), 0) xse_97,\n" + -// " ifnull(sum(case when g.supermarket_id = 98 then g.total_price end), 0) xse_98,\n" + -// " ifnull(sum(case when g.supermarket_id = 99 then g.total_price end), 0) xse_99\n" + -// " from (\n" + -// today + -// " select\n" + -// " ifnull(t.customer_id, 0) customer_id,\n" + -// " t.supermarket_id,\n" + -// " ifnull(sum(t.weight), 0) weight,\n" + -// " ifnull(sum(t.total_price), 0) total_price\n" + -// " from order_end t\n" + -// " where " + -//// "t.supermarket_id != 4\n" + -//// " and t.product_id != 4\n" + -//// " and " + -// " t.date >= ? \n" + -// " and t.date <= ?\n" + -// saleParam + -// " group by t.customer_id, t.supermarket_id\n" + -// union_4 + -// union_97 + -// union_98 + -// union_99 + -// " ) g\n" + -// " group by g.customer_id\n"; String sql = "SELECT\n" + " g.customer_id,\n" + " ifnull( sum( g.weight ), 0 ) weight,\n" + " ifnull( sum( g.total_price ), 0 ) total_price,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 1 OR g.supermarket_id = 7 THEN g.weight END ), 0 ) xsl_1,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 2 THEN g.weight END ), 0 ) xsl_2,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 3 THEN g.weight END ), 0 ) xsl_3,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 4 THEN g.weight END ), 0 ) xsl_4,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 5 OR g.supermarket_id = 9 THEN g.weight END ), 0 ) xsl_5,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 6 OR g.supermarket_id = 8 OR g.supermarket_id = 10 THEN g.weight END ),0) xsl_6,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 11 THEN g.weight END ), 0 ) xsl_11,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 12 THEN g.weight END ), 0 ) xsl_12,\n" + - " ifnull( sum( CASE WHEN g.product_id = 4 AND g.sale_type = 0 AND g.supermarket_id = 5 THEN g.weight END ),0) xsl_96,\n" + - " ifnull( sum( CASE WHEN g.product_id = 4 AND g.sale_type = 0 AND g.supermarket_id = 10 THEN g.weight END ),0) xsl_97,\n" + - " ifnull( sum( CASE WHEN g.product_id = 4 AND g.sale_type = 0 AND g.supermarket_id = 1 THEN g.weight END ),0) xsl_98,\n" + - " ifnull( sum( CASE WHEN g.product_id = 4 AND g.sale_type = 0 AND g.supermarket_id = 4 THEN g.weight END ),0 ) xsl_99,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 1 OR g.supermarket_id = 7 THEN g.total_price END ), 0 ) xse_1,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 2 THEN g.total_price END ), 0 ) xse_2,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 3 THEN g.total_price END ), 0 ) xse_3,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 4 THEN g.total_price END ), 0 ) xse_4,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 5 OR g.supermarket_id = 9 THEN g.total_price END ), 0 ) xse_5,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 6 OR g.supermarket_id = 8 OR g.supermarket_id = 10 THEN g.total_price END ),0) xse_6,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 11 THEN g.total_price END ), 0 ) xse_11,\n" + - " ifnull( sum( CASE WHEN g.supermarket_id = 12 THEN g.total_price END ), 0 ) xse_12,\n" + - " ifnull( sum( CASE WHEN g.product_id = 4 AND g.sale_type = 0 AND g.supermarket_id = 5 THEN g.total_price END ),0) xse_96,\n" + - " ifnull( sum( CASE WHEN g.product_id = 4 AND g.sale_type = 0 AND g.supermarket_id = 10 THEN g.total_price END ),0) xse_97,\n" + - " ifnull( sum( CASE WHEN g.product_id = 4 AND g.sale_type = 0 AND g.supermarket_id = 1 THEN g.total_price END ),0) xse_98,\n" + - " ifnull( sum( CASE WHEN g.product_id = 4 AND g.sale_type = 0 AND g.supermarket_id = 4 THEN g.total_price END ),0) xse_99 \n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.weight END ), 0 ) xsl_1,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.total_price END ), 0 ) xse_1\n" + "FROM\n" + " (\n" + " SELECT\n" + @@ -2661,28 +2961,22 @@ public class OrderStatService { " t.supermarket_id,\n" + " t.product_id,\n" + " t.sale_type \n" + - " ) g \n" + + " ) g LEFT JOIN supermarket s ON s.id = g.supermarket_id \n" + + " WHERE s.type = 0 \n" + "GROUP BY\n" + " g.customer_id"; List customer_sale_list; if (invoice_type != null) { if (sale_type != null && (sale_type == 0 || sale_type == 1)) { -// customer_sale_list = Db.find(sql, stm, etm, sale_type, stm, etm, sale_type, stm, etm, sale_type); -// customer_sale_list = Db.find(sql, stm, etm, sale_type, stm, etm, stm, etm, stm, etm); customer_sale_list = Db.find(sql, stm, etm, invoice_type, sale_type); } else { -// customer_sale_list = Db.find(sql, stm, etm, invoice_type, stm, etm, invoice_type, stm, etm, invoice_type); -// customer_sale_list = Db.find(sql, stm, etm, stm, etm, stm, etm, stm, etm); customer_sale_list = Db.find(sql, stm, etm, invoice_type); } } else { if (sale_type != null && (sale_type == 0 || sale_type == 1)) { -// customer_sale_list = Db.find(sql,stm, etm, sale_type, stm, etm, sale_type, stm, etm, sale_type); -// customer_sale_list = Db.find(sql,stm, etm, sale_type, stm, etm, stm, etm, stm, etm); customer_sale_list = Db.find(sql, stm, etm, sale_type); } else { -// customer_sale_list = Db.find(sql, stm, etm, stm, etm, stm, etm, stm, etm); customer_sale_list = Db.find(sql, stm, etm); } } @@ -2710,21 +3004,6 @@ public class OrderStatService { " and t.sale_type = 0\n" + " group by t.customer_id\n"; - // 如果是当天的就加上销售订单数据 -// if (LocalDate.now().toString().equals(tm)) { -// tempSql += " select t.customer_id, sum(t.total_price) total_price\n" + -// " from order_temp t\n" + -// " where t.customer_id is not null\n" + -//// "and t.product_id != 4\n" + -// " and t.create_time >= ?\n" + -// " and t.create_time <= ?\n" + -// " and t.state = 5\n" + -//// " and t.sale_type = 0\n" + -// " group by t.customer_id\n"; -// customer_pre_list_params.add(tm + STM_SUFFIX); -// customer_pre_list_params.add(tm + ETM_SUFFIX); -// -// } // customer_pre_list_params.add(tm); customer_pre_list_params.add(tm); @@ -2808,23 +3087,6 @@ public class OrderStatService { " null refund_total_amount, " + " null prepay_surplus ", customer_pre_list_params.toArray()); -// customer_pre_list.sort(new Comparator() { -// @Override -// public int compare(Record o1, Record o2) { -//// if (o1.getInt("customer_type_id") == 0 || o2.getInt("customer_type_id") == 0) { -//// return -1; -//// } else { -//// return o1.getInt("customer_type_id") - o2.getInt("customer_type_id"); -//// } -// -// Integer sort1 = CustomerTypeEnum.getSortById(String.valueOf(o1.getInt("customer_type_id"))); -// Integer sort2 = CustomerTypeEnum.getSortById(String.valueOf(o2.getInt("customer_type_id"))); -// if (Objects.isNull(sort1) || Objects.isNull(sort2)) { -// return -1 ; -// } -// return sort1 - sort2; -// } -// }); customer_pre_list.sort(Comparator.comparing(o -> Objects.nonNull(o.getInt("customer_type_id")) ? CustomerTypeEnum.getSortById(String.valueOf(o.getInt("customer_type_id"))) : Integer.valueOf(-1))); @@ -2862,27 +3124,7 @@ public class OrderStatService { double all_weight = 0.0; double all_total_price = 0.0; double all_xsl_1 = 0.0; - double all_xsl_2 = 0.0; - double all_xsl_3 = 0.0; - double all_xsl_4 = 0.0; - double all_xsl_5 = 0.0; - double all_xsl_6 = 0.0; - double all_xsl_11 = 0.0; - double all_xsl_12 = 0.0; - double all_xsl_97 = 0.0; - double all_xsl_98 = 0.0; - double all_xsl_99 = 0.0; double all_xse_1 = 0.0; - double all_xse_2 = 0.0; - double all_xse_3 = 0.0; - double all_xse_4 = 0.0; - double all_xse_5 = 0.0; - double all_xse_6 = 0.0; - double all_xse_11 = 0.0; - double all_xse_12 = 0.0; - double all_xse_97 = 0.0; - double all_xse_98 = 0.0; - double all_xse_99 = 0.0; for (Record record : typelist) { Integer customer_type_id = record.getInt("customer_type_id"); @@ -2897,27 +3139,7 @@ public class OrderStatService { double weight = 0.0; double total_price = 0.0; double xsl_1 = 0.0; - double xsl_2 = 0.0; - double xsl_3 = 0.0; - double xsl_4 = 0.0; - double xsl_5 = 0.0; - double xsl_6 = 0.0; - double xsl_11 = 0.0; - double xsl_12 = 0.0; - double xsl_97 = 0.0; - double xsl_98 = 0.0; - double xsl_99 = 0.0; double xse_1 = 0.0; - double xse_2 = 0.0; - double xse_3 = 0.0; - double xse_4 = 0.0; - double xse_5 = 0.0; - double xse_6 = 0.0; - double xse_11 = 0.0; - double xse_12 = 0.0; - double xse_97 = 0.0; - double xse_98 = 0.0; - double xse_99 = 0.0; for (Record r : list) { prepay_total_amount += DataUtil.getDefaultByRecord(r, "prepay_total_amount"); @@ -2926,27 +3148,7 @@ public class OrderStatService { weight += DataUtil.getDefaultByRecord(r, "weight"); total_price += DataUtil.getDefaultByRecord(r, "total_price"); xsl_1 += DataUtil.getDefaultByRecord(r, "xsl_1"); - xsl_2 += DataUtil.getDefaultByRecord(r, "xsl_2"); - xsl_3 += DataUtil.getDefaultByRecord(r, "xsl_3"); - xsl_4 += DataUtil.getDefaultByRecord(r, "xsl_4"); - xsl_5 += DataUtil.getDefaultByRecord(r, "xsl_5"); - xsl_6 += DataUtil.getDefaultByRecord(r, "xsl_6"); - xsl_11 += DataUtil.getDefaultByRecord(r, "xsl_11"); - xsl_12 += DataUtil.getDefaultByRecord(r, "xsl_12"); - xsl_97 += DataUtil.getDefaultByRecord(r, "xsl_97"); - xsl_98 += DataUtil.getDefaultByRecord(r, "xsl_98"); - xsl_99 += DataUtil.getDefaultByRecord(r, "xsl_99"); xse_1 += DataUtil.getDefaultByRecord(r, "xse_1"); - xse_2 += DataUtil.getDefaultByRecord(r, "xse_2"); - xse_3 += DataUtil.getDefaultByRecord(r, "xse_3"); - xse_4 += DataUtil.getDefaultByRecord(r, "xse_4"); - xse_5 += DataUtil.getDefaultByRecord(r, "xse_5"); - xse_6 += DataUtil.getDefaultByRecord(r, "xse_6"); - xse_11 += DataUtil.getDefaultByRecord(r, "xse_11"); - xse_12 += DataUtil.getDefaultByRecord(r, "xse_12"); - xse_97 += DataUtil.getDefaultByRecord(r, "xse_97"); - xse_98 += DataUtil.getDefaultByRecord(r, "xse_98"); - xse_99 += DataUtil.getDefaultByRecord(r, "xse_99"); all_prepay_total_amount += DataUtil.getDefaultByRecord(r, "prepay_total_amount"); all_refund_total_amount += DataUtil.getDefaultByRecord(r, "refund_total_amount"); @@ -2954,27 +3156,7 @@ public class OrderStatService { all_weight += DataUtil.getDefaultByRecord(r, "weight"); all_total_price += DataUtil.getDefaultByRecord(r, "total_price"); all_xsl_1 += DataUtil.getDefaultByRecord(r, "xsl_1"); - all_xsl_2 += DataUtil.getDefaultByRecord(r, "xsl_2"); - all_xsl_3 += DataUtil.getDefaultByRecord(r, "xsl_3"); - all_xsl_4 += DataUtil.getDefaultByRecord(r, "xsl_4"); - all_xsl_5 += DataUtil.getDefaultByRecord(r, "xsl_5"); - all_xsl_6 += DataUtil.getDefaultByRecord(r, "xsl_6"); - all_xsl_11 += DataUtil.getDefaultByRecord(r, "xsl_11"); - all_xsl_12 += DataUtil.getDefaultByRecord(r, "xsl_12"); - all_xsl_97 += DataUtil.getDefaultByRecord(r, "xsl_97"); - all_xsl_98 += DataUtil.getDefaultByRecord(r, "xsl_98"); - all_xsl_99 += DataUtil.getDefaultByRecord(r, "xsl_99"); all_xse_1 += DataUtil.getDefaultByRecord(r, "xse_1"); - all_xse_2 += DataUtil.getDefaultByRecord(r, "xse_2"); - all_xse_3 += DataUtil.getDefaultByRecord(r, "xse_3"); - all_xse_4 += DataUtil.getDefaultByRecord(r, "xse_4"); - all_xse_5 += DataUtil.getDefaultByRecord(r, "xse_5"); - all_xse_6 += DataUtil.getDefaultByRecord(r, "xse_6"); - all_xse_11 += DataUtil.getDefaultByRecord(r, "xse_11"); - all_xse_12 += DataUtil.getDefaultByRecord(r, "xse_12"); - all_xse_97 += DataUtil.getDefaultByRecord(r, "xse_97"); - all_xse_98 += DataUtil.getDefaultByRecord(r, "xse_98"); - all_xse_99 += DataUtil.getDefaultByRecord(r, "xse_99"); } record.set("prepay_total_amount", prepay_total_amount); @@ -2983,46 +3165,10 @@ public class OrderStatService { record.set("weight", weight); record.set("total_price", total_price); record.set("xsl_1", xsl_1); - record.set("xsl_2", xsl_2); - record.set("xsl_3", xsl_3); - record.set("xsl_4", xsl_4); - record.set("xsl_5", xsl_5); - record.set("xsl_6", xsl_6); - record.set("xsl_11", xsl_11); - record.set("xsl_12", xsl_12); - record.set("xsl_97", xsl_97); - record.set("xsl_98", xsl_98); - record.set("xsl_99", xsl_99); record.set("xse_1", xse_1); - record.set("xse_2", xse_2); - record.set("xse_3", xse_3); - record.set("xse_4", xse_4); - record.set("xse_5", xse_5); - record.set("xse_6", xse_6); - record.set("xse_11", xse_11); - record.set("xse_12", xse_12); - record.set("xse_97", xse_97); - record.set("xse_98", xse_98); - record.set("xse_99", xse_99); } } -// typelist.sort(new Comparator() { -// @Override -// public int compare(Record o1, Record o2) { -//// if (o1.getInt("customer_type_id") == 0 || o2.getInt("customer_type_id") == 0) { -//// return -1; -//// } else { -//// return o1.getInt("customer_type_id") - o2.getInt("customer_type_id"); -//// } -// Integer sort1 = CustomerTypeEnum.getSortById(String.valueOf(o1.getInt("customer_type_id"))); -// Integer sort2 = CustomerTypeEnum.getSortById(String.valueOf(o2.getInt("customer_type_id"))); -// if (Objects.isNull(sort1) || Objects.isNull(sort2)) { -// return -1 ; -// } -// return sort1 - sort2; -// } -// }); typelist.sort(Comparator.comparing(o -> Objects.nonNull(o.getInt("customer_type_id")) ? CustomerTypeEnum.getSortById(String.valueOf(o.getInt("customer_type_id"))) : Integer.valueOf(-1))); @@ -3037,33 +3183,216 @@ public class OrderStatService { record.set("weight", all_weight); record.set("total_price", all_total_price); record.set("xsl_1", all_xsl_1); - record.set("xsl_2", all_xsl_2); - record.set("xsl_3", all_xsl_3); - record.set("xsl_4", all_xsl_4); - record.set("xsl_5", all_xsl_5); - record.set("xsl_6", all_xsl_6); - record.set("xsl_11", all_xsl_11); - record.set("xsl_12", all_xsl_12); - record.set("xsl_97", all_xsl_97); - record.set("xsl_98", all_xsl_98); - record.set("xsl_99", all_xsl_99); record.set("xse_1", all_xse_1); - record.set("xse_2", all_xse_2); - record.set("xse_3", all_xse_3); - record.set("xse_4", all_xse_4); - record.set("xse_5", all_xse_5); - record.set("xse_6", all_xse_6); - record.set("xse_11", all_xse_11); - record.set("xse_12", all_xse_12); - record.set("xse_97", all_xse_97); - record.set("xse_98", all_xse_98); - record.set("xse_99", all_xse_99); typelist.add(record); return new Record().set("data", typelist).set("supermarket", sups); } + + /** + * 各取土场运输量统计表 + */ + public Record trafficStatisticsOfEachSandStation1(String stm, String etm) { + + List sups = Db.find("select t.* from supermarket t \n" + + " where t.type = 1"); //取土场 + + String sql = "SELECT\n" + + " g.trans_co_id,\n" + + " g.license,\n" + + " ifnull( sum( g.count ), 0 ) count,\n" + + " ifnull( sum( g.source_weight ), 0 ) source_weight,\n" + + " ifnull( sum( g.weight ), 0 ) weight,\n" + + " ifnull( sum( g.trans_price ), 0 ) total_price,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 2 THEN g.count END ), 0 ) xsc_2,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 2 THEN g.source_weight END ), 0 ) xss_2,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 2 THEN g.weight END ), 0 ) xsw_2,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 2 THEN g.trans_price END ), 0 ) xst_2,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 3 THEN g.count END ), 0 ) xsc_3,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 3 THEN g.source_weight END ), 0 ) xss_3,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 3 THEN g.weight END ), 0 ) xsw_3,\n" + + " ifnull( sum( CASE WHEN g.supermarket_id = 3 THEN g.trans_price END ), 0 ) xst_3\n" + + "FROM\n" + + " (\n" + + " SELECT\n" + + " ifnull( t.trans_co_id, 0 ) trans_co_id,\n" + + " t.supermarket_id,\n" + + " t.truck_license license,\n" + + " ifnull( count( t.sn ), 0 ) count,\n" + + " ifnull( sum( t.weight ), 0 ) weight,\n" + + " ifnull( sum( ot.weight ), 0 ) source_weight,\n" + + " ifnull( sum( ot.trans_price ), 0 ) trans_price \n" + + " FROM\n" + + " order_temp t \n" + + " LEFT JOIN order_transfer ot ON ot.old_sn = t.sn " + + " WHERE\n" + + " t.create_time >= ? \n" + + " AND t.create_time <= ? \n" + + " AND t.state = 5 " + + " GROUP BY\n" + + " t.trans_co_id,\n" + + " t.truck_license,\n" + + " t.supermarket_id\n" + + " ) g LEFT JOIN supermarket s ON s.id = g.supermarket_id \n" + + " WHERE s.type = 1 \n" + + "GROUP BY\n" + + " g.trans_co_id," + + " g.license"; + + List customer_sale_list = Db.find(sql, stm, etm); + + + List ids = new ArrayList<>(); + String cidsql = ""; + for (Record r : customer_sale_list) { + ids.add(r.getStr("trans_co_id")); + } + + if (!ids.isEmpty()) { + cidsql = " AND c.trans_co_id in(" + StrKit.join(ids, ",") + ") "; + } + + + + + List trans_co_list = Db.find("select\n" + + " c.trans_co_id,\n" + + " c.license \n" + + " from truck c \n" + + " where c.del = 0 AND c.state = 1 "+ cidsql); + + + Map salemap = new HashMap<>(); + Map> typemap = new HashMap<>(); + typemap.put(0, new ArrayList<>()); + + for (Record record : customer_sale_list) { + salemap.put(record.getStr("license"), record); + } + + for (Record record : trans_co_list) { + String license = record.getStr("license"); + Integer trans_co_id = record.getInt("trans_co_id"); + + if (salemap.containsKey(license)) { + Record sale = salemap.remove(license); + + record.setColumns(sale); + } + + if (!typemap.containsKey(trans_co_id)) { + typemap.put(trans_co_id, new ArrayList<>()); + } + + typemap.get(trans_co_id).add(record); + } + salemap.values().forEach( o -> typemap.get(0).add(o)); + + + List typelist = Db.find("select id trans_co_id, name trans_name from transport_company ORDER BY ID "); + + double all_count = 0.0; + double all_weight = 0.0; + double all_trans_price = 0.0; + double all_xst_2 = 0.0; + double all_xsc_2 = 0.0; + double all_xss_2 = 0.0; + double all_xsw_2 = 0.0; + double all_xst_3 = 0.0; + double all_xsc_3 = 0.0; + double all_xss_3 = 0.0; + double all_xsw_3 = 0.0; + + typelist.add(new Record().set("trans_co_id", 0).set("trans_name", "未分类")); + + for (Record record : typelist) { + Integer trans_co_id = record.getInt("trans_co_id"); + + if (typemap.containsKey(trans_co_id)) { + List list = typemap.get(trans_co_id); + record.set("children", list); + + double count = 0.0; + double weight = 0.0; + double trans_price = 0.0; + double xst_2 = 0.0; // 运输费(元) + double xsc_2 = 0.0; // 车次 + double xss_2 = 0.0; // 总进场(吨) + double xsw_2 = 0.0; // 总出场(吨) + double xst_3 = 0.0; + double xsc_3 = 0.0; + double xss_3 = 0.0; + double xsw_3 = 0.0; + + for (Record r : list) { + count += DataUtil.getDefaultByRecord(r, "count"); + weight += DataUtil.getDefaultByRecord(r, "weight"); + trans_price += DataUtil.getDefaultByRecord(r, "trans_price"); + xsc_2 += DataUtil.getDefaultByRecord(r, "xsc_2"); + xst_2 += DataUtil.getDefaultByRecord(r, "xst_2"); + xss_2 += DataUtil.getDefaultByRecord(r, "xss_2"); + xsw_2 += DataUtil.getDefaultByRecord(r, "xsw_2"); + xsc_3 += DataUtil.getDefaultByRecord(r, "xsc_3"); + xst_3 += DataUtil.getDefaultByRecord(r, "xst_3"); + xss_3 += DataUtil.getDefaultByRecord(r, "xss_3"); + xsw_3 += DataUtil.getDefaultByRecord(r, "xse_3"); + + all_count += DataUtil.getDefaultByRecord(r, "count"); + all_weight += DataUtil.getDefaultByRecord(r, "weight"); + all_trans_price += DataUtil.getDefaultByRecord(r, "trans_price"); + all_xsc_2 += DataUtil.getDefaultByRecord(r, "xsc_2"); + all_xst_2 += DataUtil.getDefaultByRecord(r, "xst_2"); + all_xss_2 += DataUtil.getDefaultByRecord(r, "xss_2"); + all_xsw_2 += DataUtil.getDefaultByRecord(r, "xsw_2"); + all_xsc_3 += DataUtil.getDefaultByRecord(r, "xsc_3"); + all_xst_3 += DataUtil.getDefaultByRecord(r, "xst_3"); + all_xss_3 += DataUtil.getDefaultByRecord(r, "xss_3"); + all_xsw_3 += DataUtil.getDefaultByRecord(r, "xse_3"); + } + + record.set("count", count); + record.set("weight", weight); + record.set("trans_price", trans_price); + record.set("xsc_2", xsc_2); + record.set("xst_2", xst_2); + record.set("xss_2", xss_2); + record.set("xsw_2", xsw_2); + record.set("xst_3", xst_3); + record.set("xsc_3", xsc_3); + record.set("xss_3", xss_3); + record.set("xsw_3", xsw_3); + } + } + + +// typelist.sort(Comparator.comparing(o -> +// Objects.nonNull(o.getInt("trans_co_id")) && o.getInt("trans_co_id") > 0 ? o.getInt("trans_co_id") : Integer.valueOf(-1))); + + Record record = new Record(); + + record.set("trans_co_id", -1); + record.set("trans_name", "合计"); + record.set("count", all_count); + record.set("weight", all_weight); + record.set("trans_price", all_trans_price); + record.set("xst_2", all_xst_2); + record.set("xsc_2", all_xsc_2); + record.set("xss_2", all_xss_2); + record.set("xsw_2", all_xsw_2); + record.set("xsc_3", all_xsc_3); + record.set("xst_3", all_xst_3); + record.set("xss_3", all_xss_3); + record.set("xsw_3", all_xsw_3); + + + typelist.add(record); + + return new Record().set("data", typelist).set("supermarket", sups); + } + + public List trafficStatistics(String stm, String etm, Integer invoice_type) { String paramsSql = ""; if (invoice_type != null) { @@ -3546,6 +3875,29 @@ public class OrderStatService { return PoiDynamicMarge.createExcel(headers, title, listMap, regions, titleMap); } + public Workbook yearsalestatExportBySupLocal(String tm) { + String title = "销售统计"; + if (!StrKit.isBlank(tm)) { + title = tm + "年销售统计"; + } + String[] headers = {"name", "item_name", "product_name", "order_num", "weight", "total_price"}; + String[] regions = {"name", "item_name"}; + Map titleMap = new HashMap<>(); + titleMap.put("name", "名称"); + titleMap.put("item_name", "实（预）售"); + titleMap.put("product_name", "品类"); + titleMap.put("order_num", "订单量"); + titleMap.put("weight", "销量(吨)"); + titleMap.put("total_price", "金额(元)"); + List> listMap = new ArrayList<>(); + List list = statYearBySupLocal(tm, 2); + for (Record r : list) { + Map map = r.getColumns(); + listMap.add(map); + } + + return PoiDynamicMarge.createExcel(headers, title, listMap, regions, titleMap); + } private Record margeRecord(Record s1, Record s2, Integer type) { Record s3 = new Record(); @@ -3608,10 +3960,11 @@ public class OrderStatService { " t.id,\n" + " t.`name`\n" + "FROM\n" + - " supermarket t\n" + - "WHERE\n" + + " supermarket t\n" + + "WHERE\n" + " id <= 6\n" + - "OR id = 11 or id = 12 "); + "OR id = 11 or id = 12 " + ); List shParamsList = new ArrayList<>(); List yhParamsList = new ArrayList<>(); @@ -3634,9 +3987,13 @@ public class OrderStatService { "select s.id, s.name, p.id product_id, p.`name` product_name, ifnull(a.orderCount, 0) as order_num, ifnull(a.totalPrice, 0) as total_price, ifnull(a.weight, 0) as weight\n" + " from supermarket_product t\n" + " left join (\n" + - " select t.id, t.product_id, count(*) as orderCount, sum(t.total_price) as totalPrice, sum(t.weight) as weight\n" + + " select t.id, t.product_id" + +// ", count(*) as orderCount" + + ", sum(t.count) as orderCount" + + ", sum(t.total_price) as totalPrice, sum(t.weight) as weight\n" + " from (\n" + - " select t.supermarket_id as id, t.total_price, t.weight, t.product_id\n" + + " select t.supermarket_id as id, t.total_price, t.weight, t.product_id" + + ", t.count\n" + // " from order_temp t \n" + " from order_end t \n" + " where t.sale_type = 0 \n" + @@ -3711,6 +4068,10 @@ public class OrderStatService { double hj_jzs_sh_weight = 0.0; double hj_jzs_sh_total_price = 0.0; + int hj_czs_sh_order_num = 0; + double hj_czs_sh_weight = 0.0; + double hj_czs_sh_total_price = 0.0; + int hj_yh_order_num = 0; double hj_yh_weight = 0.0; double hj_yh_total_price = 0.0; @@ -3888,6 +4249,10 @@ public class OrderStatService { hj_jzs_sh_order_num += order_num; hj_jzs_sh_weight += weight.doubleValue(); hj_jzs_sh_total_price += total_price.doubleValue(); + } else if (product_id == 4) { + hj_czs_sh_order_num += order_num; + hj_czs_sh_weight += weight.doubleValue(); + hj_czs_sh_total_price += total_price.doubleValue(); } r.set("key", s_id + "_sh_" + product_id); @@ -4033,6 +4398,17 @@ public class OrderStatService { retList.add(hj_sh_jzs); hj_sh_children.add(hj_sh_jzs); + Record hj_sh_czs = new Record(); + hj_sh_czs.set("key", "hj_sh_4"); + hj_sh_czs.set("name", "合计"); + hj_sh_czs.set("item_name", "实售"); + hj_sh_czs.set("product_name", "处置砂"); + hj_sh_czs.set("order_num", hj_czs_sh_order_num); + hj_sh_czs.set("weight", hj_czs_sh_weight); + hj_sh_czs.set("total_price", hj_czs_sh_total_price); + retList.add(hj_sh_czs); + hj_sh_children.add(hj_sh_czs); + Record hj_yh_1 = new Record(); hj_yh_1.set("key", "hj_yh_1"); hj_yh_1.set("name", "合计"); @@ -4064,9 +4440,503 @@ public class OrderStatService { // 总合计 Record total = new Record(); total.set("key", "total").set("name", "总合计").set("item_name", "-").set("product_name", "-") - .set("order_num", hj_hs_sh_order_num + hj_els_sh_order_num + hj_jzs_sh_order_num + hj_yh_order_num) - .set("weight", hj_hs_sh_weight + hj_els_sh_weight + hj_jzs_sh_weight + hj_yh_weight) - .set("total_price", hj_hs_sh_total_price + hj_els_sh_total_price + hj_jzs_sh_total_price + hj_yh_total_price); + .set("order_num", hj_hs_sh_order_num + hj_els_sh_order_num + hj_jzs_sh_order_num + hj_czs_sh_order_num + hj_yh_order_num) + .set("weight", hj_hs_sh_weight + hj_els_sh_weight + hj_jzs_sh_weight +hj_czs_sh_weight + hj_yh_weight) + .set("total_price", hj_hs_sh_total_price + hj_els_sh_total_price + hj_jzs_sh_total_price+ hj_czs_sh_total_price + hj_yh_total_price); + + retList.add(total); + + retChildren.add(total); + } + + return type == 1 ? retChildren : retList; + } + public List statYearBySupLocal(String tm, int type) { + // 砂站 + List sups = Db.find("SELECT\n" + + " t.id,\n" + + " t.`name`\n" + + "FROM\n" + + " supermarket t\n" + + "WHERE\n" + + " id <= 6\n" + + "OR id = 11 or id = 12 "); + + List shParamsList = new ArrayList<>(); + List yhParamsList = new ArrayList<>(); + String shParams = ""; + String yhParams = ""; + if (!StrKit.isBlank(tm)) { +// shParams += " and t.create_time like ? \n"; +// yhParams += " and p.presell_date like ? \n"; + shParams += " and t.create_time between ? and ? \n"; + yhParams += " and p.presell_date between ? and ? \n"; +// shParams += " and t.date between ? and ? \n"; +// yhParams += " and t.date between ? and ? \n"; +// shParamsList.add(tm + "%"); +// yhParamsList.add(tm + "%"); + addTm(tm, shParamsList); + addTm(tm, yhParamsList); + } + // 实售 + List shList = Db.find( + "select s.id, s.name, p.id product_id, p.`name` product_name, ifnull(a.orderCount, 0) as order_num, ifnull(a.totalPrice, 0) as total_price, ifnull(a.weight, 0) as weight\n" + + " from supermarket_product t\n" + + " left join (\n" + + " select t.id, t.product_id, count(*) as orderCount, sum(t.total_price) as totalPrice, sum(t.weight) as weight\n" + + " from (\n" + + " select t.supermarket_id as id, t.total_price, t.weight, t.product_id\n" + + " from order_temp t \n" + +// " from order_end t \n" + + " where t.sale_type = 0 \n" + + " and t.state = 5 \n" + + shParams + + " ) t\n" + + " group by t.id, t.product_id\n" + + " ) a on a.id = t.supermarket_id and a.product_id = t.product_id\n" + + " left join supermarket s on s.id = t.supermarket_id\n" + + " left join product p on p.id = t.product_id " + + " WHERE s.id is not null " + + " order BY s.id, p.id ASC", shParamsList.toArray()); + // 预售 + List yhList = Db.find( + "SELECT\n" + + " s.id,\n" + + " ifnull( t.order_num, 0 ) order_num,\n" + + " ifnull( t.weight, 0 ) weight,\n" + + " ifnull( t.total_price, 0 ) total_price \n" + + "FROM\n" + + " supermarket s\n" + + " LEFT JOIN (\n" + + " SELECT\n" + + " t.supermarket_id,\n" + + " ifnull( count(*), 0 ) AS order_num,\n" + +// " ifnull( sum( t.count), 0 ) AS order_num,\n" + + " ifnull( sum( t.weight ), 0 ) AS weight,\n" + + " ifnull( sum( t.total_price ), 0 ) AS total_price \n" + + " FROM\n" + + " order_temp t\n" + + " LEFT JOIN ordercluster c ON c.id = t.ordercluster_id\n" + + " LEFT JOIN presell_order p ON p.id = c.presell_order_id \n" + +// " order_end t\n" + + " WHERE\n" + + " t.sale_type = 1 \n" + + " AND t.state = 5 \n" + + yhParams + + " GROUP BY\n" + + " t.supermarket_id \n" + + " ) t ON s.id = t.supermarket_id", + +// "SELECT\n" + +// " t.supermarket_id id,\n" + +// " ifnull(count(*), 0) as order_num,\n" + +// " ifnull(sum(t.weight), 0) as weight,\n" + +// " ifnull(sum(t.total_price), 0) as total_price\n" + +// "FROM\n" + +// " order_temp t\n" + +// "LEFT JOIN ordercluster c ON c.id = t.ordercluster_id\n" + +// "LEFT JOIN presell_order p ON p.id = c.presell_order_id\n" + +// "WHERE\n" + +// " t.sale_type = 1\n" + +// " AND t.state = 5\n" + +// " AND p.del = 0\n" + +// yhParams + +// "GROUP BY\n" + +// " t.supermarket_id", + yhParamsList.toArray()); + + List retChildren = new ArrayList<>(); + List retList = new ArrayList<>(); + List shList1 = new ArrayList<>(); + List yhList1 = new ArrayList<>(); + + int hj_hs_sh_order_num = 0; + double hj_hs_sh_weight = 0.0; + double hj_hs_sh_total_price = 0.0; + + int hj_els_sh_order_num = 0; + double hj_els_sh_weight = 0.0; + double hj_els_sh_total_price = 0.0; + + int hj_jzs_sh_order_num = 0; + double hj_jzs_sh_weight = 0.0; + double hj_jzs_sh_total_price = 0.0; + + int hj_czs_sh_order_num = 0; + double hj_czs_sh_weight = 0.0; + double hj_czs_sh_total_price = 0.0; + + int hj_yh_order_num = 0; + double hj_yh_weight = 0.0; + double hj_yh_total_price = 0.0; + + // 实售合并 + if (shList != null && !shList.isEmpty()) { + Map shMap = new HashMap<>(); + for (Record s : shList) { + int id = s.getInt("id"); + int product_id = s.getInt("product_id"); + if ((id == 1 || id == 5 || id == 6 || id == 7 || id == 8 || id == 9 || id == 10) && product_id == 1) { + shMap.put(id, s); + } else { + shList1.add(s); + } + } + if (shMap.size() > 1) { + Record s_1 = shMap.get(1); + Record s_5 = shMap.get(5); + Record s_6 = shMap.get(6); + Record s_7 = shMap.get(7); + Record s_8 = shMap.get(8); + Record s_9 = shMap.get(9); + Record s_10 = shMap.get(10); + if (s_1 != null && s_7 != null) { + Record s_1_7 = margeRecord(s_1, s_7, 1); + shList1.add(s_1_7); + shMap.remove(1); + shMap.remove(7); + } + if (s_5 != null && s_9 != null) { + Record s_5_9 = margeRecord(s_5, s_9, 1); + shList1.add(s_5_9); + shMap.remove(5); + shMap.remove(9); + } + if (s_6 != null && s_8 != null && s_10 == null) { + Record s_6_8 = margeRecord(s_6, s_8, 1); + shList1.add(s_6_8); + shMap.remove(6); + shMap.remove(8); + } + if (s_6 != null && s_8 == null && s_10 != null) { + Record s_6_10 = margeRecord(s_6, s_10, 1); + shList1.add(s_6_10); + shMap.remove(6); + shMap.remove(10); + } + if (s_6 != null && s_8 != null && s_10 != null) { + Record s_8_10 = margeRecord(s_8, s_10, 1); + Record s_6_8_10 = margeRecord(s_6, s_8_10, 1); + shList1.add(s_6_8_10); + shMap.remove(6); + shMap.remove(8); + shMap.remove(10); + } + if (shMap.size() > 0) { + shList1.addAll(shMap.values()); + } + } else if (shMap.size() == 1) { + shList1.addAll(shMap.values()); + } + } else { + for (Record s : sups) { + Record p = new Record(); + p.set("id", s.getInt("id")); + p.set("name", s.getStr("name")); + p.set("product_id", 1); + p.set("product_name", "黄砂"); + p.set("order_num", 0); + p.set("weight", new BigDecimal(0)); + p.set("total_price", new BigDecimal(0)); + shList1.add(p); + } + } + // 预售合并 + if (yhList != null && !yhList.isEmpty()) { + Map yhMap = new HashMap<>(); + for (Record s : yhList) { + int id = s.getInt("id"); + if (id == 1 || id == 5 || id == 6 || id == 7 || id == 8 || id == 9 || id == 10) { + yhMap.put(id, s); + } else { + yhList1.add(s); + } + } + if (yhMap.size() > 1) { + Record s_1 = yhMap.get(1); + Record s_5 = yhMap.get(5); + Record s_6 = yhMap.get(6); + Record s_7 = yhMap.get(7); + Record s_8 = yhMap.get(8); + Record s_9 = yhMap.get(9); + Record s_10 = yhMap.get(10); + if (s_1 != null && s_7 != null) { + Record s_1_7 = margeRecord(s_1, s_7, null); + yhList1.add(s_1_7); + yhMap.remove(1); + yhMap.remove(7); + } + if (s_5 != null && s_9 != null) { + Record s_5_9 = margeRecord(s_5, s_9, null); + yhList1.add(s_5_9); + yhMap.remove(5); + yhMap.remove(9); + } + if (s_6 != null && s_8 != null && s_10 == null) { + Record s_6_8 = margeRecord(s_6, s_8, null); + yhList1.add(s_6_8); + yhMap.remove(6); + yhMap.remove(8); + } + if (s_6 != null && s_8 == null && s_10 != null) { + Record s_6_10 = margeRecord(s_6, s_10, null); + yhList1.add(s_6_10); + yhMap.remove(6); + yhMap.remove(10); + } + if (s_6 != null && s_8 != null && s_10 != null) { + Record s_8_10 = margeRecord(s_8, s_10, null); + Record s_6_8_10 = margeRecord(s_6, s_8_10, null); + yhList1.add(s_6_8_10); + yhMap.remove(6); + yhMap.remove(8); + yhMap.remove(10); + } + if (yhMap.size() > 0) { + yhList1.addAll(yhMap.values()); + } + } else if (yhMap.size() == 1) { + yhList1.addAll(yhMap.values()); + } + } else { + for (Record s : sups) { + Record p = new Record(); + p.set("id", s.getInt("id")); + p.set("order_num", 0); + p.set("weight", new BigDecimal(0)); + p.set("total_price", new BigDecimal(0)); + yhList1.add(p); + } + } + if (sups.size() > 0) { + for (Record s : sups) { + Record p = new Record(); + int s_id = s.getInt("id"); + String name = s.getStr("name"); + p.set("key", s_id); + p.set("name", name); + Record sh = new Record(); + sh.set("key", s_id + "_sh"); + sh.set("item_name", "实售"); + List shChildren = new ArrayList<>(); + if (shList1.size() > 0) { + boolean flag = true; + for (Record sl : shList1) { + int sl_id = sl.getInt("id"); + int product_id = sl.getInt("product_id"); + if (s_id == sl_id) { + flag = false; + Record r = new Record(); + int order_num = sl.getInt("order_num") == null ? 0 : sl.getInt("order_num"); + BigDecimal weight = sl.getBigDecimal("weight") == null ? new BigDecimal(0) : sl.getBigDecimal("weight"); + BigDecimal total_price = sl.getBigDecimal("total_price") == null ? new BigDecimal(0) : sl.getBigDecimal("total_price"); + + if (product_id == 1) { + hj_hs_sh_order_num += order_num; + hj_hs_sh_weight += weight.doubleValue(); + hj_hs_sh_total_price += total_price.doubleValue(); + } else if (product_id == 2) { + hj_els_sh_order_num += order_num; + hj_els_sh_weight += weight.doubleValue(); + hj_els_sh_total_price += total_price.doubleValue(); + } else if (product_id == 3) { + hj_jzs_sh_order_num += order_num; + hj_jzs_sh_weight += weight.doubleValue(); + hj_jzs_sh_total_price += total_price.doubleValue(); + }else if (product_id == 4) { + hj_czs_sh_order_num += order_num; + hj_czs_sh_weight += weight.doubleValue(); + hj_czs_sh_total_price += total_price.doubleValue(); + } + + r.set("key", s_id + "_sh_" + product_id); + r.set("id", s_id); + r.set("name", name); + r.set("item_name", "实售"); + r.set("product_id", product_id); + r.set("product_name", sl.getStr("product_name")); + r.set("order_num", order_num); + r.set("weight", weight); + r.set("total_price", total_price); + retList.add(r); + shChildren.add(new Record().setColumns(r).remove("name").remove("item_name")); + } + } + if (flag) { + Record r = new Record(); + r.set("key", s_id + "_sh_1"); + r.set("id", s_id); + r.set("name", name); + r.set("item_name", "实售"); + r.set("product_id", 1); + r.set("product_name", "-"); + r.set("order_num", "-"); + r.set("weight", "-"); + r.set("total_price", "-"); + retList.add(r); + shChildren.add(new Record().setColumns(r).remove("name").remove("item_name")); + } + } + + shChildren.sort(new Comparator() { + @Override + public int compare(Record o1, Record o2) { + return o1.getInt("product_id") - o2.getInt("product_id"); + } + }); + sh.set("children", shChildren); + + Record yh = new Record(); + yh.set("key", s.getInt("id") + "_yh"); + yh.set("item_name", "预售"); + List yhChildren = new ArrayList<>(); + if (yhList1.size() > 0) { + boolean flag = true; + for (Record yl : yhList1) { + int yl_id = yl.getInt("id"); + if (s_id == yl_id) { + flag = false; + Record r = new Record(); + + int order_num = yl.getInt("order_num") == null ? 0 : yl.getInt("order_num"); + BigDecimal weight = yl.getBigDecimal("weight") == null ? new BigDecimal(0) : yl.getBigDecimal("weight"); + BigDecimal total_price = yl.getBigDecimal("total_price") == null ? new BigDecimal(0) : yl.getBigDecimal("total_price"); + hj_yh_order_num += order_num; + hj_yh_weight += weight.doubleValue(); + hj_yh_total_price += total_price.doubleValue(); + + r.set("key", yl_id + "_yh_1"); + r.set("id", s_id); + r.set("name", name); + r.set("item_name", "预售"); + r.set("product_name", "-"); + r.set("order_num", order_num); + r.set("weight", weight); + r.set("total_price", total_price); + retList.add(r); + yhChildren.add(new Record().setColumns(r).remove("name").remove("item_name")); + } + } + if (flag) { + Record r2 = new Record(); + r2.set("key", s_id + "_yh_1"); + r2.set("id", s_id); + r2.set("name", name); + r2.set("item_name", "预售"); + r2.set("product_name", "-"); + r2.set("order_num", "-"); + r2.set("weight", "-"); + r2.set("total_price", "-"); + retList.add(r2); + yhChildren.add(new Record().setColumns(r2).remove("name").remove("item_name")); + } + } + yh.set("children", yhChildren); + List children = new ArrayList<>(); + + children.add(sh); + children.add(yh); + p.set("children", children); + + retChildren.add(p); + } + + retList.sort(new Comparator() { + @Override + public int compare(Record o1, Record o2) { + if (o1.getInt("product_id") != null && o2.getInt("product_id") != null + && o1.getInt("id") == o2.getInt("id")) { + return o1.getInt("product_id") - o2.getInt("product_id"); + } else if (o1.getInt("id") != null && o2.getInt("id") != null) { + return o1.getInt("id") - o2.getInt("id"); + } + return 1; + } + }); + + // 合计 + Record hj = new Record(); + List hj_sh_children = new ArrayList<>(); + List hj_yh_children = new ArrayList<>(); + + Record hj_sh_hs = new Record(); + hj_sh_hs.set("key", "hj_sh_1"); + hj_sh_hs.set("name", "合计"); + hj_sh_hs.set("item_name", "实售"); + hj_sh_hs.set("product_name", "黄砂"); + hj_sh_hs.set("order_num", hj_hs_sh_order_num); + hj_sh_hs.set("weight", hj_hs_sh_weight); + hj_sh_hs.set("total_price", hj_hs_sh_total_price); + retList.add(hj_sh_hs); + hj_sh_children.add(new Record().setColumns(hj_sh_hs).remove("name").remove("item_name")); + + Record hj_sh_els = new Record(); + hj_sh_els.set("key", "hj_sh_2"); + hj_sh_els.set("name", "合计"); + hj_sh_els.set("item_name", "实售"); + hj_sh_els.set("product_name", "鹅卵石"); + hj_sh_els.set("order_num", hj_els_sh_order_num); + hj_sh_els.set("weight", hj_els_sh_weight); + hj_sh_els.set("total_price", hj_els_sh_total_price); + retList.add(hj_sh_els); + hj_sh_children.add(new Record().setColumns(hj_sh_els).remove("name").remove("item_name")); + + Record hj_sh_jzs = new Record(); + hj_sh_jzs.set("key", "hj_sh_3"); + hj_sh_jzs.set("name", "合计"); + hj_sh_jzs.set("item_name", "实售"); + hj_sh_jzs.set("product_name", "机制砂"); + hj_sh_jzs.set("order_num", hj_jzs_sh_order_num); + hj_sh_jzs.set("weight", hj_jzs_sh_weight); + hj_sh_jzs.set("total_price", hj_jzs_sh_total_price); + retList.add(hj_sh_jzs); + hj_sh_children.add(hj_sh_jzs); + + Record hj_sh_czs = new Record(); + hj_sh_czs.set("key", "hj_sh_4"); + hj_sh_czs.set("name", "合计"); + hj_sh_czs.set("item_name", "实售"); + hj_sh_czs.set("product_name", "处置砂"); + hj_sh_czs.set("order_num", hj_czs_sh_order_num); + hj_sh_czs.set("weight", hj_czs_sh_weight); + hj_sh_czs.set("total_price", hj_czs_sh_total_price); + retList.add(hj_sh_czs); + hj_sh_children.add(hj_sh_czs); + + Record hj_yh_1 = new Record(); + hj_yh_1.set("key", "hj_yh_1"); + hj_yh_1.set("name", "合计"); + hj_yh_1.set("item_name", "预售"); + hj_yh_1.set("product_name", "-"); + hj_yh_1.set("order_num", hj_yh_order_num); + hj_yh_1.set("weight", hj_yh_weight); + hj_yh_1.set("total_price", hj_yh_total_price); + retList.add(hj_yh_1); + hj_yh_children.add(hj_yh_1); + + Record hj_sh = new Record(); + hj_sh.set("key", "hj_sh"); + hj_sh.set("item_name", "实售"); + hj_sh.set("children", hj_sh_children); + + Record hj_yh = new Record(); + hj_yh.set("key", "hj_yh"); + hj_yh.set("item_name", "预售"); + hj_yh.set("children", hj_yh_children); + + List hj_children = new ArrayList<>(); + hj_children.add(hj_sh); + hj_children.add(hj_yh); + + hj.set("key", "hj").set("name", "合计").set("children", hj_children); + retChildren.add(hj); + + // 总合计 + Record total = new Record(); + total.set("key", "total").set("name", "总合计").set("item_name", "-").set("product_name", "-") + .set("order_num", hj_hs_sh_order_num + hj_els_sh_order_num + hj_jzs_sh_order_num + hj_czs_sh_order_num + hj_yh_order_num) + .set("weight", hj_hs_sh_weight + hj_els_sh_weight + hj_jzs_sh_weight + hj_czs_sh_weight + hj_yh_weight) + .set("total_price", hj_hs_sh_total_price + hj_els_sh_total_price + hj_jzs_sh_total_price+ hj_czs_sh_total_price + hj_yh_total_price); retList.add(total); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketIdValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketIdValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketIdValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketIdValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java similarity index 90% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java index c3cbd40..11879e3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java @@ -5,13 +5,11 @@ import com.cowr.common.base.BaseService; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Supermarket; -import com.cowr.model.SupermarketProduct; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -34,7 +32,8 @@ public class SupermarketService extends BaseService { */ private Map> getSupProduct() { List list = Db.find("select t.supermarket_id, p.id, p.name, t.unit_price from supermarket_product t\n" + - " left join product p on t.product_id = p.id"); + " left join product p on t.product_id = p.id " + + " WHERE p.id > 0"); Map> map = new HashMap<>(); @@ -118,9 +117,10 @@ public class SupermarketService extends BaseService { } Record out = supermarket.toRecord(); - out.set("products", Db.find("select t.supermarket_id, p.id, p.name, t.unit_price,t.product_id from supermarket_product t\n" + + out.set("products", Db.find("select t.supermarket_id, p.id, p.name, t.unit_price,t.product_id,sp.state,sp.id sp_id from supermarket_product t\n" + " left join product p on t.product_id = p.id \n" + - " where t.supermarket_id = ?", id)); + " left join supermarket_product_log sp on sp.supermarket_id = t.supermarket_id AND sp.product_id = t.product_id\n" + + " where t.supermarket_id = ? AND p.id > 0 AND sp.del = 0 ", id)); return Result.success(out); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistancePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistancePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistancePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistancePKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java similarity index 97% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java index dd9f713..0dc76a2 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java @@ -2,7 +2,6 @@ package com.cowr.ssjygl.supermarket.customerdistance; import com.cowr.common.base.BaseService; import com.cowr.common.view.PageParam; -import com.cowr.common.view.Result; import com.cowr.model.Supermarket; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -27,7 +26,7 @@ public class SupermarketCustomerDistanceService extends BaseService { public BigDecimal getDistance(Integer supermarket_id, Integer customer_id) { try { BigDecimal dis = Db.queryBigDecimal("select distance from supermarket_customer_distance " + - " where supermarket_id = ? and customer_id = ?", supermarket_id, customer_id); + " where supermarket_id = ? and customer_id = ? ", supermarket_id, customer_id); if (dis == null) { return new BigDecimal(0); @@ -55,7 +54,7 @@ public class SupermarketCustomerDistanceService extends BaseService { * @return */ public Record findAllSupermarket(PageParam pp, Integer customer_id, String customer_name) { - List cols = Supermarket.dao.find("select id, name, name2 from supermarket where del = 0"); + List cols = Supermarket.dao.find("select id, name, name2 from supermarket where del = 0 AND TYPE = 0"); String selectsql = "select t.*, sr.supermarket_id, sr.distance "; String fromsql = " from customer t\n" + " left join (\n" + @@ -110,4 +109,5 @@ public class SupermarketCustomerDistanceService extends BaseService { return out; } + } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceValidator.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogPKValidator.java new file mode 100644 index 0000000..48a4e9c --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogPKValidator.java @@ -0,0 +1,24 @@ +package com.cowr.ssjygl.supermarket.product; + + +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Mon Apr 06 09:50:28 CST 2020 + * TableName: transport_company + * Remarks: 物流公司 + * PrimaryKey: id + */ +public class SupermarketProductLogPKValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + validateRequired("id", "id", "id 必填"); + validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogService.java new file mode 100644 index 0000000..57ae296 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogService.java @@ -0,0 +1,87 @@ +package com.cowr.ssjygl.supermarket.product; + +import com.cowr.common.Const; +import com.cowr.common.base.BaseService; +import com.cowr.common.view.PageParam; +import com.cowr.model.SupermarketProductLog; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; +import com.jfinal.plugin.activerecord.Record; + +import java.util.ArrayList; +import java.util.List; + +/** + * Generated by COWR Fri Apr 17 16:59:39 CST 2020 + * TableName: supermarket_product + * Remarks: 基础配置 - 砂站关联 product 表 + * PrimaryKey: supermarket_id,product_id + */ +public class SupermarketProductLogService extends BaseService { + + private static Log log = Log.getLog(SupermarketProductLogService.class); + + + public static final SupermarketProductLogService me = new SupermarketProductLogService(); + + + public Page find(PageParam pp ,String name,String stm,String etm) { + String selectsql = "SELECT\n" + + " t.*,\n" + + " s.`name` supermarket_name,\n" + + " p.`name` product_name,\n" + + " us.`name` create_name,\n" + + " au.`name` auditor_name "; + String fromsql = "FROM\n" + + " `supermarket_product_log` t\n" + + " LEFT JOIN supermarket s ON s.id = t.supermarket_id AND s.del = 0\n" + + " LEFT JOIN product p ON t.product_id = p.id AND p.del = 0\n" + + " LEFT JOIN sysuser us ON t.create_id = us.id AND us.del = 0\n" + + " LEFT JOIN sysuser au ON t.auditor_id = au.id AND us.del = 0 " + + " where t.del = 0 "; + List paraList = new ArrayList<>(); + + if (StrKit.notBlank(name)) { + fromsql += " and us.`name` like ? \n"; + paraList.add("%" + name.trim() + "%"); + } + + if (StrKit.notBlank(stm)) { + fromsql += " and t.create_time >= ? \n"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.create_time <= ? \n"; + paraList.add(etm); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && SupermarketProductLog.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + }else{ + fromsql += " order by t.create_time desc \n"; + + } + + return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + } + + public List list() { + return SupermarketProductLog.dao.find("select * from supermarket_product_log where t.del = 0 "); + } + + + +} diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogValidator.java new file mode 100644 index 0000000..3d6049b --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductLogValidator.java @@ -0,0 +1,46 @@ +package com.cowr.ssjygl.supermarket.product; + +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.cowr.model.SupermarketProductLog; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Mon Apr 06 09:50:28 CST 2020 + * TableName: transport_company + * Remarks: 物流公司 + * PrimaryKey: id + */ +public class SupermarketProductLogValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + // 默认新增时，前端不需要传主键。若需要前端传主键，需要去掉这个判断 + if (!"save".equals(getActionMethodName())) { + validateRequired("id", "id", "id 必填"); + validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); + } + + validateRequired("product_id", "product_id", "product_id 必填"); + validateInteger("product_id", 1, 2147483647, "product_id", "product_id 范围 1~2147483647"); + + validateRequired("supermarket_id", "supermarket_id", "supermarket_id 必填"); + validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); + + validateRequired("unit_price", "unit_price", "unit_price 必填"); + validateBigDecimal("unit_price", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "unit_price", "unit_price 范围 -9.9999999999E10~9.9999999999E10"); + + validateBigDecimal("old_price", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "old_price", "old_price 范围 -9.9999999999E10~9.9999999999E10"); + + + // 使用 model 更新时，model 不能只有主键有值 + // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 + // 如果确实是需要将主键外的字段置为 null，可以在代码生成后删掉这段 + if ("edit".equals(getActionMethodName())) { + validateUpdateModel(SupermarketProductLog.class, "", true); // 忽略不在model中的字段 + } + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/product/SupermarketProductService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java new file mode 100644 index 0000000..262b73f --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java @@ -0,0 +1,141 @@ +package com.cowr.ssjygl.supermarket.sandfarmdistance; + +import com.cowr.common.Const; +import com.cowr.common.base.BaseService; +import com.cowr.common.view.PageParam; +import com.cowr.model.Supermarket; +import com.cowr.model.SupermarketSandfarmDistance; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; +import com.jfinal.plugin.activerecord.Record; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Generated by COWR Mon Apr 06 09:50:28 CST 2020 + * TableName: supermarket_sandfarm_distance + * Remarks: 生产点到销售点的距离配置 + *

+ * PrimaryKey: supermarket_id,sandfarm_id + */ +public class SupermarketSandfarmDistanceService extends BaseService { + public static final SupermarketSandfarmDistanceService me = new SupermarketSandfarmDistanceService(); + private static Log log = Log.getLog(SupermarketSandfarmDistanceService.class); + + public BigDecimal getDistance(int supermarket_id, int sandfarm_id) { + try { + return Db.queryBigDecimal("select distance from supermarket_sandfarm_distance where supermarket_id = ? and sandfarm_id = ?", supermarket_id, sandfarm_id); + } catch (Exception e) { + log.error(e.getMessage(), e); + + return new BigDecimal(0); + } + } + + public Page find(PageParam pp, Integer supermarket_id, Integer sandfarm_id) { + String selectsql = "select t.*, s1.name supermarket_name, s2.name sandfarm_name "; + String fromsql = "from supermarket_sandfarm_distance t \n" + + " left join supermarket s1 on s1.id = t.supermarket_id AND s1.type = 0 \n" + + " left join supermarket s2 on s2.id = t.sandfarm_id AND s2.type = 1" + + " where 1=1 "; + List paraList = new ArrayList<>(); + + if (supermarket_id != null) { + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + + if (sandfarm_id != null) { + fromsql += " and t.sandfarm_id = ? \n"; + paraList.add(sandfarm_id); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && SupermarketSandfarmDistance.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } + + return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + } + + public List list() { + return SupermarketSandfarmDistance.dao.find("select * from supermarket_sandfarm_distance"); + } + + + /** + * 列出所砂站到取土场的距离 + * + * @param pp + * @param customer_id + * @return + */ + public Record findAllSupermarket(PageParam pp, Integer customer_id, String customer_name) { + List cols = Supermarket.dao.find("select id, name, name2 from supermarket where del = 0 AND TYPE = 0 "); + String selectsql = "select t.*, sr.supermarket_id, sr.distance "; + String fromsql = " from supermarket t\n" + + " left join (\n" + + " select a.sandfarm_id, group_concat(a.supermarket_id) supermarket_id, group_concat(a.distance) distance " + + " from supermarket_sandfarm_distance a\n" + + " group by a.sandfarm_id\n" + + " ) sr on sr.sandfarm_id = t.id \n" + + " where 1=1 AND t.TYPE = 1 "; + List paraList = new ArrayList<>(); + + if (customer_id != null) { + fromsql += " and t.id = ? \n"; + paraList.add(customer_id); + } + + if (StrKit.notBlank(customer_name)) { + fromsql += " and t.name like ? \n"; + paraList.add("%" + customer_name.trim() + "%"); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + findSql += " order by t.id "; + + Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + List list = page.getList(); + + for (Record record : list) { + if (record.get("supermarket_id") != null) { + String supermarket_arr = record.getStr("supermarket_id"); + String distance_arr = record.getStr("distance"); + + String[] sups = supermarket_arr.split(","); + String[] diss = distance_arr.split(","); + + if (sups.length != diss.length) { + log.error("findAllSupermarket 数据错误"); + continue; + } + + for (int i = 0; i < sups.length; i++) { + String id = sups[i]; + record.set("supermarket_id_" + id, diss[i]); + } + } + } + Record out = new Record(); + out.set("cols", cols); + out.set("page", page); + + return out; + } +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/system/sysuser/SysuserValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java similarity index 94% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java index c08385f..8273cb2 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java @@ -29,6 +29,7 @@ public class TicketInvalidVerifyService extends BaseService { String order_sn, String create_user_name, Integer supermarket_id, + Integer supermarket_type, Integer state ) { String selectsql = "select t.*, s.name supermarket_name "; @@ -67,6 +68,11 @@ public class TicketInvalidVerifyService extends BaseService { paraList.add(supermarket_id); } + if (supermarket_type != null) { + fromsql += " and s.type = ? \n"; + paraList.add(supermarket_type); + } + if (state != null) { fromsql += " and t.state = ? \n"; paraList.add(state); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogService.java similarity index 97% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogService.java index 2cfebba..2e0a1cc 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogService.java @@ -41,7 +41,7 @@ public class TicketLogService extends BaseService { ); } - public Page find(PageParam pp, Integer supermarket_id, Integer state, String order_sn, String stm, String etm, String ticket_code) { + public Page find(PageParam pp, Integer supermarket_id,Integer supermarket_type, Integer state, String order_sn, String stm, String etm, String ticket_code) { String selectsql = "select t.*, r.supermarket_id, s.name supermarket_name, \n" + " case when t.type = 3 then p.weight end weight, \n" + " case when t.type = 3 then p.total_price end total_price, \n" + @@ -60,6 +60,11 @@ public class TicketLogService extends BaseService { paraList.add(supermarket_id); } + if (supermarket_type != null) { + fromsql += " and s.type = ? \n"; + paraList.add(supermarket_type); + } + if (state != null) { fromsql += " and t.state = ? \n"; paraList.add(state); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/log/TicketLogValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceivePKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceivePKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceivePKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceivePKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java similarity index 96% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java index 386fdab..4723234 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java @@ -136,7 +136,7 @@ public class TicketReceiveService extends BaseService { return out; } - public Page find(PageParam pp, Integer supermarket_id, String reveiver_user_name, String stm, String etm) { + public Page find(PageParam pp, Integer supermarket_id, Integer supermarket_type, String reveiver_user_name, String stm, String etm) { String selectsql = "select t.*, s.name supermarket_name, s.name2 supermarket_name2 "; String fromsql = "from ticket_receive t \n" + " left join supermarket s on s.id = t.supermarket_id" + @@ -148,6 +148,11 @@ public class TicketReceiveService extends BaseService { paraList.add(supermarket_id); } + if (supermarket_type != null) { + fromsql += " and s.type = ? \n"; + paraList.add(supermarket_type); + } + if (StrKit.notBlank(reveiver_user_name)) { fromsql += " and t.receive_user_name like ? \n"; paraList.add("%" + reveiver_user_name.trim() + "%"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/LicenseValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/LicenseValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/LicenseValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/LicenseValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java similarity index 96% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java index b8f064a..5eb7bd5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java @@ -54,7 +54,7 @@ public class TransportService extends BaseService { * @param trans_co_id 物流公司，物流公司需要通过绑定的订单去查 * @return */ - public Page find(PageParam pp, String order_sn, String stm, String etm, String truck_license, Integer supermarket_id, Integer trans_co_id, Integer state) { + public Page find(PageParam pp, String order_sn, String stm, String etm, String truck_license, Integer supermarket_id, Integer trans_co_id, Integer state, Integer supermarket_type) { String selectsql = "select t.*, s.name supermarket_name "; String fromsql = "from transport t \n" + " left join supermarket s on s.id = t.supermarket_id \n" + @@ -65,6 +65,10 @@ public class TransportService extends BaseService { fromsql += " and t.supermarket_id = ? \n"; paraList.add(supermarket_id); } + if (supermarket_type != null && supermarket_type > 0) { + fromsql += " and s.type = ? \n"; + paraList.add(supermarket_type); + } if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyPKValidator.java similarity index 94% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyPKValidator.java index 3310d69..18f69d2 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyPKValidator.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyPKValidator.java @@ -3,7 +3,6 @@ package com.cowr.ssjygl.transportcompany; import com.cowr.common.validator.CrudParamValidator; import com.cowr.common.view.Result; -import com.cowr.model.TransportCompany; import com.jfinal.core.Controller; /** @@ -22,4 +21,4 @@ public class TransportCompanyPKValidator extends CrudParamValidator { protected void handleError(Controller c) { c.renderJson(Result.failed(getErrmsg())); } -} \ No newline at end of file +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java similarity index 87% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java index 5b1a4df..2b4ccde 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java @@ -43,8 +43,12 @@ public class TransportCompanyService extends BaseService { } public Page find(PageParam pp, String name, Integer del) { - String selectsql = "select * "; - String fromsql = "from transport_company t where 1=1 "; + String selectsql = "select t.*,tk.license_count "; + String fromsql = "from transport_company t " + + " LEFT JOIN " + + " (SELECT trans_co_id,COUNT(license) license_count FROM truck WHERE state = 1 AND DEL = 0 GROUP BY trans_co_id) tk " + + " ON t.id = tk.trans_co_id" + + " where 1=1 "; List paraList = new ArrayList<>(); if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyValidator.java similarity index 91% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyValidator.java index 4b74669..47be970 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyValidator.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyValidator.java @@ -23,10 +23,10 @@ public class TransportCompanyValidator extends CrudParamValidator { validateString("name", 1, 128, "name", "name 长度 1~128"); - if (StrKit.notBlank(c.get("lgtd"))) { // 可为空字段，当传入值时，才做验证 + if (StrKit.notBlank(c.get("lgtd"))) { // 可为空字段，当传入值时，才做验证 validateBigDecimal("lgtd", new java.math.BigDecimal(74), new java.math.BigDecimal(135), "lgtd", "lgtd 范围 74~135"); } - if (StrKit.notBlank(c.get("lttd"))) { // 可为空字段，当传入值时，才做验证 + if (StrKit.notBlank(c.get("lttd"))) { // 可为空字段，当传入值时，才做验证 validateBigDecimal("lttd", new java.math.BigDecimal(3.75), new java.math.BigDecimal(53.7), "lttd", "lttd 范围 3.75~53.7"); } @@ -37,7 +37,7 @@ public class TransportCompanyValidator extends CrudParamValidator { validateString("bank_name", 0, 128, "bank_name", "bank_name 长度 0~128"); validateString("bank_account", 0, 20, "bank_account", "bank_account 长度 0~20"); validateString("memo", 0, 256, "memo", "memo 长度 0~256"); - validateBigDecimal("price_modulus", new java.math.BigDecimal(0), new java.math.BigDecimal(1), "price_modulus", "price_modulus 范围 0~1"); +// validateBigDecimal("price_modulus", new java.math.BigDecimal(0), new java.math.BigDecimal(1), "price_modulus", "price_modulus 范围 0~1"); // 使用 model 更新时，model 不能只有主键有值 // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 @@ -50,4 +50,4 @@ public class TransportCompanyValidator extends CrudParamValidator { protected void handleError(Controller c) { c.renderJson(Result.failed(getErrmsg())); } -} \ No newline at end of file +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/CaleTransPriceValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/CaleTransPriceValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/CaleTransPriceValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/CaleTransPriceValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java similarity index 93% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java index 1a3971c..8e22e81 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java @@ -17,7 +17,7 @@ public class TransPriceController extends BaseController { if (type == 1) { renderJson(Result.success(TransPriceService.me.caleOrderTransPrice(trans_co_id, weight, trans_distance))); } else { - renderJson(Result.success(TransPriceService.me.caleTransferTransPrice(sandfarm_id, weight, trans_distance))); + renderJson(Result.success(TransPriceService.me.caleTransferTransPrice( weight, trans_distance))); } } @@ -40,6 +40,6 @@ public class TransPriceController extends BaseController { double weight = getParaToDouble("weight", 0.0); double trans_distance = getParaToDouble("trans_distance", 0.0); - renderJson(Result.success(TransPriceService.me.caleTransferTransPrice(sandfarm_id, weight, trans_distance))); + renderJson(Result.success(TransPriceService.me.caleTransferTransPrice( weight, trans_distance))); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java similarity index 78% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java index 6846897..9297a53 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java @@ -1,7 +1,6 @@ package com.cowr.ssjygl.transprice; import com.cowr.common.utils.MathUtil; -import com.cowr.model.Sandfarm; import com.cowr.model.TransPriceConfigSale; import com.cowr.model.TransPriceConfigTransfer; import com.cowr.model.TransPriceConfigTrash; @@ -9,6 +8,7 @@ import com.cowr.ssjygl.CacheData; import com.jfinal.log.Log; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; @@ -117,60 +117,31 @@ public class TransPriceService { * 计算转运订单运输总价 * 2019-08-31 转运运费改为以距离为基础，分段计价 * - * @param sandfarm_id 砂场id * @param net_weight 净重 * @param trans_distance 运输距离 * @return */ - public double caleTransferTransPrice(Integer sandfarm_id, double net_weight, double trans_distance) { + public double caleTransferTransPrice(double net_weight, double trans_distance) { if (CacheData.TRANS_PRICE_CONFIG_TRANSFER == null || CacheData.TRANS_PRICE_CONFIG_TRANSFER.isEmpty()) { log.error("读取运费配置错误"); return 0.0; } - // 2019-09-01 砂场信息是用户可能会添加的，为了方便，还是每次从数据取 - Sandfarm sandfarm = Sandfarm.dao.findById(sandfarm_id); - if (sandfarm == null) { - log.error("获取砂场信息错误"); - return 0.0; - } - - BigDecimal offset = sandfarm.getOffset(); - - if (offset == null) { - log.error("物流公司价格系数错误"); - offset = new BigDecimal(0); - } - - TransPriceModel first = CacheData.TRANS_PRICE_CONFIG_TRANSFER.get(0); - - // 直接使用起始运距 - if (trans_distance < first.getMin()) { - trans_distance = first.getMin(); // 起步运距 - } - - trans_distance = Double.valueOf(trans_distance).intValue(); // 保留小数 double out = 0.0; - if (trans_distance < first.getMin()) { - out = (first.getStart() + first.getUnitPrice() * (trans_distance - first.getMin()) + offset.doubleValue()) * net_weight; - } else { - for (TransPriceModel model : CacheData.TRANS_PRICE_CONFIG_TRANSFER) { - if (model.getMin() != model.getMax()) { - if (trans_distance > model.getMin() && trans_distance < model.getMax()) { - out = (model.getStart() + model.getUnitPrice() * (trans_distance - model.getMin()) + offset.doubleValue()) * net_weight; - } - } else if (trans_distance == model.getMin()) { - out = (model.getStart() + model.getUnitPrice() * (trans_distance - model.getMin()) + offset.doubleValue()) * net_weight; + for (TransPriceModel model : CacheData.TRANS_PRICE_CONFIG_TRANSFER) { + // 判断 运距是否在当前区间内 + + if (model.getMin() != model.getMax()) { + if ((trans_distance > model.getMin() && trans_distance < model.getMax()) || 70 == model.getMax()) { + out = net_weight * trans_distance * model.getUnitPrice(); + break; } } } - - // 20190-08-06 四舍五入，保留 0 位小数 - // 20190-08-09 三舍四入，保留 0 位小数 - return MathUtil.round4(out); + return BigDecimal.valueOf(out).setScale(2, RoundingMode.HALF_UP).doubleValue(); } /** @@ -255,25 +226,18 @@ public class TransPriceService { return 0.0; } - TransPriceModel first = CacheData.TRANS_PRICE_CONFIG_TRANSFER.get(0); - - if (trans_distance < first.getMin()) { - return first.getStart(); - } - - trans_distance = Double.valueOf(trans_distance).intValue(); // 保留小数 double out = 0.0; for (TransPriceModel model : CacheData.TRANS_PRICE_CONFIG_TRANSFER) { + // 判断 运距是否在当前区间内 + if (model.getMin() != model.getMax()) { - if (trans_distance > model.getMin() && trans_distance < model.getMax()) { - out = model.getStart() + model.getUnitPrice() * (trans_distance - model.getMin()); + if ((trans_distance > model.getMin() && trans_distance < model.getMax()) || 70 == model.getMax()) { + out = model.getUnitPrice(); + break; } - } else if (trans_distance == model.getMin()) { - out = model.getStart() + model.getUnitPrice() * (trans_distance - model.getMin()); } } - return out; } diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogPKValidator.java new file mode 100644 index 0000000..8b77f4c --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogPKValidator.java @@ -0,0 +1,24 @@ +package com.cowr.ssjygl.transpricelog; + + +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Mon Apr 06 09:50:28 CST 2020 + * TableName: transport_company + * Remarks: 物流公司 + * PrimaryKey: id + */ +public class TransPriceLogPKValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + validateRequired("id", "id", "id 必填"); + validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogService.java new file mode 100644 index 0000000..d716e76 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogService.java @@ -0,0 +1,77 @@ +package com.cowr.ssjygl.transpricelog; + +import com.cowr.common.Const; +import com.cowr.common.base.BaseService; +import com.cowr.common.view.PageParam; +import com.cowr.model.TransPriceLog; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; +import com.jfinal.plugin.activerecord.Record; + +import java.util.ArrayList; +import java.util.List; + +/** + * Generated by COWR Mon Apr 06 09:50:28 CST 2020 + * TableName: trans_price_log + * Remarks: 物流公司 + * PrimaryKey: id + */ +public class TransPriceLogService extends BaseService { + public static final TransPriceLogService me = new TransPriceLogService(); + private static Log log = Log.getLog(TransPriceLogService.class); + + + public Page find(PageParam pp, String name, Integer del, String stm, String etm) { + String selectsql = "select t.*"; + String fromsql = "from trans_price_log t " + + " where 1=1 "; + List paraList = new ArrayList<>(); + + if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) { + fromsql += " and t.del = ? \n"; + paraList.add(del); + } + + if (StrKit.notBlank(name)) { + fromsql += " and (t.trans_co_name like ? \n"; + paraList.add("%" + name.trim() + "%"); + fromsql += " or t.truck_license like ?) \n"; + paraList.add("%" + name.trim() + "%"); + } + + + if (StrKit.notBlank(stm)) { + fromsql += " and t.pay_date >= ?"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.pay_date <= ?"; + paraList.add(etm); + } + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && TransPriceLog.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + }else { + findSql += " order by t.create_time desc"; + } + + return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + } + + public List list() { + return TransPriceLog.dao.find("select * from trans_price_log t where t.del = 0"); + } +} diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogValidator.java new file mode 100644 index 0000000..de9d339 --- /dev/null +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transpricelog/TransPriceLogValidator.java @@ -0,0 +1,60 @@ +package com.cowr.ssjygl.transpricelog; + +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.cowr.model.TransportCompany; +import com.jfinal.core.Controller; +import com.jfinal.kit.StrKit; + +/** + * Generated by COWR Mon Apr 06 09:50:28 CST 2020 + * TableName: trans_price_log + * Remarks: 运费结算记录 + * PrimaryKey: id + */ +public class TransPriceLogValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + // 默认新增时，前端不需要传主键。若需要前端传主键，需要去掉这个判断 + if (!"save".equals(getActionMethodName())) { + validateRequired("id", "id", "id 必填"); + validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); + } + + + if (StrKit.notBlank(c.get("trans_co_name"))) { // 可为空字段，当传入值时，才做验证 + validateString("trans_co_name", 1, 128, "trans_co_name", "trans_co_name 长度 1~128"); + validateRequired("trans_name", "trans_name", "trans_name 必填"); + + validateString("trans_name", 0, 15, "trans_name", "trans_name 长度 0~15"); + validateRequired("trans_phone", "trans_phone", "trans_phone 必填"); + validateString("trans_phone", 0, 20, "trans_phone", "trans_phone 长度 0~20"); + } + if (StrKit.notBlank(c.get("truck_license"))) { // 可为空字段，当传入值时，才做验证 + validateString("truck_license", 1, 10, "truck_license", "truck_license 长度 1~10"); + } + + + validateRequired("trans_price", "trans_price", "trans_price 必填"); + validateBigDecimal("trans_price", new java.math.BigDecimal(0.01), new java.math.BigDecimal(2147483647.99), "trans_price", "trans_price 长度 -9.9999999999E10~9.9999999999E10"); + validateRequired("settlement_dates", "settlement_dates", "settlement_dates 必填"); + validateString("settlement_dates", 0, 256, "settlement_dates", "settlement_dates 长度 0~256"); + validateRequired("pay_date", "pay_date", "pay_date 必填"); + validateDate("pay_date", "yyyy-MM-dd HH:mm:ss", "pay_date", "pay_date 格式错误"); + + validateRequired("bank_name", "bank_name", "bank_name 必填"); + validateString("bank_name", 0, 128, "bank_name", "bank_name 长度 0~128"); + validateString("memo", 0, 256, "memo", "memo 长度 0~256"); + + // 使用 model 更新时，model 不能只有主键有值 + // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 + // 如果确实是需要将主键外的字段置为 null，可以在代码生成后删掉这段 + if ("edit".equals(getActionMethodName())) { + validateUpdateModel(TransportCompany.class, "", true); // 忽略不在model中的字段 + } + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/TruckPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/TruckPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java similarity index 90% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java index 3891d88..4494e75 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java @@ -24,8 +24,9 @@ public class TruckService extends BaseService { public static final TruckService me = new TruckService(); public Page find(PageParam pp, String license, Integer trans_co_id, Integer state, String gps, String sim, Integer del, String number) { - String selectsql = "select * "; - String fromsql = "from truck t where 1=1 "; + String selectsql = "select t.*,tc.name "; + String fromsql = "from truck t LEFT JOIN transport_company tc ON tc.id = t.trans_co_id" + + " where 1=1 "; List paraList = new ArrayList<>(); if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) { @@ -80,8 +81,8 @@ public class TruckService extends BaseService { return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); } - public List list() { - return Truck.dao.find("select * from truck"); + public List list(Integer trans_co_id) { + return Truck.dao.find("select * from truck WHERE del = 0 AND trans_co_id = ?", trans_co_id); } /** diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java similarity index 85% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java index d0c1c76..3ed458d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java @@ -22,12 +22,12 @@ public class TruckValidator extends CrudParamValidator { } validateInteger("trans_co_id", 1, 2147483647, "trans_co_id", "trans_co_id 范围 1~2147483647"); - validateBigDecimal("capacity", new java.math.BigDecimal(0), new java.math.BigDecimal(9.99999999E8), "capacity", "capacity 范围 0~9.99999999E8"); +// validateBigDecimal("capacity", new java.math.BigDecimal(0), new java.math.BigDecimal(9.99999999E8), "capacity", "capacity 范围 0~9.99999999E8"); validateString("memo", 0, 256, "memo", "memo 长度 0~256"); - validateBigDecimal("tare", new java.math.BigDecimal(0), new java.math.BigDecimal(9.99999999E8), "tare", "tare 范围 0~9.99999999E8"); +// validateBigDecimal("tare", new java.math.BigDecimal(0), new java.math.BigDecimal(9.99999999E8), "tare", "tare 范围 0~9.99999999E8"); validateString("model", 0, 32, "model", "model 长度 0~32"); - if (StrKit.notBlank(c.get("number"))) { // 可为空字段，当传入值时，才做验证 + if (StrKit.notBlank(c.get("number"))) { // 可为空字段，当传入值时，才做验证 validateString("number", 0, 4, "number", "number 范围 0~9999"); } @@ -48,4 +48,4 @@ public class TruckValidator extends CrudParamValidator { protected void handleError(Controller c) { c.renderJson(Result.failed(getErrmsg())); } -} \ No newline at end of file +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java rename to ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java diff --git a/ssjygl-xsx-common/src/main/java/generator/BaseModelGenerator.java b/ssjygl-xsct-common/src/main/java/generator/BaseModelGenerator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/BaseModelGenerator.java rename to ssjygl-xsct-common/src/main/java/generator/BaseModelGenerator.java diff --git a/ssjygl-xsx-common/src/main/java/generator/ColumnMeta.java b/ssjygl-xsct-common/src/main/java/generator/ColumnMeta.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/ColumnMeta.java rename to ssjygl-xsct-common/src/main/java/generator/ColumnMeta.java diff --git a/ssjygl-xsx-common/src/main/java/generator/CrudGenerator.java b/ssjygl-xsct-common/src/main/java/generator/CrudGenerator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/CrudGenerator.java rename to ssjygl-xsct-common/src/main/java/generator/CrudGenerator.java diff --git a/ssjygl-xsx-common/src/main/java/generator/DataDictionaryGenerator.java b/ssjygl-xsct-common/src/main/java/generator/DataDictionaryGenerator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/DataDictionaryGenerator.java rename to ssjygl-xsct-common/src/main/java/generator/DataDictionaryGenerator.java diff --git a/ssjygl-xsx-common/src/main/java/generator/Generator.java b/ssjygl-xsct-common/src/main/java/generator/Generator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/Generator.java rename to ssjygl-xsct-common/src/main/java/generator/Generator.java diff --git a/ssjygl-xsx-common/src/main/java/generator/Main.java b/ssjygl-xsct-common/src/main/java/generator/Main.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/Main.java rename to ssjygl-xsct-common/src/main/java/generator/Main.java diff --git a/ssjygl-xsx-common/src/main/java/generator/MappingKitGenerator.java b/ssjygl-xsct-common/src/main/java/generator/MappingKitGenerator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/MappingKitGenerator.java rename to ssjygl-xsct-common/src/main/java/generator/MappingKitGenerator.java diff --git a/ssjygl-xsx-common/src/main/java/generator/MetaBuilder.java b/ssjygl-xsct-common/src/main/java/generator/MetaBuilder.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/MetaBuilder.java rename to ssjygl-xsct-common/src/main/java/generator/MetaBuilder.java diff --git a/ssjygl-xsx-common/src/main/java/generator/ModelGenerator.java b/ssjygl-xsct-common/src/main/java/generator/ModelGenerator.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/ModelGenerator.java rename to ssjygl-xsct-common/src/main/java/generator/ModelGenerator.java diff --git a/ssjygl-xsx-common/src/main/java/generator/TableMeta.java b/ssjygl-xsct-common/src/main/java/generator/TableMeta.java similarity index 100% rename from ssjygl-xsx-common/src/main/java/generator/TableMeta.java rename to ssjygl-xsct-common/src/main/java/generator/TableMeta.java diff --git a/ssjygl-xsct-common/src/main/resources/db.properties b/ssjygl-xsct-common/src/main/resources/db.properties new file mode 100644 index 0000000..1f11072 --- /dev/null +++ b/ssjygl-xsct-common/src/main/resources/db.properties @@ -0,0 +1,8 @@ +# mysql +#jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsct_service_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +#user=dev_ssjy_xsct +#password=Ssjy_xs_890 + +jdbcUrl=jdbc:mysql://127.0.0.1:3306/ssjy_xsct_service_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +user=root +password=19999999 diff --git a/ssjygl-xsx-common/src/main/resources/generator/base_model_template.jf b/ssjygl-xsct-common/src/main/resources/generator/base_model_template.jf similarity index 100% rename from ssjygl-xsx-common/src/main/resources/generator/base_model_template.jf rename to ssjygl-xsct-common/src/main/resources/generator/base_model_template.jf diff --git a/ssjygl-xsx-common/src/main/resources/generator/controller_template.jf b/ssjygl-xsct-common/src/main/resources/generator/controller_template.jf similarity index 100% rename from ssjygl-xsx-common/src/main/resources/generator/controller_template.jf rename to ssjygl-xsct-common/src/main/resources/generator/controller_template.jf diff --git a/ssjygl-xsx-common/src/main/resources/generator/mapping_kit_template.jf b/ssjygl-xsct-common/src/main/resources/generator/mapping_kit_template.jf similarity index 100% rename from ssjygl-xsx-common/src/main/resources/generator/mapping_kit_template.jf rename to ssjygl-xsct-common/src/main/resources/generator/mapping_kit_template.jf diff --git a/ssjygl-xsx-common/src/main/resources/generator/model_template.jf b/ssjygl-xsct-common/src/main/resources/generator/model_template.jf similarity index 100% rename from ssjygl-xsx-common/src/main/resources/generator/model_template.jf rename to ssjygl-xsct-common/src/main/resources/generator/model_template.jf diff --git a/ssjygl-xsx-common/src/main/resources/generator/pkvalidator_template.jf b/ssjygl-xsct-common/src/main/resources/generator/pkvalidator_template.jf similarity index 100% rename from ssjygl-xsx-common/src/main/resources/generator/pkvalidator_template.jf rename to ssjygl-xsct-common/src/main/resources/generator/pkvalidator_template.jf diff --git a/ssjygl-xsx-common/src/main/resources/generator/service_template.jf b/ssjygl-xsct-common/src/main/resources/generator/service_template.jf similarity index 100% rename from ssjygl-xsx-common/src/main/resources/generator/service_template.jf rename to ssjygl-xsct-common/src/main/resources/generator/service_template.jf diff --git a/ssjygl-xsx-common/src/main/resources/generator/validator_template.jf b/ssjygl-xsct-common/src/main/resources/generator/validator_template.jf similarity index 100% rename from ssjygl-xsx-common/src/main/resources/generator/validator_template.jf rename to ssjygl-xsct-common/src/main/resources/generator/validator_template.jf diff --git a/ssjygl-xsct-local/build.sh b/ssjygl-xsct-local/build.sh new file mode 100644 index 0000000..7ef06bc --- /dev/null +++ b/ssjygl-xsct-local/build.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +git pull +mvn clean package +./target/ssjygl-xsct-local-release/ssjygl-xsct-local/start.sh + + + diff --git a/ssjygl-xsct-local/debug.sh b/ssjygl-xsct-local/debug.sh new file mode 100644 index 0000000..ec269cd --- /dev/null +++ b/ssjygl-xsct-local/debug.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +./target/ssjygl-xsct-local-release/ssjygl-xsct-local/start.sh + + + diff --git a/ssjygl-xsx-local/package.xml b/ssjygl-xsct-local/package.xml similarity index 100% rename from ssjygl-xsx-local/package.xml rename to ssjygl-xsct-local/package.xml diff --git a/ssjygl-xsx-local/pom.xml b/ssjygl-xsct-local/pom.xml similarity index 95% rename from ssjygl-xsx-local/pom.xml rename to ssjygl-xsct-local/pom.xml index da5e552..33674a1 100644 --- a/ssjygl-xsx-local/pom.xml +++ b/ssjygl-xsct-local/pom.xml @@ -5,12 +5,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.cowr.ssjygl-xsx-local - ssjygl-xsx-local + com.cowr.ssjygl-xsct-local + ssjygl-xsct-local 1.0 jar - 砂石经营管理-浠水县-本地服务 + 砂石经营管理-浠水城投-本地服务 http://www.example.com @@ -37,8 +37,8 @@ - com.cowr.ssjygl-xsx-common - ssjygl-xsx-common + com.cowr.ssjygl-xsct-common + ssjygl-xsct-common 1.0 compile @@ -173,7 +173,7 @@ - ssjygl-xsx-local + ssjygl-xsct-local org.apache.maven.plugins diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/actioncmdlog/ActionCmdLogSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/actioncmdlog/ActionCmdLogSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/actioncmdlog/ActionCmdLogSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/actioncmdlog/ActionCmdLogSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/cache/CacheController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/cache/CacheController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/cache/CacheController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/cache/CacheController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerController.java similarity index 98% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerController.java index 0cdbea2..c070463 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerController.java @@ -36,7 +36,7 @@ public class CustomerController extends Controller { public void find() { PageParam pp = getBean(PageParam.class, "", true); String name = get("name"); - Integer del = getInt("del"); + Integer del = getInt("del",0); Integer type = getInt("type"); renderJson(Result.object(CustomerService.me.find(pp, name, del, type))); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/contact/CustomerContactController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/contact/CustomerContactController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/contact/CustomerContactController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/contact/CustomerContactController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/pact/CustomerPactController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/pact/CustomerPactController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/pact/CustomerPactController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/pact/CustomerPactController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/receiver/CustomerReceiverController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/receiver/CustomerReceiverController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/receiver/CustomerReceiverController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/receiver/CustomerReceiverController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/customer/supermarketproduct/CustomerSupermarketProductController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/Const.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/Const.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/Const.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/Const.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java similarity index 97% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java index 60f5222..faa0ebd 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/common/DeviceThread.java @@ -210,7 +210,11 @@ public class DeviceThread extends Thread { scale = new XiShuiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); } } else if (supermarket_id == 7) { - scale = new KeLiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); + if (which.startsWith(Enums.CtrlFlowEnum.C.name())) { + scale = new DingsongScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); + } else { + scale = new KeLiScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); + } } else if (supermarket_id == 8 || supermarket_id == 9) { scale = new DingsongScale(which + "_scale", scaleconf.getString("ip"), scaleconf.getIntValue("port")); } else { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/Controller.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/InController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java similarity index 99% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java index da6451d..2ff68ef 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java @@ -171,7 +171,7 @@ public class OutController extends Controller implements Runnable { log.debug("%s 【%s】上磅，等待地感线圈状态", getWhich(), pair.license); try { while (!getResetFlow()) { // 流程没有被重置，就一直等待地感线圈状态 - if (getPlc().read(getSensor1()) || getPlc().read(getSensor2())) { // 读取前地感状态 + if (getPlc().read(getSensor1())) { // 读取前地感状态 break; } } @@ -181,7 +181,7 @@ public class OutController extends Controller implements Runnable { } // 获取到地感线圈状态后，等待 5 秒后开始称重 - Thread.sleep(6000); + Thread.sleep(getScaleWaitTime()); // 重置流程，这个位置要重置地感线圈状态 if (getResetFlow()) { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/AbsScale.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Camera.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Camera.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Camera.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Camera.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java similarity index 97% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java index a6f0bb1..b187efc 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/CameraController.java @@ -1,199 +1,199 @@ -package com.cowr.local.ssjygl.devicectrl.device; - -import com.alibaba.fastjson.JSONObject; -import com.cowr.common.utils.ImageUtil; -import com.cowr.local.ssjygl.devicectrl.common.Const; -import com.cowr.local.ssjygl.main.AuthInterceptor; -import com.cowr.local.ssjygl.main.Config; -import com.jfinal.aop.Clear; -import com.jfinal.core.Controller; -import com.jfinal.kit.HttpKit; -import com.jfinal.kit.StrKit; -import com.jfinal.log.Log; - -import java.io.File; - -@Clear(AuthInterceptor.class) -public class CameraController extends Controller { - private static Log log = Log.getLog(CameraController.class); - - public void index() { - renderJson("ret", true); - } - - /* - { - "KeepAlive": { - "ROMID": "ffff29410062c022", - "SN": "5191100833", - "ipaddr": "192.168.1.210" - } - } - - { - "AlarmInfoPlate": { - "resultType": 0, - "channel": 0, - "deviceName": "camera", - "ipaddr": "192.168.1.210", // 设备ip - "result": { - "PlateResult": { - "bright": 0, - "carBright": 0, - "carColor": 0, - "colorType": 4, - "colorValue": 4, - "confidence": 71, - "direction": 0, - "imagePath": "", - "license": "鄂A701P1", // 车牌号 - "location": { - "RECT": { - "bottom": 804, - "left": 1426, - "right": 1584, - "top": 692 - } - }, - "timeStamp": { - "TimeVal": { - "sec": 0, - "usec": 0 - } - }, - "timeUsed": 0, - "triggerType": 2, - "type": 2, - "platecolor": "黑", - "carLogo": 0, - "CarType": 0, - "plateBright": 0, - "recotime": "2020-09-29 10:49:27", // 识别时间 - "imageFile": "/9j/4AAQSkZJRgABAg", // base64 格式图片字符串 - "imageFileLen": 162240, - "imageFragmentFile": "", - "imageFragmentFileLen": 0 - } - }, - "seriaIno": "ffff29410062c022", - "romid": "ffff29410062c022", - "sn": "5191100833", // 设备号 - "nParkID": 123, - "ParkID": "123", - "ParkName": "", - "ParkDoor": "" - }, - "WhiteListInfo": { - "Info": { - "WhiteListEnable": 0, - "TimeMatchEable": 0, - "CreateTime": "", - "StartTime": "", - "EndTime": "", - "BlackList": 0 - }, - "WhiteListControl": { - "OpenDoor": 0, - "TimeCheck": 0, - "InteriorCar": 0 - } - } - } - - */ - public void recv() { - try { - String str = HttpKit.readData(getRequest()); - - if (StrKit.isBlank(str)) { - renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "readData 解析失败")); - return; - } - - JSONObject json = JSONObject.parseObject(str); - - if (json == null) { - renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "parseObject 解析失败")); - return; - } - - String romid = null; - String sn = null; - String ipaddr = null; - - if (json.containsKey("KeepAlive")) { // 心跳数据 - JSONObject keepAlive = json.getJSONObject("KeepAlive"); - - ipaddr = keepAlive.getString("ipaddr"); - sn = keepAlive.getString("SN"); - romid = keepAlive.getString("ROMID"); - - Camera camera = Config.deviceThread.getCameraByIp(ipaddr); - - if (camera == null) { - renderJson(new JSONObject().fluentPut("ROMID", romid).fluentPut("sn", sn).fluentPut("ipaddr", ipaddr)); - return; - } - - // 长时间没有心跳数据后，怎么处理？ -// log.debug("相机 %s %s 心跳", camera.getId(), camera.getIp()); - - camera.setIsconnected(true); - camera.setKeeptime(System.currentTimeMillis()); - } else if (json.containsKey("AlarmInfoPlate")) { - JSONObject alarmInfoPlate = json.getJSONObject("AlarmInfoPlate"); - JSONObject result = alarmInfoPlate.getJSONObject("result"); - JSONObject plateResult = result.getJSONObject("PlateResult"); - String license = plateResult.getString("license"); - String imageFile = plateResult.getString("imageFile"); - - if (StrKit.isBlank(license)) { - log.error("无效车牌：【%s】", license); - renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "无效车牌")); - return; - } - - ipaddr = alarmInfoPlate.getString("ipaddr"); - sn = alarmInfoPlate.getString("sn"); - romid = alarmInfoPlate.getString("romid"); - - File jpgFile = new File( - String.format("%s%s%s-%d.jpg", - Config.getRootPath() + File.separator + Const.LicenseImgTmpFolder, - File.separator, - license, - System.currentTimeMillis() - ) - ); - - boolean ret = ImageUtil.generateImage(imageFile, jpgFile); - - if (!ret) { - log.error("数据解析失败：%s", str); - renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "解析图片失败")); - return; - } - - // 示例中有个空格，要去掉 - license = license.replace(" ", ""); - - Camera camera = Config.deviceThread.getCameraByIp(ipaddr); - - log.debug("识别成功：%s, %s", license, jpgFile); - - if (camera != null) { - camera.getController().onLicenseResult(license, jpgFile); // 识别到图片，回调 - } else { - log.error("摄像头配置异常 %s", ipaddr); - } - } else { - log.debug("无效 json 数据 %s", json.toJSONString()); - } - - renderJson(new JSONObject().fluentPut("ROMID", romid).fluentPut("sn", sn).fluentPut("ipaddr", ipaddr)); - } catch (Exception e) { - log.error(e.getMessage(), e); - renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "解析失败")); - } - } -} +package com.cowr.local.ssjygl.devicectrl.device; + +import com.alibaba.fastjson.JSONObject; +import com.cowr.common.utils.ImageUtil; +import com.cowr.local.ssjygl.devicectrl.common.Const; +import com.cowr.local.ssjygl.main.AuthInterceptor; +import com.cowr.local.ssjygl.main.Config; +import com.jfinal.aop.Clear; +import com.jfinal.core.Controller; +import com.jfinal.kit.HttpKit; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; + +import java.io.File; + +@Clear(AuthInterceptor.class) +public class CameraController extends Controller { + private static Log log = Log.getLog(CameraController.class); + + public void index() { + renderJson("ret", true); + } + + /* + { + "KeepAlive": { + "ROMID": "ffff29410062c022", + "SN": "5191100833", + "ipaddr": "192.168.1.210" + } + } + + { + "AlarmInfoPlate": { + "resultType": 0, + "channel": 0, + "deviceName": "camera", + "ipaddr": "192.168.1.210", // 设备ip + "result": { + "PlateResult": { + "bright": 0, + "carBright": 0, + "carColor": 0, + "colorType": 4, + "colorValue": 4, + "confidence": 71, + "direction": 0, + "imagePath": "", + "license": "鄂A701P1", // 车牌号 + "location": { + "RECT": { + "bottom": 804, + "left": 1426, + "right": 1584, + "top": 692 + } + }, + "timeStamp": { + "TimeVal": { + "sec": 0, + "usec": 0 + } + }, + "timeUsed": 0, + "triggerType": 2, + "type": 2, + "platecolor": "黑", + "carLogo": 0, + "CarType": 0, + "plateBright": 0, + "recotime": "2020-09-29 10:49:27", // 识别时间 + "imageFile": "/9j/4AAQSkZJRgABAg", // base64 格式图片字符串 + "imageFileLen": 162240, + "imageFragmentFile": "", + "imageFragmentFileLen": 0 + } + }, + "seriaIno": "ffff29410062c022", + "romid": "ffff29410062c022", + "sn": "5191100833", // 设备号 + "nParkID": 123, + "ParkID": "123", + "ParkName": "", + "ParkDoor": "" + }, + "WhiteListInfo": { + "Info": { + "WhiteListEnable": 0, + "TimeMatchEable": 0, + "CreateTime": "", + "StartTime": "", + "EndTime": "", + "BlackList": 0 + }, + "WhiteListControl": { + "OpenDoor": 0, + "TimeCheck": 0, + "InteriorCar": 0 + } + } + } + + */ + public void recv() { + try { + String str = HttpKit.readData(getRequest()); + + if (StrKit.isBlank(str)) { + renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "readData 解析失败")); + return; + } + + JSONObject json = JSONObject.parseObject(str); + + if (json == null) { + renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "parseObject 解析失败")); + return; + } + + String romid = null; + String sn = null; + String ipaddr = null; + + if (json.containsKey("KeepAlive")) { // 心跳数据 + JSONObject keepAlive = json.getJSONObject("KeepAlive"); + + ipaddr = keepAlive.getString("ipaddr"); + sn = keepAlive.getString("SN"); + romid = keepAlive.getString("ROMID"); + + Camera camera = Config.deviceThread.getCameraByIp(ipaddr); + + if (camera == null) { + renderJson(new JSONObject().fluentPut("ROMID", romid).fluentPut("sn", sn).fluentPut("ipaddr", ipaddr)); + return; + } + + // 长时间没有心跳数据后，怎么处理？ +// log.debug("相机 %s %s 心跳", camera.getId(), camera.getIp()); + + camera.setIsconnected(true); + camera.setKeeptime(System.currentTimeMillis()); + } else if (json.containsKey("AlarmInfoPlate")) { + JSONObject alarmInfoPlate = json.getJSONObject("AlarmInfoPlate"); + JSONObject result = alarmInfoPlate.getJSONObject("result"); + JSONObject plateResult = result.getJSONObject("PlateResult"); + String license = plateResult.getString("license"); + String imageFile = plateResult.getString("imageFile"); + + if (StrKit.isBlank(license)) { + log.error("无效车牌：【%s】", license); + renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "无效车牌")); + return; + } + + ipaddr = alarmInfoPlate.getString("ipaddr"); + sn = alarmInfoPlate.getString("sn"); + romid = alarmInfoPlate.getString("romid"); + + File jpgFile = new File( + String.format("%s%s%s-%d.jpg", + Config.getRootPath() + File.separator + Const.LicenseImgTmpFolder, + File.separator, + license, + System.currentTimeMillis() + ) + ); + + boolean ret = ImageUtil.generateImage(imageFile, jpgFile); + + if (!ret) { + log.error("数据解析失败：%s", str); + renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "解析图片失败")); + return; + } + + // 示例中有个空格，要去掉 + license = license.replace(" ", ""); + + Camera camera = Config.deviceThread.getCameraByIp(ipaddr); + + log.debug("识别成功：%s, %s", license, jpgFile); + + if (camera != null) { + camera.getController().onLicenseResult(license, jpgFile); // 识别到图片，回调 + } else { + log.error("摄像头配置异常 %s", ipaddr); + } + } else { + log.debug("无效 json 数据 %s", json.toJSONString()); + } + + renderJson(new JSONObject().fluentPut("ROMID", romid).fluentPut("sn", sn).fluentPut("ipaddr", ipaddr)); + } catch (Exception e) { + log.error(e.getMessage(), e); + renderJson(new JSONObject().fluentPut("ret", false).fluentPut("msg", "解析失败")); + } + } +} diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Device.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Device.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Device.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Device.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/DingsongScale.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/DingsongScale.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/DingsongScale.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/DingsongScale.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/KeLiScale.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/KeLiScale.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/KeLiScale.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/KeLiScale.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LED.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/LEDThread.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/Printer.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/XiShuiScale.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/XiShuiScale.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/XiShuiScale.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/XiShuiScale.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/YaoHuaScale.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/YaoHuaScale.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/YaoHuaScale.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/YaoHuaScale.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/CellAddresses.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/ExcelHelper.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/JsdCellAddresses.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/JsdCellAddresses.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/JsdCellAddresses.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/JsdCellAddresses.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/QRcodeZxingUtil.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/QRcodeZxingUtil.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/QRcodeZxingUtil.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/printer/QRcodeZxingUtil.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/CRC16.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/CRC16.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/CRC16.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/CRC16.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/LicenseJPGPair.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/LicenseJPGPair.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/LicenseJPGPair.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/devicectrl/utils/LicenseJPGPair.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/driver/DriverController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/driver/DriverController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/driver/DriverController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/driver/DriverController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/file/OssFileController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/file/OssFileController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/file/OssFileController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/file/OssFileController.java diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/BaseHbrsmsLog.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/BaseHbrsmsLog.java new file mode 100644 index 0000000..270c197 --- /dev/null +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/BaseHbrsmsLog.java @@ -0,0 +1,108 @@ +//package com.cowr.local.ssjygl.hbrsms; +// +///** +// * Description: +// * Created by XuSan on 2024/12/6. +// * +// * @author XuSan +// * @version 1.0 +// */ +// +//import com.alibaba.fastjson.annotation.JSONField; +//import com.cowr.common.base.BaseModel; +//import com.jfinal.plugin.activerecord.IBean; +// +//import java.util.Date; +// +//public abstract class BaseHbrsmsLog> extends BaseModel implements IBean { +// +// +// public static final String tablename = "hbrsms_log"; +// +// @JSONField(serialize = false) +// public String getTablename() { +// return tablename; +// } +// +// /** +// * name: sn +// * isNullable: NO +// * isPrimaryKey: YES +// * defaultValue: +// * +// * @param sn sn +// */ +// @JSONField(name = "sn") +// public void setSn(String sn) { +// set("sn", sn); +// } +// +// +// /** +// * @return id +// */ +// @JSONField(name = "sn") +// public String getSn() { +// return getStr("sn"); +// } +// +// +// @JSONField(name = "createdate") +// public void setCreatedate(Date createdate) { +// set("createdate", createdate); +// } +// +// +// /** +// * @return id +// */ +// @JSONField(name = "createdate") +// public Date getCreatedate() { +// return get("createdate"); +// } +// +// @JSONField(name = "reqData") +// public void setReqData(String reqData) { +// set("reqData", reqData); +// } +// +// +// /** +// * @return id +// */ +// @JSONField(name = "reqData") +// public String getReqData() { +// return getStr("reqData"); +// } +// +// @JSONField(name = "respData") +// public void setRespData(String respData) { +// set("respData", respData); +// } +// +// +// /** +// * @return id +// */ +// @JSONField(name = "respData") +// public String getrespData() { +// return getStr("respData"); +// } +// +// +// @JSONField(name = "status") +// public void setStatus(String status) { +// set("status", status); +// } +// +// +// /** +// * @return id +// */ +// @JSONField(name = "status") +// public String getStatus() { +// return getStr("status"); +// } +// +// +//} diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/Hbrsms.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/Hbrsms.java new file mode 100644 index 0000000..093928b --- /dev/null +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/Hbrsms.java @@ -0,0 +1,125 @@ +package com.cowr.local.ssjygl.hbrsms; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Description: + * Created by XuSan on 2024/10/10. + * + * @author XuSan + * @version 1.0 + */ +public class Hbrsms { + + // 产品类型 1－砂石，2－卵石 + private Integer category; + + // 开单员姓名，需要和系统一致 + private String billerName; + + // 开单地点 + private String billAddress; + + // 车牌号码 + private String plateNumber; + + // 实际载运吨 + private BigDecimal actualLoad; + + // 采区名称，需要和系统一致 + private String miningAreaName; + + // 装运砂起始时间，格式 yyyy-MM-dd HH:mm:ss + private String transportStartTime; + + // 装运砂结束时间，格式 yyyy-MM-dd HH:mm:ss + private String transportEndTime; + + // 收货单位 + private String intendedArrivalHarbour; + + // 图片 Base64 数组，至少三张，最多九张 + private List documents; + + + public Integer getCategory() { + return category; + } + + public void setCategory(Integer category) { + this.category = category; + } + + public String getBillerName() { + return billerName; + } + + public void setBillerName(String billerName) { + this.billerName = billerName; + } + + public String getBillAddress() { + return billAddress; + } + + public void setBillAddress(String billAddress) { + this.billAddress = billAddress; + } + + public String getPlateNumber() { + return plateNumber; + } + + public void setPlateNumber(String plateNumber) { + this.plateNumber = plateNumber; + } + + public BigDecimal getActualLoad() { + return actualLoad; + } + + public void setActualLoad(BigDecimal actualLoad) { + this.actualLoad = actualLoad; + } + + public String getMiningAreaName() { + return miningAreaName; + } + + public void setMiningAreaName(String miningAreaName) { + this.miningAreaName = miningAreaName; + } + + public String getTransportStartTime() { + return transportStartTime; + } + + public void setTransportStartTime(String transportStartTime) { + this.transportStartTime = transportStartTime; + } + + public String getTransportEndTime() { + return transportEndTime; + } + + public void setTransportEndTime(String transportEndTime) { + this.transportEndTime = transportEndTime; + } + + public String getIntendedArrivalHarbour() { + return intendedArrivalHarbour; + } + + public void setIntendedArrivalHarbour(String intendedArrivalHarbour) { + this.intendedArrivalHarbour = intendedArrivalHarbour; + } + + public List getDocuments() { + return documents; + } + + public void setDocuments(List documents) { + this.documents = documents; + } +} diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsJob.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsJob.java new file mode 100644 index 0000000..8e35d88 --- /dev/null +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsJob.java @@ -0,0 +1,19 @@ +package com.cowr.local.ssjygl.hbrsms; + +import com.jfinal.log.Log; +import org.quartz.Job; +import org.quartz.JobExecutionContext; + +public class HbrsmsJob implements Job { + private static Log log = Log.getLog(HbrsmsJob.class); + + @Override + public void execute(JobExecutionContext jobExecutionContext) { + try { + HbrsmsService.me.syncTask(); //定时任务 + } catch (Exception e) { + log.error(e.getMessage(), e); + } + + } +} diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsLog.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsLog.java new file mode 100644 index 0000000..20dc13f --- /dev/null +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsLog.java @@ -0,0 +1,16 @@ +//package com.cowr.local.ssjygl.hbrsms; +// +//import com.cowr.model.base.BaseHbrsmsLog; +// +///** +// * Description: +// * Created by XuSan on 2024/10/10. +// * +// * @author XuSan +// * @version 1.0 +// */ +//public class HbrsmsLog extends BaseHbrsmsLog { +// +// public static final HbrsmsLog dao = new HbrsmsLog().dao(); +// +//} diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsService.java new file mode 100644 index 0000000..f081555 --- /dev/null +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/hbrsms/HbrsmsService.java @@ -0,0 +1,246 @@ +package com.cowr.local.ssjygl.hbrsms; + + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.cowr.common.Const; +import com.cowr.common.utils.DateTimeUtil; +import com.cowr.local.ssjygl.main.Config; +import com.cowr.model.HbrsmsLog; +import com.cowr.model.OrderTemp; +import com.cowr.model.Transport; +import com.jfinal.kit.HttpKit; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.redis.Redis; +import org.apache.commons.compress.utils.Lists; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.file.Files; +import java.util.Base64; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +/** + * Description: + * Created by XuSan on 2024/10/10. + * + * @author XuSan + * @version 1.0 + */ +public class HbrsmsService { + private static Log log = Log.getLog(HbrsmsService.class); + public static final HbrsmsService me = new HbrsmsService(); + private static final String URL = "https://hbrsms.cn:10002/rsms/api/mining-transport-orders/auto"; + + public String redisbasekey() { + return Config.dbprop.get("redis.basekey") + Const.REDIS_SEPARATE + "hbrsms" + Const.REDIS_SEPARATE; + } + + public String rediskey(Object key) { + return redisbasekey() + key; + } + + + public void put(OrderTemp order, Transport transport) { + + Hbrsms hbrsms = new Hbrsms(); + hbrsms.setCategory(0); //0－砂石，1－卵石，2 - 土 + String billerName = Config.configprop.get("hbrsms.billerName"); + log.info("开单员:" + billerName); + hbrsms.setBillerName(billerName); + String billAddress = Config.configprop.get("hbrsms.billAddress"); + log.info("采区地址:" + billAddress); + hbrsms.setBillAddress(billAddress); + hbrsms.setPlateNumber(order.getTruckLicense()); + hbrsms.setActualLoad(order.getWeight()); + hbrsms.setMiningAreaName(billAddress); + hbrsms.setTransportStartTime(DateTimeUtil.convertDateToString(transport.getInTime(), DateTimeUtil.ymdhms)); + hbrsms.setTransportEndTime(DateTimeUtil.convertDateToString(transport.getOutTime(), DateTimeUtil.ymdhms)); + hbrsms.setIntendedArrivalHarbour(order.getCustomerTexpayerName()); + + log.info("请求参数:" + JSON.toJSONString(hbrsms)); + + List imgs = Lists.newArrayList(); + String firstPic = transport.getFirstPic(); + String pathname = "/home/a/ssjy_xsct/ssjygl-xsct-local/" + firstPic; + String firstPicBase64 = getBase64(new File(pathname)); + imgs.add(firstPicBase64); +// imgs.add(firstPicBase64); + String secondPic = transport.getSecondPic(); + String pathname1 = "/home/a/ssjy_xsct/ssjygl-xsct-local/" + secondPic; + String secondPicBase64 = getBase64(new File(pathname1)); + imgs.add(secondPicBase64); +// imgs.add(secondPicBase64); + hbrsms.setDocuments(imgs); + + HashMap header = new HashMap<>(); + header.put("Content-Type", "application/json"); + + String post = null; + try { + post = HttpKit.post(URL, JSON.toJSONString(hbrsms), header); + + /* + * + { + "result" : { + "status" : "OK", + "message" : "单据上传成功" + }, + "status" : 200, + "message" : null + } + * */ + log.info("响应数据: %s", post); + Redis.use().setex("hbrsms:sync:" + order.getSn(), 60 * 60 * 24, post); + } catch (Exception e) { + log.error("响应错误: " + e.getMessage(), e); + } + + String status = "NG"; + if (StrKit.notBlank(post)) { + try { + status = JSONObject.parseObject(post).getJSONObject("result").getString("status"); + } catch (Exception e) { + log.error("响应错误: " + e.getMessage(), e); + } + } + + HbrsmsLog hbrsmsLog = new HbrsmsLog(); + + imgs = Lists.newArrayList(); + imgs.add(pathname); + imgs.add(pathname1); + hbrsms.setDocuments(imgs); + hbrsmsLog.setReqData(JSON.toJSONString(hbrsms)); + hbrsmsLog.setRespData(post); + hbrsmsLog.setSn(order.getSn()); + hbrsmsLog.setCreatedate(new Date()); + hbrsmsLog.setStatus(status); + boolean save = hbrsmsLog.save(); + if (!save) { + log.error("响应日志保存失败"); + Redis.use().set("hbrsms:saveError:" + order.getSn(), hbrsmsLog); + } + } + + + /** + * 阿里OSS图片文件转成Base64编码 + * + * @param file + * @return + */ + private static String getBase64(File file) { + if (file == null || file.length() == 0) { + return null; + } + int bytesRead; // 存储读取的字节数 + byte[] buffer = new byte[1024]; // 设置缓冲区，大小可以根据需要调整 + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + try (InputStream inputStream = Files.newInputStream(file.toPath())) { + + // 读取数据 + try { + while ((bytesRead = inputStream.read(buffer)) != -1) { // 读取字节 + byteArrayOutputStream.write(buffer, 0, bytesRead); // 写入 ByteArrayOutputStream + } + } catch (IOException e) { + e.printStackTrace(); // 处理读取异常 + } + + return Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray()); + } catch (IOException e) { + // 记录日志或抛出自定义异常 + log.error("Error reading object content: " + e.getMessage()); + return null; + } + } + + + public void syncTask() { + + if (!isNetworkAvailable()) { + return; + } + + List hbrsmsLogs = HbrsmsLog + .dao + .find("SELECT * FROM hbrsms_log WHERE STATUS != 'OK';"); + for (HbrsmsLog o : hbrsmsLogs) { + + Hbrsms hbrsms = JSONObject.parseObject(o.getReqData()).toJavaObject(Hbrsms.class); + List documents = hbrsms.getDocuments(); + for (int i = 0; i < documents.size(); i++) { + String pathname = documents.get(i); + documents.add(i,getBase64(new File(pathname))); + } + + hbrsms.setDocuments(documents); + + HashMap header = new HashMap<>(); + header.put("Content-Type", "application/json"); + + String post = null; + try { + post = HttpKit.post(URL, JSON.toJSONString(hbrsms), header); + + /* + * + { + "result" : { + "status" : "OK", + "message" : "单据上传成功" + }, + "status" : 200, + "message" : null + } + * */ + log.info("响应数据: %s", post); + Redis.use().setex("hbrsms:sync:" + o.getSn(), 60 * 60 * 24, post); + } catch (Exception e) { + log.error("响应错误: " + e.getMessage(), e); + } + + String status = "NG"; + if (StrKit.notBlank(post)) { + try { + status = JSONObject.parseObject(post).getJSONObject("result").getString("status"); + } catch (Exception e) { + log.error("响应错误: " + e.getMessage(), e); + } + } + + if ("OK".equals(status)){ + o.setStatus(status); + boolean update = o.update(); + if (!update) { + log.error("响应日志保存失败"); + Redis.use().set("hbrsms:saveError:" + o.getSn(), o); + } + } + } + } + + public static boolean isNetworkAvailable() { + try { + URL url = new URL("http://www.baidu.com"); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setRequestMethod("GET"); + connection.setConnectTimeout(1500); // 设置连接超时时间 + connection.setReadTimeout(1500); // 设置读取超时时间 + return (connection.getResponseCode() == HttpURLConnection.HTTP_OK); + } catch (Exception e) { + System.out.println("网络连接失败"); + log.error("网络连接失败," + e.getMessage(),e); + return false; + } + } +} diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifyController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/log/InvoiceLogSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/invoice/receive/InvoiceReceiveController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/CheckUndonOrderclusterJob.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/ClearTempFileJob.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/ClearTempFileJob.java similarity index 92% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/ClearTempFileJob.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/ClearTempFileJob.java index 946abd3..01bc46a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/ClearTempFileJob.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/ClearTempFileJob.java @@ -8,6 +8,7 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import java.io.File; +import java.util.Objects; public class ClearTempFileJob implements Job { private static Log log = Log.getLog(ClearTempFileJob.class); @@ -18,6 +19,9 @@ public class ClearTempFileJob implements Job { File baseDir = new File(dir); File[] files = baseDir.listFiles(); + if (Objects.isNull(files)){ + return; + } for (int i = 0; i < files.length; i++) { File img = files[i]; @@ -38,6 +42,9 @@ public class ClearTempFileJob implements Job { File baseDir = new File(dir); File[] files = baseDir.listFiles(); + if (Objects.isNull(files)){ + return; + } for (int i = 0; i < files.length; i++) { File xlsx = files[i]; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/CustomerDiscountJob.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/CustomerDiscountJob.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/CustomerDiscountJob.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/CustomerDiscountJob.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/SyncJob.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/SyncJob.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/jobs/SyncJob.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/jobs/SyncJob.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/AuthInterceptor.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/CliCacheData.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/CliCacheData.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/CliCacheData.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/CliCacheData.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/Config.java similarity index 93% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 2e230d5..3cd7dc0 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -108,9 +108,10 @@ public class Config extends JFinalConfig { public static final String CLINET_VERSION = "20220112"; public static String getRootPath() { - return PathKit.getWebRootPath() - .substring(0, PathKit.getWebRootPath().indexOf(File.separator + "ssjygl-xsx-local")) + - File.separator + "ssjygl-xsx-local"; + String webRootPath = PathKit.getWebRootPath(); + return webRootPath + .substring(0, webRootPath.indexOf(File.separator + "ssjygl-xsct-local")) + + File.separator + "ssjygl-xsct-local"; } private class ClientThread extends Thread { @@ -275,18 +276,18 @@ public class Config extends JFinalConfig { { String jdbcUrl = dbprop.get("jdbcUrl"); - if (isDev() && !jdbcUrl.contains("_dev")) { - log.error("dev 的开发环境，连的不是 dev 库"); - log.error("dev 的开发环境，连的不是 dev 库"); - log.error("dev 的开发环境，连的不是 dev 库"); - log.error("dev 的开发环境，连的不是 dev 库"); - - System.exit(0); - } - - if (isDev() && jdbcUrl.contains("aliyuncs.com")) { - jdbcUrl = jdbcUrl.replace("/ssjy_xsx_dev?", "/ssjy_xsx_dev_" + configprop.get("current.supermarket_id") + "?"); - } +// if (isDev() && !jdbcUrl.contains("_dev")) { +// log.error("dev 的开发环境，连的不是 dev 库"); +// log.error("dev 的开发环境，连的不是 dev 库"); +// log.error("dev 的开发环境，连的不是 dev 库"); +// log.error("dev 的开发环境，连的不是 dev 库"); +// +// System.exit(0); +// } +// +// if (isDev() && jdbcUrl.contains("aliyuncs.com")) { +// jdbcUrl = jdbcUrl.replace("/ssjy_xsct_dev?", "/ssjy_xsct_dev_" + configprop.get("current.supermarket_id") + "?"); +// } log.debug("jdbcUrl:%s", jdbcUrl); @@ -381,6 +382,7 @@ public class Config extends JFinalConfig { log.info("===================================================="); log.info("============= 最大限重 %s 吨 =================", configprop.getInt("weigh.max")); log.info("===================================================="); + log.info("省厅数据上传 开票人:%s, 采区:%s", Config.configprop.get("hbrsms.billerName") ,Config.configprop.get("hbrsms.billAddress")); } StockSyncService.me.initSupermarketStock(); @@ -396,7 +398,9 @@ public class Config extends JFinalConfig { new ClientThread().start(); } - socketio = new SocketIOService(configprop.getInt("socketio.port")); + Integer anInt = configprop.getInt("socketio.port"); + log.info("socketio.port:%s", anInt); + socketio = new SocketIOService(anInt); socketio.start(); // BocommXMLKit.me.init(); // 初始化银行 sdk @@ -459,7 +463,7 @@ public class Config extends JFinalConfig { // 这边将 生产 环境运行目录写死，只有在这个目录下运行时，才算 生产 环境 String path = PathKit.getWebRootPath(); log.debug("WebRootPath:", path); - String linux_dev_dir = "/home/a/ssjy_xsx/ssjygl-xsx-local-release"; + String linux_dev_dir = "/home/a/ssjy_xsct/ssjygl-xsct-local-release"; if (linux_dev_dir.equals(path)) { ENV = "prod"; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/Main.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Main.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/main/Main.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/AbstractClient.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/netty/AbstractClient.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/AbstractClient.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/netty/AbstractClient.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/EndPoint.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/netty/EndPoint.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/EndPoint.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/netty/EndPoint.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/SocketIOService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/netty/SocketIOService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/SocketIOService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/netty/SocketIOService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java similarity index 84% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java index f3b981a..7ed7ea8 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/OrderclusterController.java @@ -66,6 +66,31 @@ public class OrderclusterController extends BaseController { renderJson(Result.object(OrderclusterService.me.findCluster(pp, supermarket_id, trans_co_id, customer_id, customer_name, stm, etm, state, product_id, sale_type))); } + /** + * 分页查找 ordercluster 取土场订单簇 - 集团客户订单 + */ + public void findTemp2() { + PageParam pp = getBean(PageParam.class, "", true); + String stm = get("stm"); + String etm = get("etm"); + String customer_id = get("customer_id"); + String customer_name = get("customer_name"); + Integer supermarket_id = getInt("supermarket_id"); + Integer sale_type = getInt("sale_type", 2); + + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + // 是客户账户 + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + + Integer state = getInt("state"); + Integer product_id = getInt("product_id",1); + renderJson(Result.object(OrderclusterService.me.findTemp2(pp, supermarket_id, customer_id, customer_name, stm, etm, state, product_id, sale_type))); + } + /** * 分页查找 ordercluster 订单簇 - 集团客户订单 */ diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java similarity index 94% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java index 58ff96e..89d3921 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordercluster/truck/OrderclusterTruckController.java @@ -8,8 +8,6 @@ import com.cowr.ssjygl.order.ordercluster.truck.OrderclusterTruckService; import com.jfinal.aop.Before; import com.jfinal.core.Controller; -import java.time.LocalDate; - import static com.cowr.common.utils.DateTimeUtil.TM_TIME; import static com.cowr.common.utils.DateTimeUtil.now; @@ -42,8 +40,9 @@ public class OrderclusterTruckController extends Controller { String etm = get("etm",now() + " 23:59:59"); String customer_name = get("customer_name"); String truck_license = get("truck_license"); + Integer supermarket_type = getInt("supermarket_type"); Integer state = getInt("state"); - renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state))); + renderJson(Result.object(OrderclusterTruckService.me.find(pp, stm, etm, customer_name, truck_license, state, supermarket_type))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java similarity index 94% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java index 7c8449f..a3dd8f0 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseController.java @@ -51,12 +51,13 @@ public class OrderPurchaseController extends BaseController { String uuid = get("uuid"); String transport_id = get("transport_id"); + String old_sn = get("old_sn"); Integer purchase_id = getInt("purchase_id"); Integer product_id = getInt("product_id"); String printer = get("printer", Enums.PrinterIdEnum.printer1.name()); Double source_weight = getParaToDouble("source_weight"); - renderJson(OrderPurchaseSyncService.me.pay(uuid, transport_id, purchase_id, product_id, printer, source_weight, tokenuser)); + renderJson(OrderPurchaseSyncService.me.pay(uuid,old_sn, transport_id, purchase_id, product_id, printer, source_weight, tokenuser)); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchasePayValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchasePayValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchasePayValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchasePayValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java similarity index 97% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java index 19e9e44..1201f65 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java @@ -36,6 +36,7 @@ public class OrderPurchaseSyncService { */ public Result pay( String uuid, + String old_sn, String transport_id, Integer purchase_id, Integer product_id, @@ -70,6 +71,7 @@ public class OrderPurchaseSyncService { SyncTask synctask = new SyncTask(); OrderPurchase order = new OrderPurchase(); order.setUuid(uuid); + order.setOldSn(old_sn); if (order.checkDuplicate("uuid")) { return Result.failed("【%s】已经存在", uuid); @@ -124,10 +126,10 @@ public class OrderPurchaseSyncService { order.setTransCoTexpayerNum(tc.getTexpayerNum()); // 有物流公司才计算运费 - order.setTransDistance(SupermarketSandfarmDistanceService.me.getDistance(transport.getSupermarketId(), purchase_id)); - order.setTransUnitPrice(new BigDecimal(TransPriceService.me.getTransferStartTransPrice(order.getTransDistance().doubleValue()))); + order.setTransDistance(SupermarketSandfarmDistanceService.me.getDistance(transport.getSupermarketId(), purchase_id)); //采购运距 + order.setTransUnitPrice(new BigDecimal(TransPriceService.me.getTransferStartTransPrice(order.getTransDistance().doubleValue()))); // //采购单价 // 支付时，用净重计算运费 - order.setTransPrice(new BigDecimal(TransPriceService.me.caleTransferTransPrice(order.getTransCoId(), net_weight.doubleValue(), order.getTransDistance().doubleValue()))); + order.setTransPrice(new BigDecimal(TransPriceService.me.caleTransferTransPrice( net_weight.doubleValue(), order.getTransDistance().doubleValue())));// 采购运费 } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderseq/OrderSeqService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderseq/OrderSeqService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderseq/OrderSeqService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/orderseq/OrderSeqService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java similarity index 94% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java index 6a1f467..d68d226 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java @@ -7,6 +7,8 @@ import com.cowr.common.validator.StartAndEndIntervalValidator; import com.cowr.common.view.ExcelRender; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; +import com.cowr.local.ssjygl.hbrsms.HbrsmsService; +import com.cowr.local.ssjygl.main.AuthInterceptor; import com.cowr.local.ssjygl.order.LocalOrderService; import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.Sysuser; @@ -14,6 +16,7 @@ import com.cowr.ssjygl.order.SnValidator; import com.cowr.ssjygl.order.ordertemp.OrderTempPKValidator; import com.cowr.ssjygl.order.ordertemp.OrderTempService; import com.jfinal.aop.Before; +import com.jfinal.aop.Clear; import com.jfinal.log.Log; import org.apache.poi.ss.usermodel.Workbook; @@ -42,13 +45,14 @@ public class OrderTempController extends BaseController { Integer type = getInt("type"); Integer product_id = getInt("product_id"); Integer supermarket_id = getInt("supermarket_id"); + Integer supermarket_type = getInt("supermarket_type"); Integer isprepaid = getInt("isprepaid"); String invoice_code = get("invoice_code"); String ticket_code = get("ticket_code"); Integer invoice_type = getInt("invoice_type"); Integer customer_id = getInt("customer_id"); Boolean invoice_code_is_null = getBoolean("invoice_code_is_null"); - renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, state, type, invoice_code, invoice_type, ticket_code, product_id, invoice_code_is_null))); + renderJson(Result.object(OrderTempService.me.find(pp, sn, truck_license, supermarket_id, supermarket_type, customer_id, customer_name, stm, etm, isprepaid, state, type, invoice_code, invoice_type, ticket_code, product_id, invoice_code_is_null))); } @Before(StartAndEndIntervalValidator.class) @@ -225,4 +229,10 @@ public class OrderTempController extends BaseController { renderJson(LocalOrderService.me.print(sn, printer, tokenuser)); } } + + @Clear(AuthInterceptor.class) + public void hbrsmsSyncTask() { + HbrsmsService.me.syncTask(); + renderJson(Result.success()); + } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPayValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPayValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPayValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPayValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPrepayValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPrepayValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPrepayValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempPrepayValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java similarity index 99% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index a69971b..de673b9 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -7,6 +7,7 @@ import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.utils.DateTimeUtil; import com.cowr.common.view.Result; import com.cowr.local.ssjygl.actioncmdlog.ActionCmdLogSyncService; +import com.cowr.local.ssjygl.hbrsms.HbrsmsService; import com.cowr.local.ssjygl.main.CliCacheData; import com.cowr.local.ssjygl.main.Config; import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; @@ -288,6 +289,9 @@ public class OrderTempSyncService { // 数据库保存成功后，立即推送到服务端，及时更新发票使用信息 if (ret) { SyncTaskService.me.send(synctask); + + // 数据上报 + HbrsmsService.me.put(order,transport); } // if (order.getPayType() == 1) { @@ -633,6 +637,9 @@ public class OrderTempSyncService { // 数据库保存成功后，立即推送到服务端，及时更新发票使用信息 if (ret) { SyncTaskService.me.send(synctask); + + // 数据上报 + HbrsmsService.me.put(order,transport); } return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId); @@ -1031,6 +1038,9 @@ public class OrderTempSyncService { // 数据库保存成功后，立即推送到服务端，及时更新各个地方的客户余额 if (ret) { SyncTaskService.me.send(synctask); + + // 数据上报 + HbrsmsService.me.put(order,transport); } return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId); @@ -1143,7 +1153,7 @@ public class OrderTempSyncService { } //账户可用余额 - BigDecimal availableBalance = PresellOrderService.me.getPresellCustomerSurplus2ById(ordercluster.getCustomerId()); + BigDecimal availableBalance = PresellOrderService.me.getPresellCustomerSurplus2ByIdLocal(ordercluster.getCustomerId()); // local if (availableBalance == null || availableBalance.compareTo(min) <= 0) { return Result.failed("客户余额不足"); } @@ -1410,6 +1420,9 @@ public class OrderTempSyncService { // 数据库保存成功后，立即推送到服务端，及时更新各个地方的客户余额 if (ret) { SyncTaskService.me.send(synctask); + + // 数据上报 + HbrsmsService.me.put(order,transport); } return LocalOrderService.me.orderPayComplete(ret, order.toRecord(), transport, printerId); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java similarity index 94% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java index 6f9922b..d4c31df 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferController.java @@ -51,12 +51,13 @@ public class OrderTransferController extends BaseController { String uuid = get("uuid"); String transport_id = get("transport_id"); + String old_sn = get("old_sn"); Integer sandfarm_id = getInt("sandfarm_id"); - Integer product_id = getInt("product_id"); + Integer product_id = getInt("product_id",1); String printer = get("printer", Enums.PrinterIdEnum.printer1.name()); Double source_weight = getParaToDouble("source_weight"); - renderJson(OrderTransferSyncService.me.pay(uuid, transport_id, sandfarm_id, product_id, printer, source_weight, tokenuser)); + renderJson(OrderTransferSyncService.me.pay(uuid, transport_id, old_sn, sandfarm_id, product_id, printer, source_weight, tokenuser)); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferPayValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferPayValidator.java similarity index 89% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferPayValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferPayValidator.java index d82faae..aa06c3e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferPayValidator.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferPayValidator.java @@ -12,7 +12,7 @@ public class OrderTransferPayValidator extends CrudParamValidator { validateString("uuid", 32, 32, "uuid", "uuid 长度 32，必填"); validateString("transport_id", 32, 32, "transport_id", "transport_id 长度 32，必填"); validateInteger("sandfarm_id", 1, 2147483647, "sandfarm_id", "sandfarm_id 范围 1~2147483647"); - validateInteger("product_id", 1, 2147483647, "product_id", "product_id 范围 1~2147483647"); + validateString("old_sn", 1, 16, "old_sn", "old_sn 长度 1~16"); if (StrKit.notBlank(c.get("source_weight"))) { validateDouble("source_weight", 1, 9999, "source_weight", "source_weight 范围 1~999"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java similarity index 95% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java index 3f628c3..d0db73f 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java @@ -4,12 +4,12 @@ import com.cowr.common.enums.Enums; import com.cowr.common.enums.OrderStateEnum; import com.cowr.common.enums.OrderTypeEnum; import com.cowr.common.view.Result; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.local.ssjygl.order.LocalOrderService; import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; -import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceService; import com.cowr.ssjygl.transprice.TransPriceService; import com.jfinal.log.Log; @@ -37,6 +37,7 @@ public class OrderTransferSyncService { public Result pay( String uuid, String transport_id, + String old_sn, Integer sandfarm_id, Integer product_id, String printerId, @@ -57,10 +58,10 @@ public class OrderTransferSyncService { return Result.failedstr("没有找到商品信息【%s】", product_id); } - Sandfarm sandfarm = Sandfarm.dao.findById(sandfarm_id); - if (sandfarm == null) { - return Result.failedstr("没有找到砂场信息【%s】", sandfarm_id); - } +// Sandfarm sandfarm = Sandfarm.dao.findById(sandfarm_id); +// if (sandfarm == null) { +// return Result.failedstr("没有找到砂场信息【%s】", sandfarm_id); +// } Truck truck = Truck.dao.findById(transport.getTruckLicense()); if (truck == null) { @@ -77,6 +78,7 @@ public class OrderTransferSyncService { SyncTask synctask = new SyncTask(); OrderTransfer order = new OrderTransfer(); order.setUuid(uuid); + order.setOldSn(old_sn); if (order.checkDuplicate("uuid")) { return Result.failed("【%s】已经存在", uuid); @@ -124,10 +126,10 @@ public class OrderTransferSyncService { order.setTransCoTexpayerName(tc.getTexpayerName()); order.setTransCoTexpayerNum(tc.getTexpayerNum()); - order.setTransDistance(SupermarketSandfarmDistanceService.me.getDistance(transport.getSupermarketId(), sandfarm_id)); - order.setTransUnitPrice(new BigDecimal(TransPriceService.me.getTransferStartTransPrice(order.getTransDistance().doubleValue()))); + order.setTransDistance(SupermarketSandfarmDistanceService.me.getDistance(transport.getSupermarketId(), sandfarm_id)); // 转运运距 + order.setTransUnitPrice(new BigDecimal(TransPriceService.me.getTransferStartTransPrice(order.getTransDistance().doubleValue()))); // 转运单价 // 支付时，用净重计算运费 - order.setTransPrice(new BigDecimal(TransPriceService.me.caleTransferTransPrice(order.getTransCoId(), net_weight.doubleValue(), order.getTransDistance().doubleValue()))); + order.setTransPrice(new BigDecimal(TransPriceService.me.caleTransferTransPrice( net_weight.doubleValue(), order.getTransDistance().doubleValue()))); // 转运运费 // 更新 transport 出入场信息 transport.setTransCoId(truck.getTransCoId()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashPayValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashPayValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashPayValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashPayValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java similarity index 98% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java index 4b83693..752f0bf 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java @@ -110,7 +110,7 @@ public class OrderTrashSyncService { order.setTransDistance(new BigDecimal(trans_distance)); order.setTransUnitPrice(new BigDecimal(TransPriceService.me.getTransferStartTransPrice(order.getTransDistance().doubleValue()))); // 支付时，用净重计算运费 - order.setTransPrice(new BigDecimal(TransPriceService.me.caleTransferTransPrice(order.getTransCoId(), net_weight.doubleValue(), order.getTransDistance().doubleValue()))); + order.setTransPrice(new BigDecimal(TransPriceService.me.caleTransferTransPrice( net_weight.doubleValue(), order.getTransDistance().doubleValue()))); // 更新 transport 出入场信息 transport.setTransCoId(truck.getTransCoId()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/overall/OverallController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/overall/OverallController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/overall/OverallController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/overall/OverallController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/PrepayController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/PrepayController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/PrepayController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/PrepayController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaydetail/PrepayDetailController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaydetail/PrepayDetailController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaydetail/PrepayDetailController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaydetail/PrepayDetailController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/DayValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/DayValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/DayValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/DayValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/prepay/refunddetail/RefundDetailController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/presellorder/PresellOrderController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/presellorder/PresellOrderController.java similarity index 72% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/presellorder/PresellOrderController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/presellorder/PresellOrderController.java index e761769..57f5869 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/presellorder/PresellOrderController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/presellorder/PresellOrderController.java @@ -6,9 +6,6 @@ import com.cowr.common.view.Result; import com.cowr.ssjygl.presellorder.PresellOrderService; import com.jfinal.core.Controller; -import static com.cowr.common.utils.DateTimeUtil.TM_TIME; -import static com.cowr.common.utils.DateTimeUtil.now; - /** * Generated by COWR Wed Dec 15 11:37:33 CST 2021 * TableName: presell_order @@ -26,10 +23,12 @@ public class PresellOrderController extends Controller { Integer type = getInt("type"); Integer del = getInt("del", Const.LOGIC_DEL_VALID); // 默认显示未删除的 String name = get("name"); - String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); - String etm = get("etm",now() + " 23:59:59"); +// String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); +// String etm = get("etm",now() + " 23:59:59"); + String stm = get("stm"); + String etm = get("etm"); PageParam pp = getBean(PageParam.class, "", true); - renderJson(Result.object(PresellOrderService.me.find(pp, customer_id, supermarket_id, del, name, stm, etm, type))); + renderJson(Result.object(PresellOrderService.me.findLocal(pp, customer_id, supermarket_id, del, name, stm, etm, type))); } @@ -44,6 +43,6 @@ public class PresellOrderController extends Controller { String name = get("name"); String stm = get("stm"); String etm = get("etm"); - renderJson(Result.object(PresellOrderService.me.list(customer_id, supermarket_id, del, name, stm, etm, type))); + renderJson(Result.object(PresellOrderService.me.listLoacl(customer_id, supermarket_id, del, name, stm, etm, type))); } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/product/ProductController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/product/ProductController.java similarity index 90% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/product/ProductController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/product/ProductController.java index e106bff..e8851b2 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/product/ProductController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/product/ProductController.java @@ -34,8 +34,9 @@ public class ProductController extends Controller { public void find() { PageParam pp = getBean(PageParam.class, "", true); String name = get("name"); - Integer del = getInt("del"); - renderJson(Result.object(ProductService.me.find(pp, name, del))); + Integer del = getInt("del",0); + Integer type = getInt("type"); + renderJson(Result.object(ProductService.me.find(pp, name, del, type))); } /** @@ -60,7 +61,8 @@ public class ProductController extends Controller { * 返回所有 product 商品信息 */ public void list() { - renderJson(Result.object(ProductService.me.list())); + Integer type = getInt("type",0); + renderJson(Result.object(ProductService.me.list(type))); } public void getUnitPrice() { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/purchase/PurchaseController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/purchase/PurchaseController.java similarity index 97% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/purchase/PurchaseController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/purchase/PurchaseController.java index 3aa5fad..e4b4c1e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/purchase/PurchaseController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/purchase/PurchaseController.java @@ -34,7 +34,7 @@ public class PurchaseController extends Controller { public void find() { PageParam pp = getBean(PageParam.class, "", true); String name = get("name"); - Integer del = getInt("del"); + Integer del = getInt("del",0); renderJson(Result.object(PurchaseService.me.find(pp, name, del))); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/sandfarm/SandfarmController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/sandfarm/SandfarmController.java similarity index 97% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/sandfarm/SandfarmController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/sandfarm/SandfarmController.java index 4853af3..1c3fad1 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/sandfarm/SandfarmController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/sandfarm/SandfarmController.java @@ -34,7 +34,7 @@ public class SandfarmController extends Controller { public void find() { PageParam pp = getBean(PageParam.class, "", true); String name = get("name"); - Integer del = getInt("del"); + Integer del = getInt("del",0); renderJson(Result.object(SandfarmService.me.find(pp, name, del))); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/sms/log/SmsLogController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/sms/log/SmsLogController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/sms/log/SmsLogController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/sms/log/SmsLogController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java similarity index 98% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java index 6352177..ed24e6f 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java @@ -92,10 +92,11 @@ public class OrderStatController extends BaseController { String tm = get("tm"); int export = getInt("export", 0); Integer sale_type = getInt("sale_type"); + Integer type = getInt("type",0); if (export == 0) { - renderJson(Result.object(OrderStatService.me.salestat(tm, sale_type))); + renderJson(Result.object(OrderStatService.me.salestat(tm, sale_type,type))); } else { - Workbook wb = OrderStatService.me.daysalestatExport(tm, sale_type); + Workbook wb = OrderStatService.me.daysalestatExport(tm, sale_type,type); render(new ExcelRender(tm + "_销售日统计_" + System.currentTimeMillis() + ".xlsx", wb)); } } @@ -108,10 +109,11 @@ public class OrderStatController extends BaseController { String tm = get("tm"); int export = getInt("export", 0); Integer sale_type = getInt("sale_type"); + Integer type = getInt("type",0); if (export == 0) { - renderJson(Result.object(OrderStatService.me.salestat(tm, sale_type))); + renderJson(Result.object(OrderStatService.me.salestat(tm, sale_type,type))); } else { - Workbook wb = OrderStatService.me.monthsalestatExport(tm, sale_type); + Workbook wb = OrderStatService.me.monthsalestatExport(tm, sale_type,type); render(new ExcelRender(tm + "_销售月统计_" + System.currentTimeMillis() + ".xlsx", wb)); } } @@ -311,9 +313,9 @@ public class OrderStatController extends BaseController { Boolean stat_product = getBoolean("stat_product", false); Integer sale_type = getInt("sale_type"); if (export == 0) { - renderJson(Result.object(OrderStatService.me.yearStatByCustomer(tm, stat_product, customer_id, customer_type_id, sale_type))); + renderJson(Result.object(OrderStatService.me.yearStatByCustomerLocal(tm, stat_product, customer_id, customer_type_id, sale_type))); } else { - Workbook wb = OrderStatService.me.yearStatByCustomerExport(tm, stat_product, customer_id, customer_type_id, sale_type); + Workbook wb = OrderStatService.me.yearStatByCustomerExportLocal(tm, stat_product, customer_id, customer_type_id, sale_type); render(new ExcelRender("按客户统计总销售汇总表_" + System.currentTimeMillis() + ".xlsx", wb)); } } @@ -323,9 +325,9 @@ public class OrderStatController extends BaseController { int export = getInt("export", 0); // 是否导出为exce 0 不导出，1 导出 Boolean stat_product = getBoolean("stat_product", false); if (export == 0) { - renderJson(Result.object(OrderStatService.me.statYearBySup(tm, 2))); + renderJson(Result.object(OrderStatService.me.statYearBySupLocal(tm, 2))); } else { - Workbook wb = OrderStatService.me.yearsalestatExportBySup(tm); + Workbook wb = OrderStatService.me.yearsalestatExportBySupLocal(tm); render(new ExcelRender("按砂站总销售汇总表_" + System.currentTimeMillis() + ".xlsx", wb)); } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java similarity index 97% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java index 17725da..9ab3701 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java @@ -34,7 +34,7 @@ public class SupermarketController extends Controller { public void find() { PageParam pp = getBean(PageParam.class, "", true); String name = get("name"); - Integer del = getInt("del"); + Integer del = getInt("del",0); renderJson(Result.object(SupermarketService.me.find(pp, name, del))); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java similarity index 88% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java index e269420..e229f34 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java @@ -63,4 +63,12 @@ public class SupermarketSandfarmDistanceController extends Controller { public void list() { renderJson(Result.object(SupermarketSandfarmDistanceService.me.list())); } + + + public void findAllSupermarket() { + PageParam pp = getBean(PageParam.class, "", true); + Integer customer_id = getInt("customer_id"); + String customer_name = get("customer_name"); + renderJson(Result.object(SupermarketSandfarmDistanceService.me.findAllSupermarket(pp, customer_id, customer_name))); + } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockSyncService.java similarity index 94% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockSyncService.java index dc05c25..b7b8e89 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockSyncService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/stock/StockSyncService.java @@ -40,7 +40,11 @@ public class StockSyncService { for (Record record : list) { if (record.get("id") == CliCacheData.SUP.getId()) { Stock stock = new Stock(); - stock.setProductId(record.get("product_id")); + Integer productId = record.get("product_id"); + if (productId == null){ // 如果砂站未绑定商品就先不处理 + continue; + } + stock.setProductId(productId); stock.setSupermarketId(record.get("id")); stock.setStockWeight(new BigDecimal(0)); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java similarity index 76% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java index ad2e8ac..fb0767a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/synctask/SyncTaskService.java @@ -7,7 +7,6 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.main.CliCacheData; import com.cowr.local.ssjygl.main.Config; import com.cowr.model.AuthLicense; -import com.cowr.model.Supermarket; import com.cowr.model.SyncTask; import com.cowr.ssjygl.CacheData; import com.jfinal.kit.StrKit; @@ -21,8 +20,8 @@ import java.sql.SQLException; import java.util.*; public class SyncTaskService { - private static Log log = Log.getLog(SyncTaskService.class); - public static final SyncTaskService me = new SyncTaskService(); + private static Log log = Log.getLog(SyncTaskService.class); + public static final SyncTaskService me = new SyncTaskService(); // 是否开启 public boolean isEnable() { @@ -133,9 +132,9 @@ public class SyncTaskService { long st = System.currentTimeMillis(); try { - JSONObject save_data = JSONObject.parseObject(recvdata.getString("save_data")); - JSONObject update_data = JSONObject.parseObject(recvdata.getString("update_data")); - JSONObject delete_data = JSONObject.parseObject(recvdata.getString("delete_data")); + JSONObject save_data = JSONObject.parseObject(recvdata.getString("save_data")); + JSONObject update_data = JSONObject.parseObject(recvdata.getString("update_data")); + JSONObject delete_data = JSONObject.parseObject(recvdata.getString("delete_data")); JSONObject increment_data = JSONObject.parseObject(recvdata.getString("increment_data")); if ( @@ -154,14 +153,14 @@ public class SyncTaskService { @Override public boolean run() { try { - JSONArray saveauthlics = new JSONArray(); // 授权车牌号需要推送更新到其他砂站 + JSONArray saveauthlics = new JSONArray(); // 授权车牌号需要推送更新到其他砂站 JSONArray deleteauthlics = new JSONArray(); if (save_data != null && !save_data.isEmpty()) { for (String tablename : save_data.keySet()) { - JSONObject data = save_data.getJSONObject(tablename); - String pks = data.getString("pks"); - JSONArray arr = data.getJSONArray("data"); + JSONObject data = save_data.getJSONObject(tablename); + String pks = data.getString("pks"); + JSONArray arr = data.getJSONArray("data"); List list = new ArrayList<>(); if (AuthLicense.dao.getTablename().equals(tablename)) { @@ -172,7 +171,26 @@ public class SyncTaskService { for (int i = 0; i < arr.size(); i++) { JSONObject obj = arr.getJSONObject(i); - list.add(new Record().setColumns(obj.getInnerMap())); + // 判断主键是否存在,如果存在就修改 + if (pks != null) { + String[] split = pks.split(","); + String sql = "SELECT * FROM " + tablename + " WHERE "; + for (int i1 = 0; i1 < split.length; i1++) { + sql += split[i1] + " = '" + obj.getString(split[i1]) + "'"; + if (i1 < split.length - 1) { + sql += " AND "; + } + } + // 查询当前数据是否存在 + List recordList = Db.find(sql); + + // 不存在的数据才新增 + if (recordList.isEmpty()) { + list.add(new Record().setColumns(obj.getInnerMap())); + } + } + +// list.add(new Record().setColumns(obj.getInnerMap())); } int[] ret = Db.batchSave(tablename, list, list.size()); @@ -205,12 +223,31 @@ public class SyncTaskService { int[] ret = Db.batchUpdate(tablename, pks, list, list.size()); + List listAdd = new ArrayList<>(); + + List okRet = new ArrayList<>(); + // 更新失败进行新增 + for (int i = 0; i < ret.length; i++) { + if (ret[i] == 0) { + listAdd.add(list.get(i)); + }else{ + okRet.add(ret[i]); + } + } + + if (!listAdd.isEmpty()){ + int[] retAdd = Db.batchSave(tablename, listAdd, listAdd.size()); + for (int i : retAdd) { + okRet.add(i); + } + } + // 没有的记录更新影响的行数应该是 0 - if (ret.length != list.size()) { + if (okRet.size() != list.size()) { return false; } - for (int i : ret) { + for (Integer i : okRet) { // 必须是每条 sql 修改一条记录 if (i != 1) { return false; @@ -218,12 +255,11 @@ public class SyncTaskService { } } } - if (delete_data != null && !delete_data.isEmpty()) { for (String tablename : delete_data.keySet()) { JSONObject data = delete_data.getJSONObject(tablename); - String pks = data.getString("pks"); - JSONArray arr = data.getJSONArray("data"); + String pks = data.getString("pks"); + JSONArray arr = data.getJSONArray("data"); if (AuthLicense.dao.getTablename().equals(tablename)) { deleteauthlics.addAll(arr); @@ -247,12 +283,12 @@ public class SyncTaskService { // 2020-10-10 只在修改 PrepayCustomer 中的余额时需要用到 if (increment_data != null && !increment_data.isEmpty()) { for (String tablename : increment_data.keySet()) { - JSONObject data = increment_data.getJSONObject(tablename); - String pks = data.getString("pks"); - JSONArray pkv = data.getJSONArray("pkv"); + JSONObject data = increment_data.getJSONObject(tablename); + String pks = data.getString("pks"); + JSONArray pkv = data.getJSONArray("pkv"); JSONObject increment_data = data.getJSONObject("increment"); - Record record = Db.findByIds(tablename, pks, pkv.toArray()); + Record record = Db.findByIds(tablename, pks, pkv.toArray()); boolean change = false; if (record == null) { @@ -299,6 +335,7 @@ public class SyncTaskService { } catch (Exception e) { if (e.getMessage().contains("PRIMARY")) { log.error("主键冲突 %s", recvdata.toJSONString()); + log.error("主键冲突数据 %s", JSONObject.parseObject(recvdata.getString("save_data"))); err[0] = String.format("主键冲突 %s", recvdata.toJSONString()); } else if (e.getMessage().contains("Duplicate entry")) { log.error("重复数据 %s", recvdata.toJSONString()); @@ -343,12 +380,17 @@ public class SyncTaskService { for (int i = 0; i < savearr.size(); i++) { AuthLicense authlic = new AuthLicense(); authlic.setTruckLicense(savearr.getJSONObject(i).getString("truck_license")); - - saves.add(authlic); + // 判断当前是否存在 + AuthLicense byPk1 = authlic.findByPk(); + if (byPk1 == null){ + saves.add(authlic); + } } try { - Db.batchSave(saves, saves.size()); + if (!saves.isEmpty()){ + Db.batchSave(saves, saves.size()); + } } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifyController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifyController.java similarity index 95% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifyController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifyController.java index 7f63af0..b590719 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifyController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifyController.java @@ -22,9 +22,10 @@ public class TicketInvalidVerifyController extends Controller { String order_sn = get("order_sn"); String create_user_name = get("create_user_name"); Integer supermarket_id = getInt("supermarket_id"); + Integer supermarket_type = getInt("supermarket_type"); Integer state = getInt("state"); - renderJson(Result.object(TicketInvalidVerifyService.me.find(pp, stm, etm, ticket_code, order_sn, create_user_name, supermarket_id, state))); + renderJson(Result.object(TicketInvalidVerifyService.me.find(pp, stm, etm, ticket_code, order_sn, create_user_name, supermarket_id,supermarket_type, state))); } @Before(TicketInvalidVerifyValidator.class) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifySyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifySyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifySyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/invalidverify/TicketInvalidVerifySyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogController.java similarity index 95% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogController.java index 2155e59..3de5e1b 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogController.java @@ -21,12 +21,13 @@ public class TicketLogController extends Controller { public void find() { PageParam pp = getBean(PageParam.class, "", true); Integer supermarket_id = getInt("supermarket_id"); + Integer supermarket_type = getInt("supermarket_type"); Integer state = getInt("state"); String order_sn = get("order_sn"); String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); String etm = get("etm",now() + " 23:59:59"); String ticket_code = get("ticket_code"); - renderJson(Result.object(TicketLogService.me.find(pp, supermarket_id, state, order_sn, stm, etm, ticket_code))); + renderJson(Result.object(TicketLogService.me.find(pp, supermarket_id,supermarket_type, state, order_sn, stm, etm, ticket_code))); } @Before(StartAndEndIntervalValidator.class) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/log/TicketLogSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/receive/TicketReceiveController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/receive/TicketReceiveController.java similarity index 94% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/receive/TicketReceiveController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/receive/TicketReceiveController.java index 94d623b..9a3c6fe 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ticket/receive/TicketReceiveController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/ticket/receive/TicketReceiveController.java @@ -31,10 +31,11 @@ public class TicketReceiveController extends Controller { public void find() { PageParam pp = getBean(PageParam.class, "", true); Integer supermarket_id = getInt("supermarket_id"); + Integer supermarket_type = getInt("supermarket_type"); String reveiver_user_name = get("reveiver_user_name"); String stm = get("stm"); String etm = get("etm"); - renderJson(Result.object(TicketReceiveService.me.find(pp, supermarket_id, reveiver_user_name, stm, etm))); + renderJson(Result.object(TicketReceiveService.me.find(pp, supermarket_id,supermarket_type, reveiver_user_name, stm, etm))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/CmdLicenseValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/CmdLicenseValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/CmdLicenseValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/CmdLicenseValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/ManualCreateValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/ManualCreateValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/ManualCreateValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/ManualCreateValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/ManualWeightValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/ManualWeightValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/ManualWeightValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/ManualWeightValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/MemoValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/MemoValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/MemoValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/MemoValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/PaySginValidator.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/PaySginValidator.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/PaySginValidator.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/PaySginValidator.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportDeviceService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java similarity index 94% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java index 26a7a68..6bffe15 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryController.java @@ -33,15 +33,26 @@ public class TransportQueryController extends BaseController { public void find() { PageParam pp = getBean(PageParam.class, "", true); Integer supermarket_id = getInt("supermarket_id"); + Integer supermarket_type = getInt("supermarket_type"); String order_sn = get("order_sn"); String stm = get("stm", now().minusDays(TM_TIME) + " 00:00:00"); String etm = get("etm",now() + " 23:59:59"); Integer trans_co_id = getInt("trans_co_id"); Integer state = getInt("state"); String truck_license = getUpperCaseVal("truck_license"); - renderJson(Result.object(TransportService.me.find(pp, order_sn, stm, etm, truck_license, supermarket_id, trans_co_id, state))); + renderJson(Result.object(TransportService.me.find(pp, order_sn, stm, etm, truck_license, supermarket_id, trans_co_id, state, supermarket_type))); } + + + @Before(TransportIdValidator.class) + public void transferInfo() { + String transport_id = get("transport_id"); + + renderJson(TransportQueryService.me.transferInfo(transport_id)); + } + + /** * 已入场车辆 */ diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java similarity index 86% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java index f0d57e2..cefe887 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportQueryService.java @@ -25,7 +25,9 @@ import com.jfinal.plugin.activerecord.Record; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.Objects; /** * 出入场相关记录查询，不涉及修改 @@ -34,6 +36,64 @@ public class TransportQueryService { private static Log log = Log.getLog(TransportQueryService.class); public static TransportQueryService me = new TransportQueryService(); + public Result transferInfo(String transport_id) { + Transport transport = Transport.dao.findById(transport_id); + + if (transport == null) { + return Result.failed("未找到有效的出入场记录"); + } + +// if (transport.getFirstWeight() == null || transport.getSecondWeight() == null) { + if (transport.getFirstWeight() == null ) { + return Result.failed("重量数据不完整"); + } + + + Record transobj = transport.toRecord(); + + transobj.set("prepay_truck", false); + + Supermarket supermarket = Supermarket.dao.findById(transport.getSupermarketId()); + if (supermarket != null) { + transobj.set("supermarket_name", supermarket.getName()); + transobj.set("supermarket_invoice_type", supermarket.getInvoiceType()); + } + + + + if (transport.getType() != null && (transport.getType() == OrderTypeEnum.PURCHASE.getTypeid() || transport.getType() == OrderTypeEnum.ALL.getTypeid())) { + OrderPurchase orderPurchase = OrderPurchase.dao.findById(transobj.get("order_sn")); + if (Objects.nonNull(orderPurchase)){ + transobj.set("product_name",orderPurchase.getProductName()); + transobj.set("ticket_code",orderPurchase.getOldSn()); + transobj.set("source_weight",orderPurchase.getSourceWeight()); + Purchase purchase = Purchase.dao.findById(orderPurchase.getPurchaseId()); + if (purchase != null) { + transobj.set("purchase_name", purchase.getName()); + } + } + } + + if (transport.getType() != null && (transport.getType() == OrderTypeEnum.TRANSFER.getTypeid() || transport.getType() == OrderTypeEnum.ALL.getTypeid())) { + OrderTransfer orderTransfer = OrderTransfer.dao.findById(transobj.get("order_sn")); + if (Objects.nonNull(orderTransfer)){ + transobj.set("product_name",orderTransfer.getProductName()); + transobj.set("ticket_code",orderTransfer.getOldSn()); + transobj.set("source_weight",orderTransfer.getSourceWeight()); + Sandfarm sandfarm = Sandfarm.dao.findById(orderTransfer.getSandfarmId()); + if (sandfarm != null) { + transobj.set("sandfarm_name", sandfarm.getName()); + } + } + + } + + // 开结算单 + transobj.set("invoice_numbers", Collections.emptyList()); + transobj.set("ticket_numbers", TicketReceiveService.me.nextTicketCodes(transport.getSupermarketId())); + + return Result.success(transobj); + } public Result transportInfo(String transport_id) { Transport transport = Transport.dao.findById(transport_id); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transportcompany/TransportCompanyController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transportcompany/TransportCompanyController.java similarity index 98% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transportcompany/TransportCompanyController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transportcompany/TransportCompanyController.java index f0bdc71..093c4ee 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transportcompany/TransportCompanyController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/transportcompany/TransportCompanyController.java @@ -34,7 +34,7 @@ public class TransportCompanyController extends Controller { public void find() { PageParam pp = getBean(PageParam.class, "", true); String name = get("name"); - Integer del = getInt("del"); + Integer del = getInt("del",0); renderJson(Result.object(TransportCompanyService.me.find(pp, name, del))); } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/TruckController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/truck/TruckController.java similarity index 94% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/TruckController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/truck/TruckController.java index 0b20127..59d64ed 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/TruckController.java +++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/truck/TruckController.java @@ -65,6 +65,8 @@ public class TruckController extends BaseController { * 返回所有 truck 运输车辆信息 */ public void list() { - renderJson(Result.object(TruckService.me.list())); + Integer trans_co_id = getInt("trans_co_id"); + + renderJson(Result.object(TruckService.me.list(trans_co_id))); } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java similarity index 100% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java rename to ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java diff --git a/ssjygl-xsx-local/src/main/resources/dev/config.properties b/ssjygl-xsct-local/src/main/resources/dev/config.properties similarity index 89% rename from ssjygl-xsx-local/src/main/resources/dev/config.properties rename to ssjygl-xsct-local/src/main/resources/dev/config.properties index fb1559b..ca612b9 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/config.properties +++ b/ssjygl-xsct-local/src/main/resources/dev/config.properties @@ -3,19 +3,19 @@ devMode=true endpoint=oss-cn-shenzhen.aliyuncs.com #正式、测试的附件，都存入正式的 oss 中 -bucketName=ssjygl-xsx-static +bucketName=ssjygl-xsct-statics #本地服务 和 云端服务 socket 通信 socketserver.enable=true #socketserver.host=120.77.59.235 socketserver.host=localhost -socketserver.port=21002 +socketserver.port=31002 #和 web 端的 socket.io 通信端口 socketio.port=12002 #当前部署本地程序的砂站id -current.supermarket_id=2 +current.supermarket_id=1 #落杆后，等待上磅的时间 default_scale_wait_time=8000 @@ -45,4 +45,4 @@ weight.distinguish=0.5 start.trans.distance=5 #二维码根url -base.url=http://localhost:10002 \ No newline at end of file +base.url=http://localhost:10002 diff --git a/ssjygl-xsct-local/src/main/resources/dev/db.properties b/ssjygl-xsct-local/src/main/resources/dev/db.properties new file mode 100644 index 0000000..a9c76a0 --- /dev/null +++ b/ssjygl-xsct-local/src/main/resources/dev/db.properties @@ -0,0 +1,22 @@ +## mysql +## GRANT ALL PRIVILEGES ON *.* TO 'root'@'192.168.1.119' IDENTIFIED BY 'Local_1' WITH GRANT OPTION; +#jdbcUrl=jdbc:mysql://127.0.0.1:3306/ssjy_xsct_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +#user=root +#password=19999999 + +jdbcUrl=jdbc:mysql://192.168.66.83:3306/ssjy_xsct?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +user=root +password=Ssjy_xsx_890 + +# redis +#redis.basekey=ssjcgl_xsct_dev +redis.basekey=ssjcgl_xsct +redis.port=6379 + +#redis.ip=127.0.0.1 +#redis.pwd= +#redis.db=13 + +redis.ip=r-wz9168ab2f2f7ec4pd.redis.rds.aliyuncs.com +redis.pwd=CoWR1111 +redis.db=13 diff --git a/ssjygl-xsx-local/src/main/resources/dev/undertow.txt b/ssjygl-xsct-local/src/main/resources/dev/undertow.txt similarity index 100% rename from ssjygl-xsx-local/src/main/resources/dev/undertow.txt rename to ssjygl-xsct-local/src/main/resources/dev/undertow.txt diff --git a/ssjygl-xsx-local/src/main/resources/job.properties b/ssjygl-xsct-local/src/main/resources/job.properties similarity index 84% rename from ssjygl-xsx-local/src/main/resources/job.properties rename to ssjygl-xsct-local/src/main/resources/job.properties index 8a03ab0..5a00c0b 100644 --- a/ssjygl-xsx-local/src/main/resources/job.properties +++ b/ssjygl-xsct-local/src/main/resources/job.properties @@ -15,4 +15,8 @@ cleartempfile.enable=true CustomerDiscount.job=com.cowr.local.ssjygl.jobs.CustomerDiscountJob CustomerDiscount.cron= 0 0 0/1 * * ? -CustomerDiscount.enable=true \ No newline at end of file +CustomerDiscount.enable=true + +Hbrsms.job=com.cowr.local.ssjygl.hbrsms.HbrsmsJob +Hbrsms.cron= 0 * * * * ? +Hbrsms.enable=true diff --git a/ssjygl-xsx-local/src/main/resources/log4j.properties b/ssjygl-xsct-local/src/main/resources/log4j.properties similarity index 94% rename from ssjygl-xsx-local/src/main/resources/log4j.properties rename to ssjygl-xsct-local/src/main/resources/log4j.properties index 4cb6ea1..b8ba9e8 100644 --- a/ssjygl-xsx-local/src/main/resources/log4j.properties +++ b/ssjygl-xsct-local/src/main/resources/log4j.properties @@ -26,7 +26,7 @@ log4j.appender.fileDebug=org.apache.log4j.RollingFileAppender log4j.appender.fileDebug.encoding=UTF-8 log4j.appender.fileDebug.Append=true log4j.appender.fileDebug.Threshold=DEBUG -log4j.appender.fileDebug.File=../logs/ssjygl.xsx.local.debug.log +log4j.appender.fileDebug.File=../logs/ssjygl.xsct.local.debug.log log4j.appender.fileDebug.MaxFileSize=10MB log4j.appender.fileDebug.MaxBackupIndex=1000 log4j.appender.fileDebug.layout=org.apache.log4j.PatternLayout @@ -37,7 +37,7 @@ log4j.appender.fileError=org.apache.log4j.RollingFileAppender log4j.appender.fileError.encoding=UTF-8 log4j.appender.fileError.Append=true log4j.appender.fileError.Threshold=ERROR -log4j.appender.fileError.File=../logs/ssjygl.xsx.local.error.log +log4j.appender.fileError.File=../logs/ssjygl.xsct.local.error.log log4j.appender.fileError.MaxFileSize=10MB log4j.appender.fileError.MaxBackupIndex=100 log4j.appender.fileError.layout=org.apache.log4j.PatternLayout @@ -62,7 +62,7 @@ log4j.appender.devicectrlFile=org.apache.log4j.RollingFileAppender log4j.appender.devicectrlFile.encoding=UTF-8 log4j.appender.devicectrlFile.Append=true log4j.appender.devicectrlFile.Threshold=DEBUG -log4j.appender.devicectrlFile.File=../logs/ssjygl.xsx.devicectrl.log +log4j.appender.devicectrlFile.File=../logs/ssjygl.xsct.devicectrl.log log4j.appender.devicectrlFile.MaxFileSize=10MB log4j.appender.devicectrlFile.MaxBackupIndex=1000 log4j.appender.devicectrlFile.layout=org.apache.log4j.PatternLayout @@ -82,7 +82,7 @@ log4j.appender.nettyclientFile=org.apache.log4j.RollingFileAppender log4j.appender.nettyclientFile.encoding=UTF-8 log4j.appender.nettyclientFile.Append=true log4j.appender.nettyclientFile.Threshold=DEBUG -log4j.appender.nettyclientFile.File=../logs/ssjygl.xsx.nettyclient.log +log4j.appender.nettyclientFile.File=../logs/ssjygl.xsct.nettyclient.log log4j.appender.nettyclientFile.MaxFileSize=10MB log4j.appender.nettyclientFile.MaxBackupIndex=1000 log4j.appender.nettyclientFile.layout=org.apache.log4j.PatternLayout diff --git a/ssjygl-xsx-local/src/main/resources/logging.properties b/ssjygl-xsct-local/src/main/resources/logging.properties similarity index 100% rename from ssjygl-xsx-local/src/main/resources/logging.properties rename to ssjygl-xsct-local/src/main/resources/logging.properties diff --git a/ssjygl-xsx-local/src/main/resources/prod/config.properties b/ssjygl-xsct-local/src/main/resources/prod/config.properties similarity index 87% rename from ssjygl-xsx-local/src/main/resources/prod/config.properties rename to ssjygl-xsct-local/src/main/resources/prod/config.properties index 1ee998f..714a6fc 100644 --- a/ssjygl-xsx-local/src/main/resources/prod/config.properties +++ b/ssjygl-xsct-local/src/main/resources/prod/config.properties @@ -3,19 +3,19 @@ devMode=true endpoint=oss-cn-shenzhen.aliyuncs.com #正式、测试的附件，都存入正式的 oss 中 -bucketName=ssjygl-xsx-static +bucketName=ssjygl-xsct-statics #本地服务 和 云端服务 socket 通信 socketserver.enable=true socketserver.host=47.112.109.118 #socketserver.host=127.0.0.1 -socketserver.port=21002 +socketserver.port=31002 #和 web 端的 socket.io 通信端口 socketio.port=12002 #当前部署本地程序的砂站id -current.supermarket_id=9 +current.supermarket_id=1 #落杆后，等待上磅的时间 default_scale_wait_time=8000 @@ -41,3 +41,7 @@ weight.distinguish=0.5 #起步运输距离 start.trans.distance=5 + +hbrsms.billerName=?? +hbrsms.billAddress=?????????? + diff --git a/ssjygl-xsct-local/src/main/resources/prod/db.properties b/ssjygl-xsct-local/src/main/resources/prod/db.properties new file mode 100644 index 0000000..7f058d4 --- /dev/null +++ b/ssjygl-xsct-local/src/main/resources/prod/db.properties @@ -0,0 +1,12 @@ +# mysql +jdbcUrl=jdbc:mysql://localhost:3306/ssjy_xsct?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +user=root +#password=Ssjy_xsct_890 +password=Ssjy_xsx_890 + +# redis +redis.basekey=ssjcgl_xsct +redis.ip=localhost +redis.port=6379 +redis.pwd= +redis.db= diff --git a/ssjygl-xsx-local/src/main/resources/prod/undertow.txt b/ssjygl-xsct-local/src/main/resources/prod/undertow.txt similarity index 100% rename from ssjygl-xsx-local/src/main/resources/prod/undertow.txt rename to ssjygl-xsct-local/src/main/resources/prod/undertow.txt diff --git a/ssjygl-xsx-local/src/main/resources/tpl.xlsx b/ssjygl-xsct-local/src/main/resources/tpl.xlsx similarity index 100% rename from ssjygl-xsx-local/src/main/resources/tpl.xlsx rename to ssjygl-xsct-local/src/main/resources/tpl.xlsx diff --git a/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx b/ssjygl-xsct-local/src/main/resources/tpl_bill_full.xlsx similarity index 100% rename from ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx rename to ssjygl-xsct-local/src/main/resources/tpl_bill_full.xlsx diff --git a/ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx b/ssjygl-xsct-local/src/main/resources/tpl_完整版.xlsx similarity index 100% rename from ssjygl-xsx-local/src/main/resources/tpl_完整版.xlsx rename to ssjygl-xsct-local/src/main/resources/tpl_完整版.xlsx diff --git a/ssjygl-xsx-local/src/main/resources/tpl_结算单.xlsx b/ssjygl-xsct-local/src/main/resources/tpl_结算单.xlsx similarity index 100% rename from ssjygl-xsx-local/src/main/resources/tpl_结算单.xlsx rename to ssjygl-xsct-local/src/main/resources/tpl_结算单.xlsx diff --git a/ssjygl-xsx-local/src/main/webapp/WEB-INF/web.xml b/ssjygl-xsct-local/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from ssjygl-xsx-local/src/main/webapp/WEB-INF/web.xml rename to ssjygl-xsct-local/src/main/webapp/WEB-INF/web.xml diff --git a/ssjygl-xsx-local/src/main/webapp/index.html b/ssjygl-xsct-local/src/main/webapp/index.html similarity index 97% rename from ssjygl-xsx-local/src/main/webapp/index.html rename to ssjygl-xsct-local/src/main/webapp/index.html index ca66a5f..a222aeb 100644 --- a/ssjygl-xsx-local/src/main/webapp/index.html +++ b/ssjygl-xsct-local/src/main/webapp/index.html @@ -37,7 +37,7 @@