From 22e89464969721893cd65e22ef4234b657a73f51 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Tue, 13 Oct 2020 14:16:22 +0800 Subject: [PATCH] . --- .../authlicense/AuthLicenseService.java | 2 +- .../ssjygl/blacklist/BlacklistService.java | 2 +- .../cowr/ssjygl/customer/CustomerService.java | 2 +- .../contact/CustomerContactService.java | 4 +- .../customer/pact/CustomerPactService.java | 2 +- .../receiver/CustomerReceiverService.java | 8 +- .../com/cowr/ssjygl/driver/DriverService.java | 2 +- .../ssjygl/invoice/log/InvoiceLogService.java | 28 ++++--- .../receive/InvoiceReceiveService.java | 4 +- .../ordercluster/OrderclusterService.java | 18 ++--- .../orderpurchase/OrderPurchaseService.java | 4 +- .../order/ordersale/OrderSaleService.java | 6 +- .../order/ordertemp/OrderTempService.java | 16 ++-- .../ordertransfer/OrderTransferService.java | 4 +- .../order/ordertrash/OrderTrashService.java | 4 +- .../com/cowr/ssjygl/prepay/PrepayService.java | 6 +- .../prepaydetail/PrepayDetailService.java | 2 +- .../prepaytruck/PrepayTruckService.java | 4 +- .../refunddetail/RefundDetailService.java | 2 +- .../cowr/ssjygl/product/ProductService.java | 2 +- .../cowr/ssjygl/purchase/PurchaseService.java | 2 +- .../cowr/ssjygl/sandfarm/SandfarmService.java | 2 +- .../com/cowr/ssjygl/smslog/SmsLogService.java | 2 +- .../purchase/OrderPurchaseStatService.java | 4 +- .../ssjygl/stat/sale/OrderStatService.java | 12 +-- .../transfer/OrderTransferStatService.java | 4 +- .../supermarket/SupermarketService.java | 2 +- .../SupermarketCustomerDistanceService.java | 2 +- .../SupermarketReceiverDistanceService.java | 2 +- .../ssjygl/transport/TransportService.java | 4 +- .../TransportCompanyService.java | 2 +- .../com/cowr/ssjygl/truck/TruckService.java | 8 +- .../local/ssjygl/devicectrl/device/PLC.java | 18 +++++ .../cowr/local/ssjygl/netty/NettyClient.java | 1 + .../system/sysuser/SysuserSyncService.java | 2 +- .../transport/TransportSyncService.java | 80 ++++++++++++------- .../register/CustomerRegisterService.java | 6 +- .../service/ssjygl/netty/NettyServer.java | 1 + .../system/sysuser/SysuserSyncService.java | 4 +- 39 files changed, 164 insertions(+), 116 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java index 03ef9c4..79063cf 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/authlicense/AuthLicenseService.java @@ -28,7 +28,7 @@ public class AuthLicenseService extends BaseService { if(StrKit.notBlank(truck_license)){ fromsql += " and truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if(StrKit.notBlank(stm)){ diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java index be70642..7bd5aac 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistService.java @@ -31,7 +31,7 @@ public class BlacklistService extends BaseService { if(StrKit.notBlank(truck_license)){ fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java index 343ac0b..138c58b 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java @@ -90,7 +90,7 @@ public class CustomerService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } if (type != null) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java index 76e662d..de41671 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactService.java @@ -33,12 +33,12 @@ public class CustomerContactService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } if (StrKit.notBlank(phone)) { fromsql += " and t.phone like ? \n"; - paraList.add("%" + phone + "%"); + paraList.add("%" + phone.trim() + "%"); } 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/customer/pact/CustomerPactService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactService.java index 3636c50..3375675 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactService.java @@ -34,7 +34,7 @@ public class CustomerPactService extends BaseService { if(StrKit.notBlank(customer_name)){ fromsql += " and c.name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java index 986d337..f012be0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverService.java @@ -44,12 +44,12 @@ public class CustomerReceiverService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } if (StrKit.notBlank(phone)) { fromsql += " and t.phone like ? \n"; - paraList.add("%" + phone + "%"); + paraList.add("%" + phone.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; @@ -94,12 +94,12 @@ public class CustomerReceiverService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } if (StrKit.notBlank(phone)) { fromsql += " and t.phone like ? \n"; - paraList.add("%" + phone + "%"); + paraList.add("%" + phone.trim() + "%"); } return Db.find(selectsql + fromsql, paraList.toArray()); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverService.java index 880be75..ae9b463 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverService.java @@ -32,7 +32,7 @@ public class DriverService extends BaseService { if(StrKit.notBlank(phone)){ fromsql += " and t.phone like ? \n"; - paraList.add("%" + phone + "%"); + paraList.add("%" + phone.trim() + "%"); } if(trans_co_id != null){ diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java index 2f9f736..5a72172 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java @@ -52,12 +52,12 @@ public class InvoiceLogService extends BaseService { if (StrKit.notBlank(order_sn)) { fromsql += " and t.order_sn like ? \n"; - paraList.add("%" + order_sn + "%"); + paraList.add("%" + order_sn.trim() + "%"); } if (StrKit.notBlank(invoice_number)) { fromsql += " and t.invoice_number like ? \n"; - paraList.add("%" + invoice_number + "%"); + paraList.add("%" + invoice_number.trim() + "%"); } if (StrKit.notBlank(stm)) { @@ -72,7 +72,7 @@ public class InvoiceLogService extends BaseService { if (StrKit.notBlank(code)) { fromsql += " and t.code like ? \n"; - paraList.add("%" + code + "%"); + paraList.add("%" + code.trim() + "%"); } if (invoice_type != null) { @@ -131,12 +131,12 @@ public class InvoiceLogService extends BaseService { if (StrKit.notBlank(order_sn)) { fromsql += " and t.order_sn like ? \n"; - paraList.add("%" + order_sn + "%"); + paraList.add("%" + order_sn.trim() + "%"); } if (StrKit.notBlank(invoice_number)) { fromsql += " and t.invoice_number like ? \n"; - paraList.add("%" + invoice_number + "%"); + paraList.add("%" + invoice_number.trim() + "%"); } if (StrKit.notBlank(stm)) { @@ -151,7 +151,7 @@ public class InvoiceLogService extends BaseService { if (StrKit.notBlank(code)) { fromsql += " and t.code like ? \n"; - paraList.add("%" + code + "%"); + paraList.add("%" + code.trim() + "%"); } if (invoice_type != null) { @@ -176,16 +176,18 @@ public class InvoiceLogService extends BaseService { 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.createCell(a++).setCellValue("开票人"); + 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.createCell(a++).setCellValue("数量(吨)"); row.createCell(a++).setCellValue("皮重(吨)"); row.createCell(a++).setCellValue("毛重(吨)"); + row.createCell(a++).setCellValue("备注"); // 表头 end int end_col = 16; @@ -202,11 +204,15 @@ public class InvoiceLogService extends BaseService { row.createCell(a++).setCellValue(order.getStr("customer_texpayer_name")); row.createCell(a++).setCellValue(order.getStr("customer_texpayer_num")); row.createCell(a++).setCellValue(order.getStr("order_sn")); - row.createCell(a++).setCellValue(DateTimeUtil.sdfhms.get().format(order.getDate("create_time"))); row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "total_price")); + row.createCell(a++).setCellValue(DateTimeUtil.sdfhms.get().format(order.getDate("create_time"))); row.createCell(a++).setCellValue(order.getStr("settlement_user_name")); + if(order.get("invalid_time") != null){ + row.createCell(a++).setCellValue(DateTimeUtil.sdfhms.get().format(order.getDate("invalid_time"))); + }else{ + row.createCell(a++).setCellValue(""); + } row.createCell(a++).setCellValue(order.getStr("invalid_user_name")); - row.createCell(a++).setCellValue(order.getStr("truck_license")); switch (order.getInt("state")) { case 5: row.createCell(a++).setCellValue("已使用"); break; @@ -217,9 +223,11 @@ public class InvoiceLogService extends BaseService { } row.createCell(a++).setCellValue(order.getStr("supermarket_name")); + row.createCell(a++).setCellValue(order.getStr("truck_license")); row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "weight")); row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "first_weight")); row.createCell(a++).setCellValue(DataUtil.getDefaultByRecord(order, "second_weight")); + row.createCell(a++).setCellValue(order.getStr("invalid_memo")); } // 通用单元格格式 diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java index ae388e5..995b055 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveService.java @@ -126,12 +126,12 @@ public class InvoiceReceiveService extends BaseService { if (StrKit.notBlank(reveiver_user_name)) { fromsql += " and t.receive_user_name like ? \n"; - paraList.add("%" + reveiver_user_name + "%"); + paraList.add("%" + reveiver_user_name.trim() + "%"); } if (StrKit.notBlank(invoice_number)) { fromsql += " and t.invoice_number like ? \n"; - paraList.add("%" + invoice_number + "%"); + paraList.add("%" + invoice_number.trim() + "%"); } if (StrKit.notBlank(stm)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java index 84c85c5..7a2d678 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java @@ -79,7 +79,7 @@ public class OrderclusterService extends BaseService { if (StrKit.notBlank(customer_name)) { fromsql += " and t.customer_name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } if (product_id != null) { @@ -155,7 +155,7 @@ public class OrderclusterService extends BaseService { if (StrKit.notBlank(customer_name)) { fromsql += " and t.customer_name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } if (customer_id != null) { @@ -236,7 +236,7 @@ public class OrderclusterService extends BaseService { if (StrKit.notBlank(customer_name)) { fromsql += " and t.customer_name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } if (customer_id != null) { @@ -501,24 +501,24 @@ public class OrderclusterService extends BaseService { salesql += " and t.sn like ? \n"; tempsql += " and t.sn like ? \n"; - salePara.add("%" + sn + "%"); - tempPara.add("%" + sn + "%"); + salePara.add("%" + sn.trim() + "%"); + tempPara.add("%" + sn.trim() + "%"); } if (StrKit.notBlank(truck_license)) { salesql += " and t.truck_license like ? \n"; tempsql += " and t.truck_license like ? \n"; - salePara.add("%" + truck_license + "%"); - tempPara.add("%" + truck_license + "%"); + salePara.add("%" + truck_license.trim() + "%"); + tempPara.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(invoice_code)) { salesql += " and t.invoice_code like ? \n"; tempsql += " and t.invoice_code like ? \n"; - salePara.add("%" + invoice_code + "%"); - tempPara.add("%" + invoice_code + "%"); + salePara.add("%" + invoice_code.trim() + "%"); + tempPara.add("%" + invoice_code.trim() + "%"); } if (StrKit.notBlank(stm)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java index 3dda057..d58e09c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/orderpurchase/OrderPurchaseService.java @@ -67,7 +67,7 @@ public class OrderPurchaseService extends BaseService { if (StrKit.notBlank(sn)) { fromsql += " and t.sn like ? \n"; - paraList.add("%" + sn + "%"); + paraList.add("%" + sn.trim() + "%"); } if (supermarket_id != null) { @@ -77,7 +77,7 @@ public class OrderPurchaseService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(stm)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java index 88a8fd8..100e3d5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordersale/OrderSaleService.java @@ -81,7 +81,7 @@ public class OrderSaleService extends BaseService { if (StrKit.notBlank(sn)) { fromsql += " and t.sn like ? \n"; - paraList.add("%" + sn + "%"); + paraList.add("%" + sn.trim() + "%"); } if (supermarket_id != null) { @@ -96,12 +96,12 @@ public class OrderSaleService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(customer_name)) { fromsql += " and t.customer_name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } if (customer_id != null) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 50234ca..63b6457 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -93,7 +93,7 @@ public class OrderTempService extends BaseService { if (StrKit.notBlank(sn)) { fromsql += " and t.sn like ? \n"; - paraList.add("%" + sn + "%"); + paraList.add("%" + sn.trim() + "%"); } if (supermarket_id != null) { @@ -103,12 +103,12 @@ public class OrderTempService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(customer_name)) { fromsql += " and t.customer_name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } if (customer_id != null) { @@ -141,7 +141,7 @@ public class OrderTempService extends BaseService { } else { if (StrKit.notBlank(invoice_code)) { fromsql += " and t.invoice_code like ? \n"; - paraList.add("%" + invoice_code + "%"); + paraList.add("%" + invoice_code.trim() + "%"); } } @@ -203,7 +203,7 @@ public class OrderTempService extends BaseService { if (StrKit.notBlank(sn)) { fromsql += " and t.sn like ? \n"; - paraList.add("%" + sn + "%"); + paraList.add("%" + sn.trim() + "%"); } if (supermarket_id != null) { @@ -213,12 +213,12 @@ public class OrderTempService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(customer_name)) { fromsql += " and t.customer_name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } if (customer_id != null) { @@ -251,7 +251,7 @@ public class OrderTempService extends BaseService { } else { if (StrKit.notBlank(invoice_code)) { fromsql += " and t.invoice_code like ? \n"; - paraList.add("%" + invoice_code + "%"); + paraList.add("%" + invoice_code.trim() + "%"); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java index 501aa59..014f2a0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertransfer/OrderTransferService.java @@ -72,7 +72,7 @@ public class OrderTransferService extends BaseService { if (StrKit.notBlank(sn)) { fromsql += " and t.sn like ? \n"; - paraList.add("%" + sn + "%"); + paraList.add("%" + sn.trim() + "%"); } if (supermarket_id != null) { @@ -82,7 +82,7 @@ public class OrderTransferService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(stm)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java index 49c9d84..1fa7830 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashService.java @@ -63,7 +63,7 @@ public class OrderTrashService extends BaseService { if (StrKit.notBlank(sn)) { fromsql += " and t.sn like ? \n"; - paraList.add("%" + sn + "%"); + paraList.add("%" + sn.trim() + "%"); } if (supermarket_id != null) { @@ -73,7 +73,7 @@ public class OrderTrashService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(stm)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java index 1c18d5a..a6f6d22 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java @@ -56,7 +56,7 @@ public class PrepayService { if (StrKit.notBlank(name)) { fromsql += " and c.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } if (customer_id != null) { @@ -208,10 +208,10 @@ public class PrepayService { if (StrKit.notBlank(truck_license)) { sale_sql += " and t.truck_license like ?"; - saleList.add("%" + truck_license + "%"); + saleList.add("%" + truck_license.trim() + "%"); temp_sql += " and t.truck_license like ?"; - tempList.add("%" + truck_license + "%"); + tempList.add("%" + truck_license.trim() + "%"); } String sql = "select a.sn \n" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java index adf5e03..9a5bd7e 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailService.java @@ -51,7 +51,7 @@ public class PrepayDetailService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and c.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } if (customer_id != null) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java index a5f574f..895652a 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckService.java @@ -63,7 +63,7 @@ public class PrepayTruckService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(valid_date)) { @@ -118,7 +118,7 @@ public class PrepayTruckService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(valid_date)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java index 2915d42..e400019 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailService.java @@ -33,7 +33,7 @@ public class RefundDetailService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and c.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } if (StrKit.notBlank(stm)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductService.java index ae35667..9851af6 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductService.java @@ -36,7 +36,7 @@ public class ProductService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java index 52f3b1b..28c118e 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseService.java @@ -33,7 +33,7 @@ public class PurchaseService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and t.name like ?"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java index a0baabb..bf8e4bd 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmService.java @@ -33,7 +33,7 @@ public class SandfarmService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogService.java index ab153a5..b201ba8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogService.java @@ -38,7 +38,7 @@ public class SmsLogService extends BaseService { if (StrKit.notBlank(phone)) { fromsql += " and t.phone like ? \n"; - paraList.add("%" + phone + "%"); + paraList.add("%" + phone.trim() + "%"); } if (sendstatus != null) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java index c610334..ce97bf0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/purchase/OrderPurchaseStatService.java @@ -50,7 +50,7 @@ public class OrderPurchaseStatService { if (StrKit.notBlank(sn)) { sql += " and t.sn like ? \n"; - paraList.add("%" + sn + "%"); + paraList.add("%" + sn.trim() + "%"); } if (supermarket_id != null) { @@ -75,7 +75,7 @@ public class OrderPurchaseStatService { if (StrKit.notBlank(truck_license)) { sql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(tm)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 44a499d..d7148a1 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -140,22 +140,22 @@ public class OrderStatService { if (StrKit.notBlank(customer_name)) { sale_sql += " and t.customer_name like ? \n"; temp_sql += " and t.customer_name like ? \n"; - paraSaleList.add("%" + customer_name + "%"); - paraTempList.add("%" + customer_name + "%"); + paraSaleList.add("%" + customer_name.trim() + "%"); + paraTempList.add("%" + customer_name.trim() + "%"); } if (StrKit.notBlank(truck_license)) { sale_sql += " and t.truck_license like ? \n"; temp_sql += " and t.truck_license like ? \n"; - paraSaleList.add("%" + truck_license + "%"); - paraTempList.add("%" + truck_license + "%"); + paraSaleList.add("%" + truck_license.trim() + "%"); + paraTempList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(sn)) { sale_sql += " and t.sn like ? \n"; temp_sql += " and t.sn like ? \n"; - paraSaleList.add("%" + sn + "%"); - paraTempList.add("%" + sn + "%"); + paraSaleList.add("%" + sn.trim() + "%"); + paraTempList.add("%" + sn.trim() + "%"); } String sql = "select \n" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java index 4c2babf..975552e 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/transfer/OrderTransferStatService.java @@ -48,7 +48,7 @@ public class OrderTransferStatService { if (StrKit.notBlank(sn)) { sql += " and t.sn like ? \n"; - paraList.add("%" + sn + "%"); + paraList.add("%" + sn.trim() + "%"); } if (supermarket_id != null) { @@ -73,7 +73,7 @@ public class OrderTransferStatService { if (StrKit.notBlank(truck_license)) { sql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(tm)) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java index 19aa1c4..097c638 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/SupermarketService.java @@ -62,7 +62,7 @@ public class SupermarketService extends BaseService { if (StrKit.notBlank(name)) { fromsql += " and t.name like ?"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java index a0880f7..b9d02d9 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceService.java @@ -73,7 +73,7 @@ public class SupermarketCustomerDistanceService extends BaseService { if (StrKit.notBlank(customer_name)) { fromsql += " and t.name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java index 4665a38..2cf19f3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceService.java @@ -159,7 +159,7 @@ public class SupermarketReceiverDistanceService extends BaseService { if (StrKit.notBlank(customer_name)) { fromsql += " and a.customer_name like ? \n"; - paraList.add("%" + customer_name + "%"); + paraList.add("%" + customer_name.trim() + "%"); } if (customer_receiver_id != null) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java index 69d1c7a..93d7651 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java @@ -73,7 +73,7 @@ public class TransportService extends BaseService { if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; - paraList.add("%" + truck_license + "%"); + paraList.add("%" + truck_license.trim() + "%"); } if (StrKit.notBlank(stm)) { @@ -93,7 +93,7 @@ public class TransportService extends BaseService { if (StrKit.notBlank(order_sn)) { fromsql += " and t.order_sn like ? \n"; - paraList.add("%" + order_sn + "%"); + paraList.add("%" + order_sn.trim() + "%"); } if (state != null) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java index 820fe07..2908f3a 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transportcompany/TransportCompanyService.java @@ -53,7 +53,7 @@ public class TransportCompanyService extends BaseService { if(StrKit.notBlank(name)){ fromsql += " and t.name like ? \n"; - paraList.add("%" + name + "%"); + paraList.add("%" + name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java index 98d7a5b..6800989 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckService.java @@ -35,7 +35,7 @@ public class TruckService extends BaseService { if (StrKit.notBlank(license)) { fromsql += " and t.license like ? \n"; - paraList.add("%" + license + "%"); + paraList.add("%" + license.trim() + "%"); } if (trans_co_id != null) { @@ -50,17 +50,17 @@ public class TruckService extends BaseService { if (StrKit.notBlank(gps)) { fromsql += " and t.gps like ? \n"; - paraList.add("%" + gps + "%"); + paraList.add("%" + gps.trim() + "%"); } if (StrKit.notBlank(sim)) { fromsql += " and t.sim like ? \n"; - paraList.add("%" + sim + "%"); + paraList.add("%" + sim.trim() + "%"); } if (StrKit.notBlank(number)) { fromsql += " and t.number like ? \n"; - paraList.add("%" + number + "%"); + paraList.add("%" + number.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java index 47e11e3..75d4273 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/device/PLC.java @@ -144,6 +144,12 @@ public class PLC extends Device { void plcWrite(String address, byte data, byte[] framePreset) throws IOException { lock.lock(); try { + boolean f = this.socket != null && this.socket.isConnected() && !this.socket.isClosed(); + if (!f) { + log.debug("PLC 未连接或者连接已断开, %s %s", this.getId(), this.getIp()); + return; + } + if (addressTable.containsKey(address)) { byte addr = addressTable.get(address); byte[] frame = new byte[framePreset.length]; @@ -167,6 +173,12 @@ public class PLC extends Device { int plcRead() throws IOException { lock.lock(); try { + boolean f = this.socket != null && this.socket.isConnected() && !this.socket.isClosed(); + if (!f) { + log.debug("PLC 未连接或者连接已断开, %s %s", this.getId(), this.getIp()); + return -1; + } + InputStream in = socket.getInputStream(); if (in.available() >= 6) { byte[] buf = new byte[6]; @@ -189,6 +201,12 @@ public class PLC extends Device { int plcClear() throws IOException { lock.lock(); try { + boolean f = this.socket != null && this.socket.isConnected() && !this.socket.isClosed(); + if (!f) { + log.debug("PLC 未连接或者连接已断开, %s %s", this.getId(), this.getIp()); + return -1; + } + InputStream inputStream = socket.getInputStream(); int available = inputStream.available(); byte[] buf = new byte[available]; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java index 54e5232..272aa30 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/netty/NettyClient.java @@ -259,6 +259,7 @@ public class NettyClient { return obj.containsKey("target"); } catch (Exception e) { + log.error(e.getMessage(), e); return false; } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java index 604ed3d..92cd0e9 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java @@ -311,7 +311,7 @@ public class SysuserSyncService extends BaseService { if (StrKit.notBlank(phone)) { sqlbuf.append(" and a.phone like ? \n"); - paraList.add("%" + phone + "%"); + paraList.add("%" + phone.trim() + "%"); } if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java index 6821e62..b596b53 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java @@ -192,15 +192,15 @@ public class TransportSyncService { } } - public String getOssKey(String uuid, File file){ + public String getOssKey(String uuid, File file) { if (file == null) { return null; } - String fileName = file.getName(); - String prefix = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(); - String savefilename = uuid + "." + prefix; - String key = Const.LicenseImgTmpFolder + "/" + savefilename; // 存储路径, 这个斜杠是http用的，肯定是正斜杠 + String fileName = file.getName(); + String prefix = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(); + String savefilename = uuid + "." + prefix; + String key = Const.LicenseImgTmpFolder + "/" + savefilename; // 存储路径, 这个斜杠是http用的，肯定是正斜杠 return key; } @@ -246,7 +246,7 @@ public class TransportSyncService { TransportDeviceService.me.addLicenseHistory(lichisobj, which, lichisobj.get("trans_co_id") != null ? TruckRodState.state_2 : TruckRodState.state_1); - if (ot == null ) { + if (ot == null) { log.error("【%s】未授权，可能是在黑名单中", result.getLicense()); Config.socketio.pubMessage(new Record().set("truck_license", result.getLicense()).set("msg", result.getLicense() + " 未授权。可能是在黑名单中")); return result; @@ -260,10 +260,6 @@ public class TransportSyncService { return result; } - String fileuuid = StrKit.getRandomUUID(); - String filekey = getOssKey(fileuuid, file); - File uploadfile = saveImg(fileuuid, file); // 压缩、重命名文件 - Transport transport = new Transport(); transport.setId(StrKit.getRandomUUID()); transport.setSupermarketId(supermarket_id); @@ -271,23 +267,32 @@ public class TransportSyncService { transport.setInTime(new Date()); transport.setInWhich(which); transport.setState(OrderStateEnum.ENTERED.getStateid()); // 2，入场 - transport.setFirstPic(filekey); + + File uploadfile = null; + if (file != null) { + String fileuuid = StrKit.getRandomUUID(); + String filekey = getOssKey(fileuuid, file); + uploadfile = saveImg(fileuuid, file); // 压缩、重命名文件 + transport.setFirstPic(filekey); + } // 浠水只有外销 transport.setType(OrderTypeEnum.TEMP.getTypeid()); + File finalUploadfile = uploadfile; boolean ret = Db.tx(new IAtom() { @Override public boolean run() { try { boolean ret = transport.save() && SyncTaskService.me.save(new SyncTask().addSaveData(transport)); - if(ret){ - OssfileLogService.me.save(transport.getId(), transport.getFirstPic(), uploadfile.getAbsolutePath()); + if (ret && finalUploadfile != null) { + OssfileLogService.me.save(transport.getId(), transport.getFirstPic(), finalUploadfile.getAbsolutePath()); } return ret; } catch (Exception e) { + log.error(e.getMessage(), e); return false; } } @@ -325,27 +330,31 @@ public class TransportSyncService { Config.socketio.pubMessage(new Record().set("truck_license", result.getLicense()).set("msg", result.getLicense() + " 未找到入场记录！")); return result; } - - String fileuuid = StrKit.getRandomUUID(); - String filekey = getOssKey(fileuuid, file); - File uploadfile = saveImg(fileuuid, file); // 压缩、重命名文件 + File uploadfile = null; + if (file != null) { + String fileuuid = StrKit.getRandomUUID(); + String filekey = getOssKey(fileuuid, file); + uploadfile = saveImg(fileuuid, file); // 压缩、重命名文件 + transport.setSecondPic(filekey); + } transport.setOutTime(new Date()); transport.setOutWhich(which); - transport.setSecondPic(filekey); + File finalUploadfile = uploadfile; boolean ret = Db.tx(new IAtom() { @Override public boolean run() { try { boolean ret = transport.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(transport)); - if(ret){ - OssfileLogService.me.save(transport.getId(), transport.getSecondPic(), uploadfile.getAbsolutePath()); + if (ret && finalUploadfile != null) { + OssfileLogService.me.save(transport.getId(), transport.getSecondPic(), finalUploadfile.getAbsolutePath()); } return ret; } catch (Exception e) { + log.error(e.getMessage(), e); return false; } } @@ -373,7 +382,7 @@ public class TransportSyncService { // 从预付费车辆中找 OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, result.getLicense()); - if (ot == null ) { + if (ot == null) { log.error("车牌【%s】未授权，可能是在黑名单中", result.getLicense()); //TODO: 发消息到web端？ return result; @@ -383,9 +392,16 @@ public class TransportSyncService { Date now = new Date(); boolean ret = false; - String fileuuid = StrKit.getRandomUUID(); - String filekey = getOssKey(fileuuid, file); - File uploadfile = saveImg(fileuuid, file); // 压缩、重命名文件 + File uploadfile = null; + String filekey = null; + + if (file != null) { + String fileuuid = StrKit.getRandomUUID(); + filekey = getOssKey(fileuuid, file); + uploadfile = saveImg(fileuuid, file); // 压缩、重命名文件 + } + + File finalUploadfile = uploadfile; // 没有找到入场记录，就走入场流程 if (transport == null) { @@ -408,12 +424,13 @@ public class TransportSyncService { try { boolean ret = finalTransport.save() && SyncTaskService.me.save(new SyncTask().addSaveData(finalTransport)); - if(ret){ - OssfileLogService.me.save(finalTransport.getId(), finalTransport.getFirstPic(), uploadfile.getAbsolutePath()); + if (ret && finalUploadfile != null) { + OssfileLogService.me.save(finalTransport.getId(), finalTransport.getFirstPic(), finalUploadfile.getAbsolutePath()); } return ret; } catch (Exception e) { + log.error(e.getMessage(), e); return false; } } @@ -436,12 +453,13 @@ public class TransportSyncService { try { boolean ret = finalTransport1.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(finalTransport1)); - if(ret){ - OssfileLogService.me.save(finalTransport1.getId(), finalTransport1.getSecondPic(), uploadfile.getAbsolutePath()); + if (ret && finalUploadfile != null) { + OssfileLogService.me.save(finalTransport1.getId(), finalTransport1.getSecondPic(), finalUploadfile.getAbsolutePath()); } return ret; } catch (Exception e) { + log.error(e.getMessage(), e); return false; } } @@ -502,6 +520,7 @@ public class TransportSyncService { return ret; } catch (Exception e) { + log.error(e.getMessage(), e); return false; } } @@ -545,6 +564,7 @@ public class TransportSyncService { return ret; } catch (Exception e) { + log.error(e.getMessage(), e); return false; } } @@ -624,7 +644,7 @@ public class TransportSyncService { OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license); - if (ot == null ) { + if (ot == null) { return Result.failedstr("车牌【%s】未授权", truck_license); } @@ -687,7 +707,7 @@ public class TransportSyncService { // 是预付，则肯定是销售或者外销，如果有物流公司id，则肯定是销售，否是外销 OrderclusterTruck ot = OrderclusterTruckService.me.checkValidLicense(supermarket_id, truck_license); - if (ot == null ) { + if (ot == null) { return Result.failedstr("车牌【%s】未授权", truck_license); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java index f6ca05e..65cc25f 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java @@ -233,12 +233,12 @@ public class CustomerRegisterService extends BaseService { if (StrKit.notBlank(sysuser_phone)) { fromsql += " and t.sysuser_phone like ? \n"; - paraList.add("%" + sysuser_phone + "%"); + paraList.add("%" + sysuser_phone.trim() + "%"); } if (StrKit.notBlank(customer_texpayer_name)) { fromsql += " and t.customer_texpayer_name like ? \n"; - paraList.add("%" + customer_texpayer_name + "%"); + paraList.add("%" + customer_texpayer_name.trim() + "%"); } if (StrKit.notBlank(receiver_name)) { @@ -248,7 +248,7 @@ public class CustomerRegisterService extends BaseService { if (StrKit.notBlank(receiver_phone)) { fromsql += " and t.receiver_phone like ? \n"; - paraList.add("%" + receiver_phone + "%"); + paraList.add("%" + receiver_phone.trim() + "%"); } if (StrKit.notBlank(receiver_address)) { diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/netty/NettyServer.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/netty/NettyServer.java index e1e2509..7deea3c 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/netty/NettyServer.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/netty/NettyServer.java @@ -265,6 +265,7 @@ public class NettyServer { return obj.containsKey("target"); } catch (Exception e) { + log.error(e.getMessage(), e); return false; } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java index ecc8575..9dce983 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java @@ -835,7 +835,7 @@ public class SysuserSyncService extends BaseSyncService { if (StrKit.notBlank(phone)) { sqlbuf.append(" and a.phone like ? \n"); - paraList.add("%" + phone + "%"); + paraList.add("%" + phone.trim() + "%"); } if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) { @@ -883,7 +883,7 @@ public class SysuserSyncService extends BaseSyncService { if (StrKit.notBlank(phone)) { sqlbuf.append(" and a.phone like ? \n"); - paraList.add("%" + phone + "%"); + paraList.add("%" + phone.trim() + "%"); } if (del != null && (del == Const.LOGIC_DEL_VALID || del == Const.LOGIC_DEL_INVALID)) {