From a54d1ad330047a6a5fdb89d5059fc60da59e4482 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Sun, 18 Oct 2020 00:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/Interceptor/CorsInterceptor.java | 1 + .../Interceptor/ReporterInterceptor.java | 2 +- .../com/cowr/common/base/BaseController.java | 13 +- .../com/cowr/common/base/BaseService.java | 16 +- .../java/com/cowr/common/enums/Enums.java | 25 +- .../com/cowr/common/enums/OrderStateEnum.java | 29 +- .../com/cowr/common/enums/OrderTypeEnum.java | 23 +- .../java/com/cowr/common/enums/RoleEnum.java | 42 +- .../com/cowr/common/enums/TruckRodState.java | 1 - .../com/cowr/common/enums/UserTypeEnum.java | 37 +- .../com/cowr/common/netty/JSONEncoder.java | 2 +- .../cowr/common/plugin/NettyServerPlugin.java | 16 +- .../com/cowr/common/plugin/QuartzPlugin.java | 14 +- .../common/plugin/SocketIOServerPlugin.java | 24 +- .../common/serializer/CowrSerializer.java | 16 +- .../java/com/cowr/common/utils/AESUtil.java | 12 +- .../cowr/common/utils/ChineseNumberUtil.java | 2 +- .../java/com/cowr/common/utils/DataUtil.java | 50 +- .../com/cowr/common/utils/DateTimeUtil.java | 42 +- .../java/com/cowr/common/utils/ImageUtil.java | 8 +- .../java/com/cowr/common/utils/JsonUtil.java | 17 +- .../java/com/cowr/common/utils/MathUtil.java | 10 +- .../java/com/cowr/common/utils/ReqUtil.java | 1 + .../java/com/cowr/common/utils/StrUtil.java | 21 +- .../common/validator/CrudParamValidator.java | 8 +- .../cowr/common/validator/DayValidator.java | 2 +- .../cowr/common/validator/MonthValidator.java | 2 +- .../cowr/common/validator/ParamValidator.java | 44 +- .../validator/StartAndEndTimeValidator.java | 8 +- .../cowr/common/validator/YearValidator.java | 2 +- .../com/cowr/common/view/ActionReporter.java | 388 ++++++------- .../com/cowr/common/view/ExcelRender.java | 80 +-- .../cowr/common/view/JsonRenderFactory.java | 5 +- .../java/com/cowr/common/view/PageParam.java | 8 +- .../cowr/common/view/ReportExcelStyle.java | 7 +- .../java/com/cowr/common/view/Result.java | 17 +- .../main/java/com/cowr/model/AuthResult.java | 2 +- .../main/java/com/cowr/model/OrderTrash.java | 2 +- .../com/cowr/model/PostLicenseResult.java | 16 +- .../cowr/model/PrepayDetailStateHistory.java | 2 +- .../model/SupermarketSandfarmDistance.java | 2 +- .../main/java/com/cowr/model/SyncTask.java | 30 +- .../com/cowr/model/TransPriceConfigSale.java | 2 +- .../cowr/model/TransPriceConfigTransfer.java | 2 +- .../com/cowr/model/TransPriceConfigTrash.java | 2 +- .../com/cowr/model/base/BaseActionCmdLog.java | 47 +- .../com/cowr/model/base/BaseAuthLicense.java | 24 +- .../com/cowr/model/base/BaseBlacklist.java | 151 ++--- .../java/com/cowr/model/base/BaseCctv.java | 85 +-- .../com/cowr/model/base/BaseCctvChannels.java | 47 +- .../com/cowr/model/base/BaseCustomer.java | 122 ++-- .../cowr/model/base/BaseCustomerContact.java | 44 +- .../com/cowr/model/base/BaseCustomerPact.java | 86 +-- .../cowr/model/base/BaseCustomerReceiver.java | 91 +-- .../cowr/model/base/BaseCustomerRegister.java | 184 +++--- .../com/cowr/model/base/BaseDeviceConfig.java | 98 ++-- .../java/com/cowr/model/base/BaseDriver.java | 64 ++- .../com/cowr/model/base/BaseInvoiceLog.java | 149 ++--- .../cowr/model/base/BaseInvoiceReceive.java | 117 ++-- .../com/cowr/model/base/BaseModifyLog.java | 92 +-- .../cowr/model/base/BaseOrderPurchase.java | 319 ++++++----- .../com/cowr/model/base/BaseOrderSale.java | 536 ++++++++++-------- .../com/cowr/model/base/BaseOrderSeq.java | 40 +- .../com/cowr/model/base/BaseOrderTemp.java | 507 +++++++++-------- .../cowr/model/base/BaseOrderTransfer.java | 310 +++++----- .../com/cowr/model/base/BaseOrderTrash.java | 294 +++++----- .../com/cowr/model/base/BaseOrdercluster.java | 411 ++++++++------ .../model/base/BaseOrderclusterTruck.java | 46 +- .../com/cowr/model/base/BaseOssfileLog.java | 69 ++- .../cowr/model/base/BasePrepayCustomer.java | 74 +-- .../com/cowr/model/base/BasePrepayDetail.java | 132 +++-- .../base/BasePrepayDetailStateHistory.java | 69 ++- .../com/cowr/model/base/BasePrepayTruck.java | 90 +-- .../java/com/cowr/model/base/BaseProduct.java | 33 +- .../com/cowr/model/base/BasePurchase.java | 106 ++-- .../com/cowr/model/base/BaseRefundDetail.java | 129 +++-- .../base/BaseRefundDetailStateHistory.java | 67 ++- .../com/cowr/model/base/BaseSandfarm.java | 106 ++-- .../java/com/cowr/model/base/BaseSmsLog.java | 183 +++--- .../java/com/cowr/model/base/BaseStock.java | 38 +- .../cowr/model/base/BaseStockModifyLog.java | 78 +-- .../com/cowr/model/base/BaseSupermarket.java | 108 ++-- .../base/BaseSupermarketCustomerDistance.java | 31 +- .../model/base/BaseSupermarketProduct.java | 31 +- .../base/BaseSupermarketReceiverDistance.java | 31 +- .../base/BaseSupermarketSandfarmDistance.java | 33 +- .../com/cowr/model/base/BaseSyncTask.java | 147 ++--- .../java/com/cowr/model/base/BaseSysuser.java | 156 ++--- .../model/base/BaseTransPriceConfigSale.java | 55 +- .../base/BaseTransPriceConfigTransfer.java | 55 +- .../model/base/BaseTransPriceConfigTrash.java | 55 +- .../com/cowr/model/base/BaseTransport.java | 323 ++++++----- .../cowr/model/base/BaseTransportCompany.java | 133 +++-- .../java/com/cowr/model/base/BaseTruck.java | 133 +++-- .../java/com/cowr/sms/AliyunSmsService.java | 2 +- .../main/java/com/cowr/ssjygl/CacheData.java | 2 +- .../authlicense/AuthLicenseService.java | 21 +- .../ssjygl/blacklist/BlacklistService.java | 10 +- .../ssjygl/blacklist/BlacklistValidator.java | 4 +- .../com/cowr/ssjygl/cctv/CctvController.java | 2 +- .../com/cowr/ssjygl/cctv/CctvService.java | 11 +- .../ssjygl/customer/CustomerValidator.java | 4 +- .../contact/CustomerContactService.java | 6 +- .../contact/CustomerContactValidator.java | 2 +- .../customer/pact/CustomerPactService.java | 7 +- .../customer/pact/CustomerPactValidator.java | 28 +- .../receiver/CustomerReceiverService.java | 11 +- .../receiver/CustomerReceiverValidator.java | 2 +- .../com/cowr/ssjygl/driver/DriverService.java | 15 +- .../cowr/ssjygl/driver/DriverValidator.java | 2 +- .../ssjygl/invoice/log/InvoiceLogService.java | 22 +- .../invoice/log/InvoiceLogValidator.java | 56 +- .../receive/InvoiceReceiveService.java | 13 +- .../receive/InvoiceReceiveValidator.java | 4 +- .../ssjygl/modifylog/ModifyLogController.java | 6 +- .../com/cowr/ssjygl/order/OrderService.java | 1 + .../ordercluster/OrderclusterValidator.java | 2 +- .../truck/OrderclusterTruckService.java | 1 + .../orderpurchase/OrderPurchaseService.java | 3 +- .../order/ordersale/OrderSaleService.java | 1 + .../order/ordertemp/OrderTempService.java | 14 +- .../ordertrash/OrderTrashPKValidator.java | 2 +- .../order/ordertrash/OrderTrashService.java | 10 +- .../cowr/ssjygl/overall/OverallService.java | 10 +- .../com/cowr/ssjygl/prepay/PrepayService.java | 2 +- .../prepaycustomer/PrepayCustomerService.java | 4 +- .../prepaydetail/PrepayDetailService.java | 6 +- .../prepaydetail/PrepayDetailValidator.java | 2 +- .../PrepayDetailVerifyValidator.java | 3 +- .../prepay/prepaytruck/DayValidator.java | 4 +- .../prepaytruck/PrepayTruckValidator.java | 2 +- .../RefundDetailConfirmValidator.java | 3 +- .../refunddetail/RefundDetailService.java | 6 +- .../refunddetail/RefundDetailValidator.java | 2 +- .../RefundDetailVerifyValidator.java | 3 +- .../cowr/ssjygl/product/ProductValidator.java | 2 +- .../ssjygl/purchase/PurchaseValidator.java | 2 +- .../ssjygl/sandfarm/SandfarmValidator.java | 2 +- .../purchase/OrderPurchaseStatService.java | 2 +- .../ssjygl/stat/sale/OrderStatService.java | 8 +- .../transfer/OrderTransferStatService.java | 3 +- .../supermarket/SupermarketService.java | 27 +- .../SupermarketCustomerDistanceService.java | 4 +- ...upermarketSandfarmDistancePKValidator.java | 2 +- .../supermarket/stock/StockService.java | 17 +- .../supermarket/stock/StockValidator.java | 8 +- .../ssjygl/transport/PostWeightValidator.java | 2 +- .../transport/TransportIdValidator.java | 2 +- .../ssjygl/transport/TransportService.java | 2 +- .../TransportCompanyService.java | 21 +- .../transprice/TransPriceController.java | 26 +- .../ssjygl/transprice/TransPriceModel.java | 42 +- .../ssjygl/transprice/TransPriceService.java | 62 +- .../com/cowr/ssjygl/truck/TruckService.java | 1 + .../com/cowr/ssjygl/truck/TruckValidator.java | 10 +- .../java/generator/BaseModelGenerator.java | 255 +++++---- .../src/main/java/generator/ColumnMeta.java | 56 +- .../main/java/generator/CrudGenerator.java | 15 +- .../generator/DataDictionaryGenerator.java | 281 ++++----- .../src/main/java/generator/Generator.java | 498 ++++++++-------- .../java/generator/MappingKitGenerator.java | 201 +++---- .../src/main/java/generator/MetaBuilder.java | 30 +- .../main/java/generator/ModelGenerator.java | 247 ++++---- .../src/main/java/generator/TableMeta.java | 46 +- .../authlicense/AuthLicenseSyncService.java | 10 +- .../ssjygl/blacklist/BlacklistController.java | 18 +- .../blacklist/BlacklistSyncService.java | 3 +- .../service/ssjygl/cache/CacheController.java | 2 +- .../ssjygl/customer/CustomerSyncService.java | 2 +- .../contact/CustomerContactController.java | 28 +- .../contact/CustomerContactSyncService.java | 4 +- .../receiver/CustomerReceiverController.java | 8 +- .../receiver/CustomerReceiverSyncService.java | 4 +- .../register/CustomerRegisterController.java | 6 +- .../CustomerRegisterVerifyValidator.java | 3 +- .../ssjygl/driver/DriverController.java | 20 +- .../ssjygl/driver/DriverSyncService.java | 8 +- .../invoice/log/BatchSaveValidator.java | 2 +- .../jobs/CheckUndonOrderclusterJob.java | 4 +- .../com/cowr/service/ssjygl/jobs/SyncJob.java | 5 +- .../com/cowr/service/ssjygl/main/Config.java | 4 +- .../truck/OrderclusterTruckSyncService.java | 18 +- .../order/ordersale/OrderSaleController.java | 2 +- .../order/ordertemp/OrderTempController.java | 26 +- .../OrderTransferController.java | 2 +- .../ordertrash/OrderTrashController.java | 2 +- .../ssjygl/overall/OverallController.java | 2 +- .../prepaydetail/PrepayDetailController.java | 34 +- .../PrepayDetailVerifyValidator.java | 3 +- .../prepay/prepaytruck/DayValidator.java | 4 +- .../prepaytruck/PrepayTruckController.java | 6 +- .../RefundDetailConfirmValidator.java | 3 +- .../refunddetail/RefundDetailController.java | 41 +- .../RefundDetailVerifyValidator.java | 3 +- .../ssjygl/product/ProductController.java | 24 +- .../ssjygl/purchase/PurchaseController.java | 26 +- .../ssjygl/sandfarm/SandfarmController.java | 26 +- .../ssjygl/sandfarm/SandfarmSyncService.java | 2 +- .../service/ssjygl/smslog/SmsService.java | 4 +- .../ssjygl/stat/sale/OrderStatController.java | 6 +- .../supermarket/SupermarketController.java | 26 +- .../supermarket/SupermarketSyncService.java | 12 +- ...SupermarketCustomerDistanceController.java | 27 +- ...upermarketCustomerDistanceSyncService.java | 18 +- ...SupermarketReceiverDistanceController.java | 56 +- ...upermarketReceiverDistanceSyncService.java | 39 +- ...SupermarketSandfarmDistanceController.java | 27 +- ...upermarketSandfarmDistanceSyncService.java | 4 +- .../supermarket/stock/StockController.java | 10 +- .../system/sysuser/RegisterUserValidator.java | 6 +- .../system/sysuser/SysuserSyncService.java | 2 +- .../TransportCompanyController.java | 24 +- .../ssjygl/truck/TruckSyncService.java | 21 +- 213 files changed, 5426 insertions(+), 4780 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java index 0ef8d6c..78fcc0a 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/CorsInterceptor.java @@ -2,6 +2,7 @@ package com.cowr.common.Interceptor; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; + import javax.servlet.http.HttpServletResponse; public class CorsInterceptor implements Interceptor { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java index a16746f..f52eceb 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/Interceptor/ReporterInterceptor.java @@ -22,7 +22,7 @@ public class ReporterInterceptor implements Interceptor { @Override public void intercept(Invocation inv) { - Controller c = inv.getController(); + Controller c = inv.getController(); HttpServletRequest request = c.getRequest(); String target = request.getRequestURI(); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseController.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseController.java index a29446c..5ce76f0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseController.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseController.java @@ -45,9 +45,8 @@ public abstract class BaseController extends Controller { if (value.startsWith("N") || value.startsWith("n")) return -Double.parseDouble(value.substring(1)); return Double.parseDouble(value); - } - catch (Exception e) { - throw new ActionException(400, renderManager.getRenderFactory().getErrorRender(400), "Can not parse the parameter \"" + value + "\" to Double value."); + } catch (Exception e) { + throw new ActionException(400, renderManager.getRenderFactory().getErrorRender(400), "Can not parse the parameter \"" + value + "\" to Double value."); } } @@ -61,12 +60,12 @@ public abstract class BaseController extends Controller { return toDouble(getPara(name), defaultValue); } - public void renderJsonp(Result json){ - String callback = get("callback"); + public void renderJsonp(Result json) { + String callback = get("callback"); - if(StrKit.notBlank(callback)) { + if (StrKit.notBlank(callback)) { renderJavascript(callback + "(" + json.toJSONString() + ");"); - }else{ + } else { renderJson(json); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java index 8a6daf4..40015e2 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/base/BaseService.java @@ -167,7 +167,7 @@ public class BaseService { boolean ret = Db.tx(new IAtom() { @Override public boolean run() { - try{ + try { boolean ret = model.delete(); if (ret) { @@ -175,7 +175,7 @@ public class BaseService { } return ret; - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage(), e); return false; } @@ -298,8 +298,8 @@ public class BaseService { // 将新对象中，不为 null 的字段设置到旧的对象中，然后用旧对象更新数据 // TODO: 如果要在更新时，将某一个字段置为 null 则需要重新该方法，并且前端提交数据时也要配合 - for(String key : model._getAttrNames()){ - if(model.get(key) != null){ + for (String key : model._getAttrNames()) { + if (model.get(key) != null) { oldobj.set(key, model.get(key)); } } @@ -332,8 +332,8 @@ public class BaseService { // 将新对象中，不为 null 的字段设置到旧的对象中，然后用旧对象更新数据 // TODO: 如果要在更新时，将某一个字段置为 null 则需要重新该方法，并且前端提交数据时也要配合 - for(String key : model._getAttrNames()){ - if(model.get(key) != null){ + for (String key : model._getAttrNames()) { + if (model.get(key) != null) { oldobj.set(key, model.get(key)); } } @@ -341,7 +341,7 @@ public class BaseService { boolean ret = Db.tx(new IAtom() { @Override public boolean run() { - try{ + try { boolean ret = oldobj.update(); if (ret) { @@ -349,7 +349,7 @@ public class BaseService { } return ret; - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage(), e); return false; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/Enums.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/Enums.java index d4a6be9..d387cca 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/Enums.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/Enums.java @@ -42,16 +42,17 @@ public interface Enums { /** * 判断 which 是否有效 * 以枚举 name 开头的是有效的 + * * @param which * @return */ - public static boolean isValid(String which){ - if(StrKit.isBlank(which)){ + public static boolean isValid(String which) { + if (StrKit.isBlank(which)) { return false; } - for(CtrlFlowEnum ctrl : CtrlFlowEnum.values()){ - if(which.startsWith(ctrl.name())){ + for (CtrlFlowEnum ctrl : CtrlFlowEnum.values()) { + if (which.startsWith(ctrl.name())) { return true; } } @@ -63,15 +64,15 @@ public interface Enums { /** * 出入场控制 which */ - enum WhichEnum{ + enum WhichEnum { R01("R01", "入口1"), // 入场 01 C01("C01", "出口1"); // 出场 01 String name; String label; - WhichEnum(String name, String label){ - this.name = name; + WhichEnum(String name, String label) { + this.name = name; this.label = label; } @@ -91,9 +92,9 @@ public interface Enums { this.label = label; } - public static String getLabel(String name){ - for(WhichEnum whichEnum : WhichEnum.values()){ - if(whichEnum.getName().equals(name)){ + public static String getLabel(String name) { + for (WhichEnum whichEnum : WhichEnum.values()) { + if (whichEnum.getName().equals(name)) { return whichEnum.getLabel(); } } @@ -102,13 +103,13 @@ public interface Enums { } } - enum RowEnum{ + enum RowEnum { FRONT(1), BACK(2); int id; - RowEnum(int id){ + RowEnum(int id) { this.id = id; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderStateEnum.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderStateEnum.java index 97dd919..75bfa7c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderStateEnum.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderStateEnum.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.List; /** - 订单状态类型必须是一致 - 1，初始状态； - 2，已进场；(后台自动设置) - 3，已装载 - 4，已离场（后台自动设置） - 5，已收货 - 9，订单作废 + * 订单状态类型必须是一致 + * 1，初始状态； + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（后台自动设置） + * 5，已收货 + * 9，订单作废 */ public enum OrderStateEnum { INITIAL(1), @@ -36,16 +36,17 @@ public enum OrderStateEnum { /** * 判断 stateid 是否合法 + * * @param stateid * @return */ - public static boolean hasStateId(int stateid){ - for(OrderStateEnum stateEnum : OrderStateEnum.values()){ - if(stateEnum.stateid == OrderStateEnum.INITIAL.getStateid()){ // state == 1 是后端在添加订单时设置的 + public static boolean hasStateId(int stateid) { + for (OrderStateEnum stateEnum : OrderStateEnum.values()) { + if (stateEnum.stateid == OrderStateEnum.INITIAL.getStateid()) { // state == 1 是后端在添加订单时设置的 continue; } - if(stateEnum.stateid == stateid){ + if (stateEnum.stateid == stateid) { return true; } } @@ -53,10 +54,10 @@ public enum OrderStateEnum { return false; } - public static List getStateIdArr(){ + public static List getStateIdArr() { List list = new ArrayList<>(); - for(OrderStateEnum stateEnum : OrderStateEnum.values()){ - if(stateEnum.stateid == OrderStateEnum.INITIAL.getStateid()){ + for (OrderStateEnum stateEnum : OrderStateEnum.values()) { + if (stateEnum.stateid == OrderStateEnum.INITIAL.getStateid()) { continue; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java index b01b893..bb1bda1 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/OrderTypeEnum.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.List; /** - 销售订单状态和转运订单状态类型必须是一致 - 1，销售订单 - 2，转运订单 - 3，临时订单（外销订单） - 4. 废料运输订单 - 5. 采购订单 + * 销售订单状态和转运订单状态类型必须是一致 + * 1，销售订单 + * 2，转运订单 + * 3，临时订单（外销订单） + * 4. 废料运输订单 + * 5. 采购订单 */ public enum OrderTypeEnum { SALE(1), @@ -34,12 +34,13 @@ public enum OrderTypeEnum { /** * 判断 typeid 是否合法 + * * @param typeid * @return */ - public static boolean hasStateId(int typeid){ - for(OrderTypeEnum stateEnum : OrderTypeEnum.values()){ - if(stateEnum.typeid == typeid){ + public static boolean hasStateId(int typeid) { + for (OrderTypeEnum stateEnum : OrderTypeEnum.values()) { + if (stateEnum.typeid == typeid) { return true; } } @@ -47,9 +48,9 @@ public enum OrderTypeEnum { return false; } - public static List getTypeIdArr(){ + public static List getTypeIdArr() { List list = new ArrayList<>(); - for(OrderTypeEnum stateEnum : OrderTypeEnum.values()){ + for (OrderTypeEnum stateEnum : OrderTypeEnum.values()) { list.add(stateEnum.getTypeid()); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/RoleEnum.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/RoleEnum.java index 279576b..b9615c0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/RoleEnum.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/RoleEnum.java @@ -4,19 +4,19 @@ import java.util.ArrayList; import java.util.List; /** - 100 砂站管理员 - 101 砂站管理调度 - 102 砂站装卸货 - - 201 物流管理人员 - 202 司机 - - 300 注册用户 - 400 占位 - - 500 公司总经理，权限：查看、付费审核、退费审核 - 501 公司财务人员，权限：查看、付费、退费 - 502 公司领导，权限：查看 + * 100 砂站管理员 + * 101 砂站管理调度 + * 102 砂站装卸货 + *

+ * 201 物流管理人员 + * 202 司机 + *

+ * 300 注册用户 + * 400 占位 + *

+ * 500 公司总经理，权限：查看、付费审核、退费审核 + * 501 公司财务人员，权限：查看、付费、退费 + * 502 公司领导，权限：查看 */ public enum RoleEnum { DEVOPS(99), @@ -33,8 +33,7 @@ public enum RoleEnum { TREASURER(501), PRESIDENTVIEW(502), - CHAISHA(600) - ; + CHAISHA(600); private Integer roleid; @@ -46,18 +45,19 @@ public enum RoleEnum { this.roleid = roleid; } - RoleEnum(Integer roleid){ + RoleEnum(Integer roleid) { this.roleid = roleid; } /** * 判断 roleid 是否合法 + * * @param roleid * @return */ - public static boolean hasRoleId(int roleid){ - for(RoleEnum roleEnum : RoleEnum.values()){ - if(roleEnum.roleid == roleid){ + public static boolean hasRoleId(int roleid) { + for (RoleEnum roleEnum : RoleEnum.values()) { + if (roleEnum.roleid == roleid) { return true; } } @@ -65,9 +65,9 @@ public enum RoleEnum { return false; } - public static List getRoleIdArr(){ + public static List getRoleIdArr() { List list = new ArrayList<>(); - for(RoleEnum roleEnum : RoleEnum.values()){ + for (RoleEnum roleEnum : RoleEnum.values()) { list.add(roleEnum.getRoleid()); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/TruckRodState.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/TruckRodState.java index 24e19cc..85eeef1 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/TruckRodState.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/TruckRodState.java @@ -2,7 +2,6 @@ package com.cowr.common.enums; /** * 车辆入场状态 - * */ public class TruckRodState { public static final int state_1 = 1; // 未在系统中登记的车牌，未入场。红色。 diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/UserTypeEnum.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/UserTypeEnum.java index 0025f9e..ff1f59f 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/UserTypeEnum.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/enums/UserTypeEnum.java @@ -4,15 +4,15 @@ import java.util.ArrayList; import java.util.List; /** - type 和 role 对应，每类 type 下还会对应多个 role - 1，砂站用户 - 负责具体某个砂站相关操作的用户需要关联某个砂站 - 2，物流公司用户 - 需要关联物流公司 - 3，用户开放注册时的用户注册，可以审核关联客户表信息，否则就是个人用户不进行customer关联 - 修改操作不允许修改此字段 - 4. 司机 - 5. 砂石公司用户，可以查看管理全部砂站情况 + * type 和 role 对应，每类 type 下还会对应多个 role + * 1，砂站用户 + * 负责具体某个砂站相关操作的用户需要关联某个砂站 + * 2，物流公司用户 + * 需要关联物流公司 + * 3，用户开放注册时的用户注册，可以审核关联客户表信息，否则就是个人用户不进行customer关联 + * 修改操作不允许修改此字段 + * 4. 司机 + * 5. 砂石公司用户，可以查看管理全部砂站情况 */ public enum UserTypeEnum { CONFIG(0), // 系统配置管理 @@ -34,13 +34,13 @@ public enum UserTypeEnum { this.typeid = typeid; } - UserTypeEnum(Integer typeid){ + UserTypeEnum(Integer typeid) { this.typeid = typeid; } - public static UserTypeEnum getUserType(Integer typeid){ - for( UserTypeEnum t :UserTypeEnum.values()){ - if(t.typeid == typeid){ + public static UserTypeEnum getUserType(Integer typeid) { + for (UserTypeEnum t : UserTypeEnum.values()) { + if (t.typeid == typeid) { return t; } } @@ -50,12 +50,13 @@ public enum UserTypeEnum { /** * 判断 typeid 是否合法 + * * @param typeid * @return */ - public static boolean hasTypeId(Integer typeid){ - for(UserTypeEnum t :UserTypeEnum.values()){ - if(t.typeid == typeid){ + public static boolean hasTypeId(Integer typeid) { + for (UserTypeEnum t : UserTypeEnum.values()) { + if (t.typeid == typeid) { return true; } } @@ -63,9 +64,9 @@ public enum UserTypeEnum { return false; } - public static List getTypeIdArr(){ + public static List getTypeIdArr() { List list = new ArrayList<>(); - for(UserTypeEnum t :UserTypeEnum.values()){ + for (UserTypeEnum t : UserTypeEnum.values()) { list.add(t.getTypeid()); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/netty/JSONEncoder.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/netty/JSONEncoder.java index d0d2e88..f7378e8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/netty/JSONEncoder.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/netty/JSONEncoder.java @@ -20,7 +20,7 @@ public class JSONEncoder extends MessageToByteEncoder { byte[] data = JSON.toJSONBytes(msg); //使用fastJson将对象转换为byte out.writeInt(data.length); //先将消息长度写入，也就是消息头 out.writeBytes(data); //消息体中包含我们要发送的数据 - }else{ + } else { System.out.println("encode instance error: " + msg.getClass()); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java index 249c007..0076932 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/NettyServerPlugin.java @@ -17,20 +17,20 @@ import java.util.HashMap; import java.util.Map; public class NettyServerPlugin implements IPlugin { - private static Log log = Log.getLog(NettyServerPlugin.class); - private int port; - private Map map = new HashMap<>(); - private ServerBootstrap serverBootstrap; - private EventLoopGroup workerGroup; - private EventLoopGroup bossGroup; + private static Log log = Log.getLog(NettyServerPlugin.class); + private int port; + private Map map = new HashMap<>(); + private ServerBootstrap serverBootstrap; + private EventLoopGroup workerGroup; + private EventLoopGroup bossGroup; - public NettyServerPlugin(int port){ + public NettyServerPlugin(int port) { this.port = port; } @Override public boolean start() { - bossGroup = new NioEventLoopGroup(); + bossGroup = new NioEventLoopGroup(); workerGroup = new NioEventLoopGroup(); try { serverBootstrap = new ServerBootstrap(); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/QuartzPlugin.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/QuartzPlugin.java index 9efd55d..7ad57a7 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/QuartzPlugin.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/QuartzPlugin.java @@ -19,10 +19,10 @@ import static org.quartz.TriggerBuilder.newTrigger; * Created by lisai on 2015/5/27. */ public class QuartzPlugin implements IPlugin { - private SchedulerFactory sf = null; - private Scheduler sched = null; - private String config = "job.properties"; - private Properties properties; + private SchedulerFactory sf = null; + private Scheduler sched = null; + private String config = "job.properties"; + private Properties properties; public QuartzPlugin(String config) { this.config = config; @@ -31,7 +31,7 @@ public class QuartzPlugin implements IPlugin { public QuartzPlugin() { } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) public boolean start() { sf = new StdSchedulerFactory(); try { @@ -75,7 +75,7 @@ public class QuartzPlugin implements IPlugin { + " and repeat based on expression: " + trigger.getCronExpression()); } - return true ; + return true; } private boolean isDisableJob(String enable) { @@ -103,7 +103,7 @@ public class QuartzPlugin implements IPlugin { return true; } - public static void main(String[]args) { + public static void main(String[] args) { QuartzPlugin plugin = new QuartzPlugin(); plugin.start(); System.out.println("执行成功！！！"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java index d22cb95..bfdd964 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/plugin/SocketIOServerPlugin.java @@ -11,21 +11,21 @@ import com.jfinal.plugin.activerecord.Record; import org.apache.poi.ss.formula.functions.T; public class SocketIOServerPlugin implements IPlugin { - private int port; + private int port; private SocketIOServer server; public SocketIOServerPlugin(int port) { this.port = port; } - public void pub(String channel, Record params){ - if(server != null) { + public void pub(String channel, Record params) { + if (server != null) { server.getBroadcastOperations().sendEvent(channel, params); } } - public void pub(String channel, JSONObject params){ - if(server != null) { + public void pub(String channel, JSONObject params) { + if (server != null) { server.getBroadcastOperations().sendEvent(channel, params); } } @@ -44,27 +44,27 @@ public class SocketIOServerPlugin implements IPlugin { @Override public boolean stop() { - if(server != null){ + if (server != null) { server.stop(); } return true; } - public void addEventListener(String eventName, Class eventClass, DataListener listener){ - if(server != null) { + public void addEventListener(String eventName, Class eventClass, DataListener listener) { + if (server != null) { server.addEventListener(eventName, eventClass, listener); } } - public void addConnectListener(ConnectListener listener){ - if(server != null){ + public void addConnectListener(ConnectListener listener) { + if (server != null) { server.addConnectListener(listener); } } - public void addDisconnectListener(DisconnectListener listener){ - if(server != null){ + public void addDisconnectListener(DisconnectListener listener) { + if (server != null) { server.addDisconnectListener(listener); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/serializer/CowrSerializer.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/serializer/CowrSerializer.java index 4d50231..4ef4481 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/serializer/CowrSerializer.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/serializer/CowrSerializer.java @@ -9,8 +9,8 @@ import com.jfinal.plugin.redis.serializer.ISerializer; * Created by lisai on 16/12/17. */ public class CowrSerializer implements ISerializer { - private static Log log = Log.getLog(CowrSerializer.class); - public static final ISerializer me = new CowrSerializer(); + private static Log log = Log.getLog(CowrSerializer.class); + public static final ISerializer me = new CowrSerializer(); @Override public byte[] keyToBytes(String key) { @@ -29,13 +29,13 @@ public class CowrSerializer implements ISerializer { @Override public Object fieldFromBytes(byte[] bytes) { - if( bytes == null ){ + if (bytes == null) { return null; } - try{ + try { return JSON.parse(bytes); - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage(), e); return null; } @@ -51,14 +51,14 @@ public class CowrSerializer implements ISerializer { @Override public Object valueFromBytes(byte[] bytes) { - if( bytes == null ){ + if (bytes == null) { return null; } - try{ + try { return JSON.parse(bytes); - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage(), e); return null; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/AESUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/AESUtil.java index beb4071..3218d14 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/AESUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/AESUtil.java @@ -10,7 +10,7 @@ import java.util.Arrays; public class AESUtil { public static byte[] encrypt(String key, byte[] origData) throws GeneralSecurityException { byte[] keyBytes = getKeyBytes(key); - byte[] buf = new byte[16]; + byte[] buf = new byte[16]; System.arraycopy(keyBytes, 0, buf, 0, keyBytes.length > buf.length ? keyBytes.length : buf.length); Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(buf, "AES"), new IvParameterSpec(keyBytes)); @@ -20,7 +20,7 @@ public class AESUtil { public static byte[] decrypt(String key, byte[] crypted) throws GeneralSecurityException { byte[] keyBytes = getKeyBytes(key); - byte[] buf = new byte[16]; + byte[] buf = new byte[16]; System.arraycopy(keyBytes, 0, buf, 0, keyBytes.length > buf.length ? keyBytes.length : buf.length); Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(buf, "AES"), new IvParameterSpec(keyBytes)); @@ -34,19 +34,19 @@ public class AESUtil { public static String encrypt(String key, String val) throws GeneralSecurityException { byte[] origData = val.getBytes(); - byte[] crypted = encrypt(key, origData); + byte[] crypted = encrypt(key, origData); return parseByte2HexStr(crypted); } public static String decrypt(String key, String val) throws GeneralSecurityException, UnsupportedEncodingException { - byte[] crypted = parseHexStr2Byte(val); + byte[] crypted = parseHexStr2Byte(val); byte[] origData = decrypt(key, crypted); return new String(origData, "utf-8"); } /** - * 将二进制转换成16进制 + * 将二进制转换成16进制 * * @param buf * @return @@ -75,7 +75,7 @@ public class AESUtil { byte[] result = new byte[hexStr.length() / 2]; for (int i = 0; i < hexStr.length() / 2; i++) { int high = Integer.parseInt(hexStr.substring(i * 2, i * 2 + 1), 16); - int low = Integer.parseInt(hexStr.substring(i * 2 + 1, i * 2 + 2), 16); + int low = Integer.parseInt(hexStr.substring(i * 2 + 1, i * 2 + 2), 16); result[i] = (byte) (high * 16 + low); } return result; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java index 8b3bf23..8868b80 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ChineseNumberUtil.java @@ -44,7 +44,7 @@ public class ChineseNumberUtil { String digit = String.valueOf(numbers[0].charAt(i)); // 第一个就是 0 - if(i == 0 && "0".equals(digit)){ + if (i == 0 && "0".equals(digit)) { result.append(NUMBER_MAPPING.get("0")); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DataUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DataUtil.java index 13d4b3d..5ce5e49 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DataUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DataUtil.java @@ -13,10 +13,11 @@ public class DataUtil { /** * 将列表结构树数据，转换成树状结构 * 固定配置属性 + * * @param sNodes * @return */ - public static List transformToTreeFormat(List sNodes){ + public static List transformToTreeFormat(List sNodes) { Map setting = new HashMap(); setting.put("idKey", "id"); @@ -27,45 +28,44 @@ public class DataUtil { } /** - * * { - * idKey : 'id', - * pIdKey : 'pid', - * childKey : 'children' + * idKey : 'id', + * pIdKey : 'pid', + * childKey : 'children' * } * * @param setting * @param sNodes */ - public static List transformToTreeFormat(Map setting, List sNodes){ + public static List transformToTreeFormat(Map setting, List sNodes) { List r = new ArrayList(); String key = setting.get("idKey"); String parentKey = setting.get("pIdKey"); String childKey = setting.get("childKey"); - if ( !StrKit.notBlank(key, parentKey, childKey) ){ + if (!StrKit.notBlank(key, parentKey, childKey)) { return r; } Map tmpMap = new HashMap(); - for( Record node : sNodes ){ + for (Record node : sNodes) { tmpMap.put(node.get(key), node); } - for( Record node : sNodes ){ + for (Record node : sNodes) { Object id = node.get(key); Object pid = node.get(parentKey); - if( tmpMap.containsKey(pid) && !id.equals(pid) ){ + if (tmpMap.containsKey(pid) && !id.equals(pid)) { Record pnode = tmpMap.get(pid); - if( pnode.get(childKey) == null ){ + if (pnode.get(childKey) == null) { pnode.set(childKey, new ArrayList()); } - ((ArrayList)pnode.get(childKey)).add(node); - }else{ + ((ArrayList) pnode.get(childKey)).add(node); + } else { r.add(node); } } @@ -79,18 +79,19 @@ public class DataUtil { /** * 克隆 record 对象 + * * @param record - * @param deep 是否递归克隆 + * @param deep 是否递归克隆 * @return */ - public static Record cloneRecord(Record record, boolean deep){ + public static Record cloneRecord(Record record, boolean deep) { String[] keys = record.getColumnNames(); Record out = new Record(); - for(String key : keys){ + for (String key : keys) { Object object = record.get(key); - if(deep && object instanceof Record){ + if (deep && object instanceof Record) { object = cloneRecord((Record) object); } @@ -102,37 +103,38 @@ public class DataUtil { /** * 从 record 中取出 double 值，当对象为 BigDecimal 时，也只返回 double + * * @param record * @param key * @return */ - public static Double getDoubleByRecord(Record record, String key){ - if(record == null){ + public static Double getDoubleByRecord(Record record, String key) { + if (record == null) { return null; } Object obj = record.get(key); - if(obj == null){ + if (obj == null) { return null; } - if(obj instanceof Double){ + if (obj instanceof Double) { return record.getDouble(key); } - if(obj instanceof BigDecimal){ + if (obj instanceof BigDecimal) { return record.getBigDecimal(key).doubleValue(); } - if(obj instanceof String){ + if (obj instanceof String) { return Double.valueOf(record.getStr(key)); } return null; } - public static Double getDefaultByRecord(Record record, String key){ + public static Double getDefaultByRecord(Record record, String key) { Double obj = getDoubleByRecord(record, key); return obj == null ? 0.0 : obj; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java index a422878..825b364 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/DateTimeUtil.java @@ -10,7 +10,7 @@ import java.util.Date; public class DateTimeUtil { public static final String ymdhms = "yyyy-MM-dd HH:mm:ss"; - public static final ThreadLocal yMd = new ThreadLocal() { + public static final ThreadLocal yMd = new ThreadLocal() { protected SimpleDateFormat initialValue() { return new SimpleDateFormat("yyyyMMdd"); } @@ -26,12 +26,12 @@ public class DateTimeUtil { return new SimpleDateFormat("yyyy年MM月dd日"); } }; - public static final ThreadLocal sd = new ThreadLocal() { + public static final ThreadLocal sd = new ThreadLocal() { protected SimpleDateFormat initialValue() { return new SimpleDateFormat("yyyy-MM"); } }; - public static final ThreadLocal sdfym = new ThreadLocal() { + public static final ThreadLocal sdfym = new ThreadLocal() { protected SimpleDateFormat initialValue() { return new SimpleDateFormat("yyyy年MM月"); } @@ -41,13 +41,15 @@ public class DateTimeUtil { return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); } }; - public static final ThreadLocal sdfhm = new ThreadLocal() { + public static final ThreadLocal sdfhm = new ThreadLocal() { protected SimpleDateFormat initialValue() { return new SimpleDateFormat("yyyy-MM-dd HH:mm"); } }; + /** * 验证是否符合格式的时间字符串 + * * @param str * @param fmt * @return @@ -72,51 +74,53 @@ public class DateTimeUtil { } } - public static boolean isEarlyDate(Date d, Date flag){ + public static boolean isEarlyDate(Date d, Date flag) { try { Calendar c = Calendar.getInstance(); c.setTime(flag); - c.set(Calendar.HOUR_OF_DAY,0); - c.set(Calendar.MINUTE,0); - c.set(Calendar.SECOND,0); - c.set(Calendar.MILLISECOND,0); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + c.set(Calendar.MILLISECOND, 0); return d.getTime() < c.getTime().getTime(); - }catch (Exception e){ + } catch (Exception e) { return false; } } - public static boolean isEarlyDate(String date, Date flag){ + public static boolean isEarlyDate(String date, Date flag) { try { - Date d = sdf.get().parse(date); + Date d = sdf.get().parse(date); Calendar c = Calendar.getInstance(); c.setTime(flag); - c.set(Calendar.HOUR_OF_DAY,0); - c.set(Calendar.MINUTE,0); - c.set(Calendar.SECOND,0); - c.set(Calendar.MILLISECOND,0); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + c.set(Calendar.MILLISECOND, 0); return d.getTime() < c.getTime().getTime(); - }catch (Exception e){ + } catch (Exception e) { return false; } } /** * 是否早于当天 + * * @param date * @return */ - public static boolean isEarlyToday(String date){ + public static boolean isEarlyToday(String date) { return isEarlyDate(date, new Date()); } /** * 是当天的时间 + * * @return */ - public static boolean isToday(Date date){ + public static boolean isToday(Date date) { Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, 23); c.set(Calendar.MINUTE, 59); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java index 4bfdf6f..bfab5fe 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ImageUtil.java @@ -76,14 +76,14 @@ public class ImageUtil { BitMatrix bitMatrix = qrCodeWriter.encode(text, BarcodeFormat.QR_CODE, width, height); ByteArrayOutputStream out = null; - try{ + try { out = new ByteArrayOutputStream(); MatrixToImageWriter.writeToStream(bitMatrix, format, out); return out.toByteArray(); - }catch (Exception e){ + } catch (Exception e) { throw e; - }finally { - if(out!= null){ + } finally { + if (out != null) { out.close(); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/JsonUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/JsonUtil.java index 6fc06a7..06f7eaa 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/JsonUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/JsonUtil.java @@ -4,30 +4,31 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; public class JsonUtil { - public static JSONObject key2Lower(JSONObject obj){ + public static JSONObject key2Lower(JSONObject obj) { return key2Lower(obj, false); } /** * json 对象 key 转小写 + * * @param obj * @param deep * @return */ - public static JSONObject key2Lower(JSONObject obj, boolean deep){ - if(obj == null || obj.isEmpty()){ + public static JSONObject key2Lower(JSONObject obj, boolean deep) { + if (obj == null || obj.isEmpty()) { return obj; } JSONObject out = new JSONObject(); - for( String key : obj.keySet() ){ + for (String key : obj.keySet()) { Object tmp = obj.get(key); - if( tmp instanceof JSONObject && deep ){ - tmp = key2Lower((JSONObject)tmp, deep); - }else if( tmp instanceof JSONArray && deep ){ + if (tmp instanceof JSONObject && deep) { + tmp = key2Lower((JSONObject) tmp, deep); + } else if (tmp instanceof JSONArray && deep) { JSONArray arr = (JSONArray) tmp; - for(int i=0; i= b){ + if (d - 0.4 >= b) { b++; return b; - } - else + } else return b; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ReqUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ReqUtil.java index e210eea..9ea20ca 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ReqUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/ReqUtil.java @@ -9,6 +9,7 @@ public class ReqUtil { * 答案是取X-Forwarded-For中第一个非unknown的有效IP字符串。 * 如：X-Forwarded-For：192.168.1.110, 192.168.1.120, 192.168.1.130, 192.168.1.100 * 用户真实IP为： 192.168.1.110 + * * @param request * @return */ diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/StrUtil.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/StrUtil.java index db2de5a..d2dd3b0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/StrUtil.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/utils/StrUtil.java @@ -12,7 +12,7 @@ import java.util.regex.Pattern; public class StrUtil { public static final String regphone = "^1[3|4|5|7|8|9][\\d]{9}$"; // 放的比较宽 - public static final String regphone_tel = "^((0\\d{2,3}-\\d{7,8})|(1[3584]\\d{9}))$"; // 座机或者手机 + public static final String regphone_tel = "^((0\\d{2,3}-\\d{7,8})|(1[3584]\\d{9}))$"; // 座机或者手机 public static final String DEFAULT_PATH_SEPARATOR = ","; /** @@ -110,6 +110,7 @@ public class StrUtil { /** * 构造sql + * * @param table * @param columns * @return @@ -118,7 +119,7 @@ public class StrUtil { StringBuilder sql = new StringBuilder("select * from `"); sql.append(table); sql.append("` where "); - for (int i=0; i 0) { sql.append(" and "); } @@ -129,6 +130,7 @@ public class StrUtil { /** * 限定返回结果，只要第一个 + * * @param table * @param columns * @return @@ -140,8 +142,7 @@ public class StrUtil { /** * 将一个中间带逗号分隔符的字符串转换为字符型数组对象 * - * @param str - * 待转换的符串对象 + * @param str 待转换的符串对象 * @return 字符型数组 */ public static String[] strToStrArray(String str) { @@ -151,7 +152,7 @@ public class StrUtil { /** * 将字符串对象按给定的分隔符separator转象为字符型数组对象 * - * @param str 待转换的符串对象 + * @param str 待转换的符串对象 * @param separator 字符型分隔符 * @return 字符型数组 */ @@ -173,18 +174,18 @@ public class StrUtil { return strArray; } - public static String getRecordStr(Record record, String key){ + public static String getRecordStr(Record record, String key) { String out = record.getStr(key); - if(out == null){ + if (out == null) { return ""; } return out; } - public static boolean validPhone(String phone){ - if(StrKit.isBlank(phone)){ + public static boolean validPhone(String phone) { + if (StrKit.isBlank(phone)) { return false; } @@ -196,7 +197,7 @@ public class StrUtil { public static String join(Collection var0, String var1) { StringBuffer var2 = new StringBuffer(); - for(Iterator var3 = var0.iterator(); var3.hasNext(); var2.append((String)var3.next())) { + for (Iterator var3 = var0.iterator(); var3.hasNext(); var2.append((String) var3.next())) { if (var2.length() != 0) { var2.append(var1); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/CrudParamValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/CrudParamValidator.java index 3484ebf..9655805 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/CrudParamValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/CrudParamValidator.java @@ -16,17 +16,19 @@ public abstract class CrudParamValidator extends ParamValidator { protected void validateUpdateModel(Class modelClass, String modelName) { validateUpdateModel(modelClass, modelName, true); } + /** * 通过 model.update() 跟新数据时，检查是否只有主键相关的字段 * 避免 com.jfinal.oss.activerecord.Model.update(Model.java:630) 这抛异常 + * * @param modelClass 根据model class 找到映射的表，查找映射的表的字段、主键 * @param modelName */ protected void validateUpdateModel(Class modelClass, String modelName, boolean skipConvertError) { - Model model = (Model)controller.getModel(modelClass, modelName, skipConvertError); + Model model = (Model) controller.getModel(modelClass, modelName, skipConvertError); - boolean pass = false; - Table table = TableMapping.me().getTable(modelClass); + boolean pass = false; + Table table = TableMapping.me().getTable(modelClass); String[] pKeys = table.getPrimaryKey(); List pks = Arrays.asList(pKeys); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/DayValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/DayValidator.java index f018152..ba31755 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/DayValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/DayValidator.java @@ -9,7 +9,7 @@ import com.jfinal.core.Controller; public class DayValidator extends CrudParamValidator { @Override protected void validate(Controller c) { - validateDate("tm", "yyyy-MM-dd","tm","tm 格式必须为 yyyy-MM-dd"); + validateDate("tm", "yyyy-MM-dd", "tm", "tm 格式必须为 yyyy-MM-dd"); } protected void handleError(Controller c) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/MonthValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/MonthValidator.java index a2c1a78..e48a693 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/MonthValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/MonthValidator.java @@ -9,7 +9,7 @@ import com.cowr.common.view.Result; public class MonthValidator extends CrudParamValidator { @Override protected void validate(Controller c) { - validateDate("tm", "yyyy-MM","tm","tm 格式必须为 yyyy-MM"); + validateDate("tm", "yyyy-MM", "tm", "tm 格式必须为 yyyy-MM"); } protected void handleError(Controller c) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/ParamValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/ParamValidator.java index 9fc7ee2..05abefc 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/ParamValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/ParamValidator.java @@ -22,6 +22,7 @@ public abstract class ParamValidator extends Validator { /** * 添加错误到 map + * * @param errorKey * @param errorMessage */ @@ -38,9 +39,9 @@ public abstract class ParamValidator extends Validator { } /** - * @param field 字段名称 - * @param datePattern 时间格式 - * @param errorKey 存储错误的key + * @param field 字段名称 + * @param datePattern 时间格式 + * @param errorKey 存储错误的key * @param errorMessage 错误描述信息 */ protected void validateDate(String field, String datePattern, String errorKey, String errorMessage) { @@ -49,20 +50,21 @@ public abstract class ParamValidator extends Validator { /** * 指定格式验证时间字段 - * @param field 字段名称 - * @param datePattern 时间格式 - * @param isRequired 是否必填，如果非必填，只有在获取到值时才校验是否符合格式 - * @param errorKey 存储错误的key + * + * @param field 字段名称 + * @param datePattern 时间格式 + * @param isRequired 是否必填，如果非必填，只有在获取到值时才校验是否符合格式 + * @param errorKey 存储错误的key * @param errorMessage 错误描述信息 */ protected void validateDate(String field, String datePattern, boolean isRequired, String errorKey, String errorMessage) { String value = controller.getPara(field); if (StrKit.isBlank(value)) { addError(errorKey, errorMessage); - return ; + return; } - if( !DateTimeUtil.isValidDate(value, datePattern) ){ + if (!DateTimeUtil.isValidDate(value, datePattern)) { addError(errorKey, errorMessage); } } @@ -75,15 +77,14 @@ public abstract class ParamValidator extends Validator { String value = controller.getPara(field); if (StrKit.isBlank(value)) { addError(errorKey, errorMessage); - return ; + return; } try { BigDecimal temp = new BigDecimal(value.trim()); - if (temp.compareTo(min) < 0 || temp.compareTo(max) > 0 ) { + if (temp.compareTo(min) < 0 || temp.compareTo(max) > 0) { addError(errorKey, errorMessage); } - } - catch (Exception e) { + } catch (Exception e) { addError(errorKey, errorMessage); } } @@ -95,17 +96,16 @@ public abstract class ParamValidator extends Validator { String value = controller.getPara(field); if (StrKit.isBlank(value)) { addError(errorKey, errorMessage); - return ; + return; } try { new BigDecimal(value.trim()); - } - catch (Exception e) { + } catch (Exception e) { addError(errorKey, errorMessage); } } - protected void validateInIntegerArray(String field, List chklist, String errorKey, String errorMessage){ + protected void validateInIntegerArray(String field, List chklist, String errorKey, String errorMessage) { String value = controller.getPara(field); if (StrKit.isBlank(value)) { addError(errorKey, errorMessage); @@ -113,8 +113,8 @@ public abstract class ParamValidator extends Validator { try { Integer temp = Integer.parseInt(value.trim()); - for(Integer integer : chklist){ - if(integer.equals(temp)){ + for (Integer integer : chklist) { + if (integer.equals(temp)) { return; } } @@ -126,7 +126,7 @@ public abstract class ParamValidator extends Validator { } } - protected void validateInStringArray(String field, List chklist, String errorKey, String errorMessage){ + protected void validateInStringArray(String field, List chklist, String errorKey, String errorMessage) { String value = controller.getPara(field); if (StrKit.isBlank(value)) { addError(errorKey, errorMessage); @@ -134,8 +134,8 @@ public abstract class ParamValidator extends Validator { try { String temp = value.trim(); - for(String str : chklist){ - if(str.equals(temp)){ + for (String str : chklist) { + if (str.equals(temp)) { return; } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java index 98d5935..7230ce6 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndTimeValidator.java @@ -7,10 +7,10 @@ public class StartAndEndTimeValidator extends ParamValidator { @Override protected void validate(Controller c) { // setShortCircuit(true); - validateRequired("stm", "stm","stm 必填"); - validateRequired("etm", "etm","etm 必填"); - validateDate("stm", "yyyy-MM-dd HH:mm:ss","stm","stm 格式错误"); - validateDate("etm", "yyyy-MM-dd HH:mm:ss","etm","etm 格式错误"); + validateRequired("stm", "stm", "stm 必填"); + validateRequired("etm", "etm", "etm 必填"); + validateDate("stm", "yyyy-MM-dd HH:mm:ss", "stm", "stm 格式错误"); + validateDate("etm", "yyyy-MM-dd HH:mm:ss", "etm", "etm 格式错误"); } protected void handleError(Controller c) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/YearValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/YearValidator.java index fab648a..353835c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/YearValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/YearValidator.java @@ -9,7 +9,7 @@ import com.jfinal.core.Controller; public class YearValidator extends CrudParamValidator { @Override protected void validate(Controller c) { - validateDate("tm", "yyyy","tm","tm 格式必须为 yyyy"); + validateDate("tm", "yyyy", "tm", "tm 格式必须为 yyyy"); } protected void handleError(Controller c) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ActionReporter.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ActionReporter.java index 5cb5b70..391ff02 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ActionReporter.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ActionReporter.java @@ -1,12 +1,12 @@ /** * Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com). - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,207 +42,211 @@ import java.util.List; * ActionReporter */ public class ActionReporter { - private static Log log = Log.getLog(ActionReporter.class); - private static final String title = "\nJFinal-" + Const.JFINAL_VERSION + " action report -------- "; - private static boolean reportAfterInvocation = true; - private static int maxOutputLengthOfParaValue = 512; - private static Writer writer = new SystemOutWriter(); - - private static final ThreadLocal sdf = new ThreadLocal() { - protected SimpleDateFormat initialValue() { - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - } - }; - - public static void setReportAfterInvocation(boolean reportAfterInvocation) { - ActionReporter.reportAfterInvocation = reportAfterInvocation; - } - - public static void setMaxOutputLengthOfParaValue(int maxOutputLengthOfParaValue) { - if (maxOutputLengthOfParaValue < 16) { - throw new IllegalArgumentException("maxOutputLengthOfParaValue must more than 16"); - } - ActionReporter.maxOutputLengthOfParaValue = maxOutputLengthOfParaValue; - } - - public static void setWriter(Writer writer) { - if (writer == null) { - throw new IllegalArgumentException("writer can not be null"); - } - ActionReporter.writer = writer; - } - - public static boolean isReportAfterInvocation(HttpServletRequest request) { - if (reportAfterInvocation) { - return true; - } else { - String contentType = request.getContentType(); - if (contentType != null && contentType.toLowerCase().indexOf("multipart") != -1) { - return true; - } else { - return false; - } - } - } + private static Log log = Log.getLog(ActionReporter.class); + private static final String title = "\nJFinal-" + Const.JFINAL_VERSION + " action report -------- "; + private static boolean reportAfterInvocation = true; + private static int maxOutputLengthOfParaValue = 512; + private static Writer writer = new SystemOutWriter(); + + private static final ThreadLocal sdf = new ThreadLocal() { + protected SimpleDateFormat initialValue() { + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + } + }; + + public static void setReportAfterInvocation(boolean reportAfterInvocation) { + ActionReporter.reportAfterInvocation = reportAfterInvocation; + } + + public static void setMaxOutputLengthOfParaValue(int maxOutputLengthOfParaValue) { + if (maxOutputLengthOfParaValue < 16) { + throw new IllegalArgumentException("maxOutputLengthOfParaValue must more than 16"); + } + ActionReporter.maxOutputLengthOfParaValue = maxOutputLengthOfParaValue; + } + + public static void setWriter(Writer writer) { + if (writer == null) { + throw new IllegalArgumentException("writer can not be null"); + } + ActionReporter.writer = writer; + } + + public static boolean isReportAfterInvocation(HttpServletRequest request) { + if (reportAfterInvocation) { + return true; + } else { + String contentType = request.getContentType(); + if (contentType != null && contentType.toLowerCase().indexOf("multipart") != -1) { + return true; + } else { + return false; + } + } + } - private static int lineNum(String codeFragment, String fileName){ - List lines = null; - int lineNum = 1; - Path path = Paths.get(fileName); - try{ - lines = Files.readAllLines(path, Charset.forName("utf-8")); + private static int lineNum(String codeFragment, String fileName) { + List lines = null; + int lineNum = 1; + Path path = Paths.get(fileName); + try { + lines = Files.readAllLines(path, Charset.forName("utf-8")); - for(int i = 0; i < lines.size(); i++){ - String line = lines.get(i); - lineNum = i + 1; - if(deleteWhitespace(line).toLowerCase().startsWith(codeFragment.toLowerCase())){ - break; - } - } - } - catch(Exception e2){ - return 1; - } - return lineNum; - } + for (int i = 0; i < lines.size(); i++) { + String line = lines.get(i); + lineNum = i + 1; + if (deleteWhitespace(line).toLowerCase().startsWith(codeFragment.toLowerCase())) { + break; + } + } + } catch (Exception e2) { + return 1; + } + return lineNum; + } - private static String deleteWhitespace(String str){ - if(StrKit.isBlank(str)){ - return str; - } - int sz = str.length(); - char[] chs = new char[sz]; - int count = 0; - for(int i = 0; i < sz; i++){ - if(!Character.isWhitespace(str.charAt(i))){ - chs[count++] = str.charAt(i); - } - } - if(count == sz){ - return str; - } - return new String(chs, 0, count); - } + private static String deleteWhitespace(String str) { + if (StrKit.isBlank(str)) { + return str; + } + int sz = str.length(); + char[] chs = new char[sz]; + int count = 0; + for (int i = 0; i < sz; i++) { + if (!Character.isWhitespace(str.charAt(i))) { + chs[count++] = str.charAt(i); + } + } + if (count == sz) { + return str; + } + return new String(chs, 0, count); + } - /** - * 根据 class 获取 .java 文件的绝对路径 - * 需要根据项目实际的路径调整 - * 目前只适合 windows 下的调试使用 - * TODO 参考 log4j 优化 - * @param clazz - * @return - */ - private static String fileName(@SuppressWarnings("rawtypes") Class clazz){ - StringBuilder cf = new StringBuilder(System.getProperty("user.dir")).append(File.separator).append("src") - .append(File.separator).append("main").append(File.separator).append("java"); + /** + * 根据 class 获取 .java 文件的绝对路径 + * 需要根据项目实际的路径调整 + * 目前只适合 windows 下的调试使用 + * TODO 参考 log4j 优化 + * @param clazz + * @return + */ + private static String fileName(@SuppressWarnings("rawtypes") Class clazz) { + StringBuilder cf = new StringBuilder(System.getProperty("user.dir")).append(File.separator).append("src") + .append(File.separator).append("main").append(File.separator).append("java"); - StringBuilder classFile = new StringBuilder() - .append(File.separator).append("src") - .append(File.separator).append("main") - .append(File.separator).append("java"); - for(String temp : clazz.getName().split("\\.")){ - classFile.append(File.separator).append(temp); - } + StringBuilder classFile = new StringBuilder() + .append(File.separator).append("src") + .append(File.separator).append("main") + .append(File.separator).append("java"); + for (String temp : clazz.getName().split("\\.")) { + classFile.append(File.separator).append(temp); + } - String classpath = clazz.getResource("").getPath(); - if(!classpath.contains("/target/classes/")){ - return classFile.append(".java").toString(); - } + String classpath = clazz.getResource("").getPath(); + if (!classpath.contains("/target/classes/")) { + return classFile.append(".java").toString(); + } - String classsrc = classpath.substring(1, classpath.indexOf("/target/classes/")); + String classsrc = classpath.substring(1, classpath.indexOf("/target/classes/")); - return classsrc + classFile.append(".java").toString(); - } + return classsrc + classFile.append(".java").toString(); + } - /** - * Report the action - */ - public static final void report(String target, Controller controller, Action action) { - StringBuilder sb = new StringBuilder(title).append(sdf.get().format(new Date())).append(" --------------------------\n"); - sb.append("Url : ").append(controller.getRequest().getMethod()).append(" ").append(target).append("\n"); - Class cc = action.getControllerClass(); - if(System.getProperty("file.separator").equals("\\")){ - sb.append("Controller : ").append(cc.getName()).append(".(").append(cc.getSimpleName()).append(".java:") - .append(lineNum("publicvoid" + action.getMethodName() + "(){", fileName(cc))).append(")"); - }else{ - sb.append("Controller : ").append(cc.getName()).append(".(").append(cc.getSimpleName()).append(".java:1)"); - } - sb.append("\nMethod : ").append(action.getMethodName()).append("\n"); + /** + * Report the action + */ + public static final void report(String target, Controller controller, Action action) { + StringBuilder sb = new StringBuilder(title).append(sdf.get().format(new Date())).append(" --------------------------\n"); + sb.append("Url : ").append(controller.getRequest().getMethod()).append(" ").append(target).append("\n"); + Class cc = action.getControllerClass(); + if (System.getProperty("file.separator").equals("\\")) { + sb.append("Controller : ").append(cc.getName()).append(".(").append(cc.getSimpleName()).append(".java:") + .append(lineNum("publicvoid" + action.getMethodName() + "(){", fileName(cc))).append(")"); + } else { + sb.append("Controller : ").append(cc.getName()).append(".(").append(cc.getSimpleName()).append(".java:1)"); + } + sb.append("\nMethod : ").append(action.getMethodName()).append("\n"); - String urlParas = controller.getPara(); - if (urlParas != null) { - sb.append("UrlPara : ").append(urlParas).append("\n"); - } - - Interceptor[] inters = action.getInterceptors(); - if (inters.length > 0) { - sb.append("Interceptor : "); - for (int i=0; i 0) - sb.append("\n "); - Interceptor inter = inters[i]; - Class ic = inter.getClass(); - sb.append(ic.getName()).append(".(").append(ic.getSimpleName()).append(".java:1)"); - } - sb.append("\n"); - } - - // print all parameters - HttpServletRequest request = controller.getRequest(); - Enumeration e = request.getParameterNames(); - if (e.hasMoreElements()) { - sb.append("Parameter : "); - while (e.hasMoreElements()) { - String name = e.nextElement(); - String[] values = request.getParameterValues(name); - if (values.length == 1) { - sb.append(name).append("="); - if (values[0] != null && values[0].length() > maxOutputLengthOfParaValue) { - sb.append(values[0].substring(0, maxOutputLengthOfParaValue)).append("..."); - } else { - sb.append(values[0]); - } - } - else { - sb.append(name).append("[]={"); - for (int i=0; i 0) - sb.append(","); - sb.append(values[i]); - } - sb.append("}"); - } - sb.append(" "); - } - sb.append("\n"); - } + String urlParas = controller.getPara(); + if (urlParas != null) { + sb.append("UrlPara : ").append(urlParas).append("\n"); + } - String ip = ReqUtil.getIpAddress(request); - //转成UserAgent对象 - UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent")); + Interceptor[] inters = action.getInterceptors(); + if (inters.length > 0) { + sb.append("Interceptor : "); + for (int i = 0; i < inters.length; i++) { + if (i > 0) + sb.append("\n "); + Interceptor inter = inters[i]; + Class ic = inter.getClass(); + sb.append(ic.getName()).append(".(").append(ic.getSimpleName()).append(".java:1)"); + } + sb.append("\n"); + } - sb.append("IP : ").append(ip).append("\n"); - sb.append("OS : ").append(userAgent.getOperatingSystem().getName()).append("\n"); - sb.append("Browser : ").append(userAgent.getBrowser().getName()).append(" ").append(userAgent.getBrowserVersion()).append("\n"); - sb.append("--------------------------------------------------------------------------------\n"); - - try { - writer.write(sb.toString()); - writer.flush(); - } catch (IOException ex) { - throw new RuntimeException(ex); - } - } - - private static class SystemOutWriter extends Writer { - public void write(String str) throws IOException { - log.debug(str); - } - public void write(char[] cbuf, int off, int len) throws IOException {} - public void flush() throws IOException {} - public void close() throws IOException {} - } + // print all parameters + HttpServletRequest request = controller.getRequest(); + Enumeration e = request.getParameterNames(); + if (e.hasMoreElements()) { + sb.append("Parameter : "); + while (e.hasMoreElements()) { + String name = e.nextElement(); + String[] values = request.getParameterValues(name); + if (values.length == 1) { + sb.append(name).append("="); + if (values[0] != null && values[0].length() > maxOutputLengthOfParaValue) { + sb.append(values[0].substring(0, maxOutputLengthOfParaValue)).append("..."); + } else { + sb.append(values[0]); + } + } else { + sb.append(name).append("[]={"); + for (int i = 0; i < values.length; i++) { + if (i > 0) + sb.append(","); + sb.append(values[i]); + } + sb.append("}"); + } + sb.append(" "); + } + sb.append("\n"); + } + + String ip = ReqUtil.getIpAddress(request); + //转成UserAgent对象 + UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent")); + + sb.append("IP : ").append(ip).append("\n"); + sb.append("OS : ").append(userAgent.getOperatingSystem().getName()).append("\n"); + sb.append("Browser : ").append(userAgent.getBrowser().getName()).append(" ").append(userAgent.getBrowserVersion()).append("\n"); + sb.append("--------------------------------------------------------------------------------\n"); + + try { + writer.write(sb.toString()); + writer.flush(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + + private static class SystemOutWriter extends Writer { + public void write(String str) throws IOException { + log.debug(str); + } + + public void write(char[] cbuf, int off, int len) throws IOException { + } + + public void flush() throws IOException { + } + + public void close() throws IOException { + } + } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ExcelRender.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ExcelRender.java index 1bb71e0..e53bd26 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ExcelRender.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ExcelRender.java @@ -13,62 +13,62 @@ import java.net.URLEncoder; public class ExcelRender extends Render { private static Log log = Log.getLog(ExcelRender.class); - private final static String CONTENT_TYPE = "application/msexcel;charset=" - + getEncoding(); + private final static String CONTENT_TYPE = "application/msexcel;charset=" + + getEncoding(); - private String fileName = ""; - private Workbook book; + private String fileName = ""; + private Workbook book; - public ExcelRender(String filename, Workbook book) { - this.fileName = filename; - this.book = book; - } + public ExcelRender(String filename, Workbook book) { + this.fileName = filename; + this.book = book; + } - private String encodeFileName(String fileName) { - try { - return URLEncoder.encode(fileName, "UTF-8"); - } catch (UnsupportedEncodingException e) { - log.error(e.getMessage(), e); - return fileName; - } + private String encodeFileName(String fileName) { + try { + return URLEncoder.encode(fileName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + log.error(e.getMessage(), e); + return fileName; + } /*try { return new String(fileName.getBytes("UTF-8"), "ISO8859-1"); } catch (UnsupportedEncodingException e) { return fileName; }*/ - } + } - @Override - public void render() { - this.response.reset(); - this.response.setHeader("Content-disposition", "attachment; filename=" + encodeFileName(fileName)); - this.response.setContentType(CONTENT_TYPE); - OutputStream os = null; - try { - os = response.getOutputStream(); - book.write(os); - } catch (Exception e) { - log.error(e.getMessage(), e); - throw new RenderException(e); - } finally { - try { - if (os != null) { - os.flush(); - os.close(); - } - } catch (IOException e) { - log.error(e.getMessage(), e); - } + @Override + public void render() { + this.response.reset(); + this.response.setHeader("Content-disposition", "attachment; filename=" + encodeFileName(fileName)); + this.response.setContentType(CONTENT_TYPE); + OutputStream os = null; + try { + os = response.getOutputStream(); + book.write(os); + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new RenderException(e); + } finally { + try { + if (os != null) { + os.flush(); + os.close(); + } + } catch (IOException e) { + log.error(e.getMessage(), e); + } - if( book != null ){ + if (book != null) { try { book.close(); } catch (IOException e) { log.error(e.getMessage(), e); } } - } - } + } + } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/JsonRenderFactory.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/JsonRenderFactory.java index 01220e8..9922d9c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/JsonRenderFactory.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/JsonRenderFactory.java @@ -9,10 +9,11 @@ public class JsonRenderFactory extends RenderFactory { public Render getErrorRender(int errorCode) { return getErrorRender(errorCode, null); } + public Render getErrorRender(int errorCode, String view) { - if(errorCode != 400){ + if (errorCode != 400) { return new JsonRender(new Result(errorCode, null, view)); - }else{ + } else { return new ErrorRender(400, view); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/PageParam.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/PageParam.java index cf3edef..91398be 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/PageParam.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/PageParam.java @@ -7,8 +7,8 @@ public class PageParam { private String sort_field; private String sort_order; - private int page = 1; // 当前页码 - private int size = 20; // 每页行数 + private int page = 1; // 当前页码 + private int size = 20; // 每页行数 public String getSort_field() { return sort_field; @@ -49,8 +49,8 @@ public class PageParam { public PageParam(String sort_field, String sort_order, int page, int size) { this.sort_field = sort_field; this.sort_order = sort_order; - this.page = page; - this.size = size; + this.page = page; + this.size = size; } public PageParam(int page, int size) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ReportExcelStyle.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ReportExcelStyle.java index 817aaa5..671c4ba 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ReportExcelStyle.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/ReportExcelStyle.java @@ -15,9 +15,10 @@ public class ReportExcelStyle { String subtitle, int datalen, int end_col - ){ + ) { setCommonStyle(wb, sheet, title, subtitle, datalen, end_col, 4); } + public static void setCommonStyle( Workbook wb, Sheet sheet, @@ -26,7 +27,7 @@ public class ReportExcelStyle { int datalen, int end_col, int sign_col - ){ + ) { // 标题 start Font font = wb.createFont(); font.setBold(true); @@ -62,7 +63,7 @@ public class ReportExcelStyle { // 通用单元格格式 - font = wb.createFont(); + font = wb.createFont(); cellStyle = wb.createCellStyle(); font.setFontHeight((short) (10 * 20)); font.setFontName("宋体"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/Result.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/Result.java index 2114338..5e18c1a 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/view/Result.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/view/Result.java @@ -19,9 +19,9 @@ public class Result { public static final int SRC_TIMEOUT = 504; // 请求资源超时 public static final String PERMISSION_DENIED_STR = "没有权限"; - public static final String NOT_FOUND_STR = "未找到资源"; - public static final String SERVER_ERROR_STR = "后台错误"; - public static final String SRC_TIMEOUT_STR = "请求第三方资源超时"; + public static final String NOT_FOUND_STR = "未找到资源"; + public static final String SERVER_ERROR_STR = "后台错误"; + public static final String SRC_TIMEOUT_STR = "请求第三方资源超时"; private int code; private String msg; // 只用字符串，如果有其他类型，用 validerr 返回 @@ -32,9 +32,9 @@ public class Result { } public Result(Map validerr) { - this.code = PARAM_ERROR; - this.data = null; - this.msg = "表单验证失败"; + this.code = PARAM_ERROR; + this.data = null; + this.msg = "表单验证失败"; this.validerr = validerr; failedlog(this.msg, this.code); @@ -95,9 +95,10 @@ public class Result { /** * 强转 Record * TODO 可能会有类型转换错误 + * * @return Record */ - @JSONField(serialize=false) + @JSONField(serialize = false) public Record getRecordData() { return data != null ? (Record) data : null; } @@ -147,7 +148,7 @@ public class Result { return new Result(Result.PARAM_ERROR, null, String.format(format, objs)); } - public static Result failed(Map validerr){ + public static Result failed(Map validerr) { return new Result(validerr); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/AuthResult.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/AuthResult.java index c279148..4e175fb 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/AuthResult.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/AuthResult.java @@ -5,7 +5,7 @@ public class AuthResult { private Sysuser sysuser; public AuthResult(String token, Sysuser sysuser) { - this.token = token; + this.token = token; this.sysuser = sysuser; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTrash.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTrash.java index 2ba99f1..f6499f5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTrash.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/OrderTrash.java @@ -6,7 +6,7 @@ import com.cowr.model.base.BaseOrderTrash; * Generated by COWR Sun Apr 12 21:56:10 CST 2020 * TableName: order_trash * Remarks: 订单相关 - 废料运出单 - + *

* PrimaryKey: sn */ @SuppressWarnings("serial") diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/PostLicenseResult.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/PostLicenseResult.java index 7afc3c8..76f7da3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/PostLicenseResult.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/PostLicenseResult.java @@ -17,19 +17,19 @@ public class PostLicenseResult { private boolean access; public PostLicenseResult(String license) { - this.license = license; - this.uploaded = false; + this.license = license; + this.uploaded = false; this.transport_id = null; - this.access = false; - this.flow = null; + this.access = false; + this.flow = null; } public PostLicenseResult(String license, boolean uploaded, String transport_id, boolean access) { - this.license = license; - this.uploaded = uploaded; + this.license = license; + this.uploaded = uploaded; this.transport_id = transport_id; - this.access = access; - this.flow = null; + this.access = access; + this.flow = null; } public String getLicense() { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayDetailStateHistory.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayDetailStateHistory.java index d25191a..29f411f 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayDetailStateHistory.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/PrepayDetailStateHistory.java @@ -6,7 +6,7 @@ import com.cowr.model.base.BasePrepayDetailStateHistory; * Generated by COWR Sun Apr 12 21:56:10 CST 2020 * TableName: prepay_detail_state_history * Remarks: 客户相关 - 客户预付费记录状态变化日志 - + *

* PrimaryKey: id */ @SuppressWarnings("serial") diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java index 01a6589..536f7a7 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketSandfarmDistance.java @@ -6,7 +6,7 @@ import com.cowr.model.base.BaseSupermarketSandfarmDistance; * Generated by COWR Sun Apr 12 21:56:10 CST 2020 * TableName: supermarket_sandfarm_distance * Remarks: 基础配置 - 生产点到销售点的距离配置 - + *

* PrimaryKey: supermarket_id,sandfarm_id */ @SuppressWarnings("serial") diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SyncTask.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/SyncTask.java index 2fb5eac..2054fc3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/SyncTask.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/SyncTask.java @@ -17,15 +17,15 @@ import com.jfinal.kit.StrKit; public class SyncTask extends BaseSyncTask { public static final SyncTask dao = new SyncTask().dao(); - private JSONObject _save_data = new JSONObject(); - private JSONObject _update_data = new JSONObject(); - private JSONObject _delete_data = new JSONObject(); + private JSONObject _save_data = new JSONObject(); + private JSONObject _update_data = new JSONObject(); + private JSONObject _delete_data = new JSONObject(); private JSONObject _increment_data = new JSONObject(); - private SyncTask add(JSONObject obj, BaseModel model){ + private SyncTask add(JSONObject obj, BaseModel model) { String key = model.getTablename(); - if(!obj.containsKey(key)){ + if (!obj.containsKey(key)) { JSONObject data = new JSONObject(); data.put("pks", StrKit.join(model.getPKey(), ",")); data.put("data", new JSONArray()); @@ -38,23 +38,23 @@ public class SyncTask extends BaseSyncTask { return this; } - public SyncTask addSaveData(BaseModel model){ + public SyncTask addSaveData(BaseModel model) { return add(_save_data, model); } - public SyncTask addUpdateData(BaseModel model){ + public SyncTask addUpdateData(BaseModel model) { return add(_update_data, model); } - public SyncTask addDeleteData(BaseModel model){ + public SyncTask addDeleteData(BaseModel model) { return add(_delete_data, model); } - public SyncTask addIncrementData(String tablename, String pks, Object pkv, JSONObject obj){ + public SyncTask addIncrementData(String tablename, String pks, Object pkv, JSONObject obj) { return addIncrementData(tablename, pks, new JSONArray().fluentAdd(pkv), obj); } - public SyncTask addIncrementData(String tablename, String pks, JSONArray pkv, JSONObject obj){ + public SyncTask addIncrementData(String tablename, String pks, JSONArray pkv, JSONObject obj) { JSONObject data = new JSONObject(); data.put("pks", pks); data.put("pkv", pkv); @@ -64,17 +64,17 @@ public class SyncTask extends BaseSyncTask { return this; } - public void setJson(){ - if(!_save_data.isEmpty() && this.getSaveData() == null){ + public void setJson() { + if (!_save_data.isEmpty() && this.getSaveData() == null) { this.setSaveData(JSONObject.toJSONString(_save_data, SerializerFeature.WriteDateUseDateFormat)); // 新增的数据，就不要发送 null 值了 } - if(!_update_data.isEmpty() && this.getUpdateData() == null){ // 修改的数据，可以发送 null，有的字段要设置为 null + if (!_update_data.isEmpty() && this.getUpdateData() == null) { // 修改的数据，可以发送 null，有的字段要设置为 null this.setUpdateData(JSONObject.toJSONString(_update_data, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteDateUseDateFormat)); } - if(!_delete_data.isEmpty() && this.getDeleteData() == null){ + if (!_delete_data.isEmpty() && this.getDeleteData() == null) { this.setDeleteData(JSONObject.toJSONString(_delete_data, SerializerFeature.WriteDateUseDateFormat)); } - if(!_increment_data.isEmpty() && this.getIncrementData() == null){ + if (!_increment_data.isEmpty() && this.getIncrementData() == null) { this.setIncrementData(JSONObject.toJSONString(_increment_data)); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigSale.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigSale.java index c69ed7f..a17e915 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigSale.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigSale.java @@ -6,7 +6,7 @@ import com.cowr.model.base.BaseTransPriceConfigSale; * Generated by COWR Sun Apr 12 21:56:10 CST 2020 * TableName: trans_price_config_sale * Remarks: 系统配置 - 销售运费配置信息 - + *

* PrimaryKey: id */ @SuppressWarnings("serial") diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTransfer.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTransfer.java index bf3b392..7673322 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTransfer.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTransfer.java @@ -6,7 +6,7 @@ import com.cowr.model.base.BaseTransPriceConfigTransfer; * Generated by COWR Sun Apr 12 21:56:10 CST 2020 * TableName: trans_price_config_transfer * Remarks: 系统配置 - 转运运费配置信息 - + *

* PrimaryKey: id */ @SuppressWarnings("serial") diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTrash.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTrash.java index 88d54cd..32e938b 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTrash.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/TransPriceConfigTrash.java @@ -6,7 +6,7 @@ import com.cowr.model.base.BaseTransPriceConfigTrash; * Generated by COWR Sun Apr 12 21:56:10 CST 2020 * TableName: trans_price_config_trash * Remarks: 系统配置 - 废料运费配置信息 - + *

* PrimaryKey: id */ @SuppressWarnings("serial") diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java index 0b58258..d712884 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseActionCmdLog.java @@ -15,8 +15,8 @@ public abstract class BaseActionCmdLog> extends Ba public static final String tablename = "action_cmd_log"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseActionCmdLog> extends Ba * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseActionCmdLog> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserId 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** * @return create_user_id 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -69,19 +71,20 @@ public abstract class BaseActionCmdLog> extends Ba * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -92,18 +95,19 @@ public abstract class BaseActionCmdLog> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 最后修改时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 最后修改时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -113,19 +117,20 @@ public abstract class BaseActionCmdLog> extends Ba * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param content 指令内容 */ - @JSONField(name="content") + @JSONField(name = "content") public void setContent(String content) { set("content", content); } - + /** * @return content 指令内容 */ - @JSONField(name="content") + @JSONField(name = "content") public String getContent() { return getStr("content"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAuthLicense.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAuthLicense.java index 35fba00..58ccd95 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAuthLicense.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseAuthLicense.java @@ -15,8 +15,8 @@ public abstract class BaseAuthLicense> extends Base public static final String tablename = "auth_license"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseAuthLicense> extends Base * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param truckLicense + * defaultValue: + * + * @param truckLicense */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** - * @return truck_license + * @return truck_license */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -48,18 +49,19 @@ public abstract class BaseAuthLicense> extends Base * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 加入时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 加入时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseBlacklist.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseBlacklist.java index 222c50c..dc80e7b 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseBlacklist.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseBlacklist.java @@ -15,8 +15,8 @@ public abstract class BaseBlacklist> extends BaseMode public static final String tablename = "blacklist"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id 使用uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id 使用uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param truckLicense 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** * @return truck_license 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -69,19 +71,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: VARCHAR(8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param driverName 司机姓名 */ - @JSONField(name="driver_name") + @JSONField(name = "driver_name") public void setDriverName(String driverName) { set("driver_name", driverName); } - + /** * @return driver_name 司机姓名 */ - @JSONField(name="driver_name") + @JSONField(name = "driver_name") public String getDriverName() { return getStr("driver_name"); } @@ -91,19 +94,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: VARCHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param driverPhone 司机手机号 */ - @JSONField(name="driver_phone") + @JSONField(name = "driver_phone") public void setDriverPhone(String driverPhone) { set("driver_phone", driverPhone); } - + /** * @return driver_phone 司机手机号 */ - @JSONField(name="driver_phone") + @JSONField(name = "driver_phone") public String getDriverPhone() { return getStr("driver_phone"); } @@ -113,19 +117,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: VARCHAR(16) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param orderSn 关联的订单 */ - @JSONField(name="order_sn") + @JSONField(name = "order_sn") public void setOrderSn(String orderSn) { set("order_sn", orderSn); } - + /** * @return order_sn 关联的订单 */ - @JSONField(name="order_sn") + @JSONField(name = "order_sn") public String getOrderSn() { return getStr("order_sn"); } @@ -135,19 +140,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param setTime + * defaultValue: + * + * @param setTime */ - @JSONField(name="set_time") + @JSONField(name = "set_time") public void setSetTime(java.util.Date setTime) { set("set_time", setTime); } - + /** - * @return set_time + * @return set_time */ - @JSONField(name="set_time") + @JSONField(name = "set_time") public java.util.Date getSetTime() { return get("set_time"); } @@ -157,19 +163,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param setUserId + * defaultValue: + * + * @param setUserId */ - @JSONField(name="set_user_id") + @JSONField(name = "set_user_id") public void setSetUserId(Integer setUserId) { set("set_user_id", setUserId); } - + /** - * @return set_user_id + * @return set_user_id */ - @JSONField(name="set_user_id") + @JSONField(name = "set_user_id") public Integer getSetUserId() { return getInt("set_user_id"); } @@ -179,19 +186,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param setUserName + * defaultValue: + * + * @param setUserName */ - @JSONField(name="set_user_name") + @JSONField(name = "set_user_name") public void setSetUserName(String setUserName) { set("set_user_name", setUserName); } - + /** - * @return set_user_name + * @return set_user_name */ - @JSONField(name="set_user_name") + @JSONField(name = "set_user_name") public String getSetUserName() { return getStr("set_user_name"); } @@ -201,19 +209,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param removeTime + * defaultValue: + * + * @param removeTime */ - @JSONField(name="remove_time") + @JSONField(name = "remove_time") public void setRemoveTime(java.util.Date removeTime) { set("remove_time", removeTime); } - + /** - * @return remove_time + * @return remove_time */ - @JSONField(name="remove_time") + @JSONField(name = "remove_time") public java.util.Date getRemoveTime() { return get("remove_time"); } @@ -223,19 +232,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param removeUserId remove_user_id 为空的，表示该车辆还在黑名单中，不能进场 */ - @JSONField(name="remove_user_id") + @JSONField(name = "remove_user_id") public void setRemoveUserId(Integer removeUserId) { set("remove_user_id", removeUserId); } - + /** * @return remove_user_id remove_user_id 为空的，表示该车辆还在黑名单中，不能进场 */ - @JSONField(name="remove_user_id") + @JSONField(name = "remove_user_id") public Integer getRemoveUserId() { return getInt("remove_user_id"); } @@ -245,19 +255,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param removeUserName + * defaultValue: + * + * @param removeUserName */ - @JSONField(name="remove_user_name") + @JSONField(name = "remove_user_name") public void setRemoveUserName(String removeUserName) { set("remove_user_name", removeUserName); } - + /** - * @return remove_user_name + * @return remove_user_name */ - @JSONField(name="remove_user_name") + @JSONField(name = "remove_user_name") public String getRemoveUserName() { return getStr("remove_user_name"); } @@ -268,22 +279,23 @@ public abstract class BaseBlacklist> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param reasonType 1，不服从管理 -2，舞弊行为 -9，其他 + * 2，舞弊行为 + * 9，其他 */ - @JSONField(name="reason_type") + @JSONField(name = "reason_type") public void setReasonType(Integer reasonType) { set("reason_type", reasonType); } - + /** * @return reason_type 1，不服从管理 -2，舞弊行为 -9，其他 + * 2，舞弊行为 + * 9，其他 */ - @JSONField(name="reason_type") + @JSONField(name = "reason_type") public Integer getReasonType() { return getInt("reason_type"); } @@ -293,19 +305,20 @@ public abstract class BaseBlacklist> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param reasonDetail + * defaultValue: + * + * @param reasonDetail */ - @JSONField(name="reason_detail") + @JSONField(name = "reason_detail") public void setReasonDetail(String reasonDetail) { set("reason_detail", reasonDetail); } - + /** - * @return reason_detail + * @return reason_detail */ - @JSONField(name="reason_detail") + @JSONField(name = "reason_detail") public String getReasonDetail() { return getStr("reason_detail"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctv.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctv.java index 5812805..5290495 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctv.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctv.java @@ -15,8 +15,8 @@ public abstract class BaseCctv> extends BaseModel imple public static final String tablename = "cctv"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param unitId id */ - @JSONField(name="unit_id") + @JSONField(name = "unit_id") public void setUnitId(java.lang.String unitId) { set("unit_id", unitId); } - + /** * @return unit_id id */ - @JSONField(name="unit_id") + @JSONField(name = "unit_id") public java.lang.String getUnitId() { return getStr("unit_id"); } @@ -47,19 +48,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param unitName 名称 */ - @JSONField(name="unit_name") + @JSONField(name = "unit_name") public void setUnitName(java.lang.String unitName) { set("unit_name", unitName); } - + /** * @return unit_name 名称 */ - @JSONField(name="unit_name") + @JSONField(name = "unit_name") public java.lang.String getUnitName() { return getStr("unit_name"); } @@ -69,19 +71,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param unitType 监控对象，1.销售点、2.生产点 */ - @JSONField(name="unit_type") + @JSONField(name = "unit_type") public void setUnitType(java.lang.Integer unitType) { set("unit_type", unitType); } - + /** * @return unit_type 监控对象，1.销售点、2.生产点 */ - @JSONField(name="unit_type") + @JSONField(name = "unit_type") public java.lang.Integer getUnitType() { return getInt("unit_type"); } @@ -91,19 +94,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param ip 外网ip */ - @JSONField(name="ip") + @JSONField(name = "ip") public void setIp(java.lang.String ip) { set("ip", ip); } - + /** * @return ip 外网ip */ - @JSONField(name="ip") + @JSONField(name = "ip") public java.lang.String getIp() { return getStr("ip"); } @@ -113,19 +117,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param intranetIp 内网ip */ - @JSONField(name="Intranet_ip") + @JSONField(name = "Intranet_ip") public void setIntranetIp(java.lang.String intranetIp) { set("Intranet_ip", intranetIp); } - + /** * @return Intranet_ip 内网ip */ - @JSONField(name="Intranet_ip") + @JSONField(name = "Intranet_ip") public java.lang.String getIntranetIp() { return getStr("Intranet_ip"); } @@ -135,19 +140,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param port 外网端口 */ - @JSONField(name="port") + @JSONField(name = "port") public void setPort(java.lang.Integer port) { set("port", port); } - + /** * @return port 外网端口 */ - @JSONField(name="port") + @JSONField(name = "port") public java.lang.Integer getPort() { return getInt("port"); } @@ -157,19 +163,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param intranetPort 内网端口 */ - @JSONField(name="Intranet_port") + @JSONField(name = "Intranet_port") public void setIntranetPort(java.lang.String intranetPort) { set("Intranet_port", intranetPort); } - + /** * @return Intranet_port 内网端口 */ - @JSONField(name="Intranet_port") + @JSONField(name = "Intranet_port") public java.lang.String getIntranetPort() { return getStr("Intranet_port"); } @@ -179,19 +186,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param u 硬盘录像机账号 */ - @JSONField(name="u") + @JSONField(name = "u") public void setU(java.lang.String u) { set("u", u); } - + /** * @return u 硬盘录像机账号 */ - @JSONField(name="u") + @JSONField(name = "u") public java.lang.String getU() { return getStr("u"); } @@ -201,19 +209,20 @@ public abstract class BaseCctv> extends BaseModel imple * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param p 硬盘录像机密码 */ - @JSONField(name="p") + @JSONField(name = "p") public void setP(java.lang.String p) { set("p", p); } - + /** * @return p 硬盘录像机密码 */ - @JSONField(name="p") + @JSONField(name = "p") public java.lang.String getP() { return getStr("p"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctvChannels.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctvChannels.java index 990ebf3..ac4ae4a 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctvChannels.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCctvChannels.java @@ -15,8 +15,8 @@ public abstract class BaseCctvChannels> extends Ba public static final String tablename = "cctv_channels"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseCctvChannels> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id 通道id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** * @return id 通道id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseCctvChannels> extends Ba * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param unitId 砂站id，砂场id前加 s */ - @JSONField(name="unit_id") + @JSONField(name = "unit_id") public void setUnitId(java.lang.String unitId) { set("unit_id", unitId); } - + /** * @return unit_id 砂站id，砂场id前加 s */ - @JSONField(name="unit_id") + @JSONField(name = "unit_id") public java.lang.String getUnitId() { return getStr("unit_id"); } @@ -69,19 +71,20 @@ public abstract class BaseCctvChannels> extends Ba * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name 名称 */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** * @return name 名称 */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -92,18 +95,19 @@ public abstract class BaseCctvChannels> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param defaultSelect 是否默认选中 */ - @JSONField(name="default_select") + @JSONField(name = "default_select") public void setDefaultSelect(java.lang.Integer defaultSelect) { set("default_select", defaultSelect); } - + /** * @return default_select 是否默认选中 */ - @JSONField(name="default_select") + @JSONField(name = "default_select") public java.lang.Integer getDefaultSelect() { return getInt("default_select"); } @@ -113,19 +117,20 @@ public abstract class BaseCctvChannels> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param unitType 监控对象，1.销售点、2.生产点 */ - @JSONField(name="unit_type") + @JSONField(name = "unit_type") public void setUnitType(java.lang.Integer unitType) { set("unit_type", unitType); } - + /** * @return unit_type 监控对象，1.销售点、2.生产点 */ - @JSONField(name="unit_type") + @JSONField(name = "unit_type") public java.lang.Integer getUnitType() { return getInt("unit_type"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomer.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomer.java index 377bfb2..39f74b0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomer.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomer.java @@ -15,8 +15,8 @@ public abstract class BaseCustomer> extends BaseModel< public static final String tablename = "customer"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param name + * defaultValue: + * + * @param name */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(String name) { set("name", name); } - + /** - * @return name + * @return name */ - @JSONField(name="name") + @JSONField(name = "name") public String getName() { return getStr("name"); } @@ -69,19 +71,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param address 开票地址 */ - @JSONField(name="address") + @JSONField(name = "address") public void setAddress(String address) { set("address", address); } - + /** * @return address 开票地址 */ - @JSONField(name="address") + @JSONField(name = "address") public String getAddress() { return getStr("address"); } @@ -91,19 +94,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param phone 开票电话（可以是座机） */ - @JSONField(name="phone") + @JSONField(name = "phone") public void setPhone(String phone) { set("phone", phone); } - + /** * @return phone 开票电话（可以是座机） */ - @JSONField(name="phone") + @JSONField(name = "phone") public String getPhone() { return getStr("phone"); } @@ -113,19 +117,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param texpayerName 开票公司名称 */ - @JSONField(name="texpayer_name") + @JSONField(name = "texpayer_name") public void setTexpayerName(String texpayerName) { set("texpayer_name", texpayerName); } - + /** * @return texpayer_name 开票公司名称 */ - @JSONField(name="texpayer_name") + @JSONField(name = "texpayer_name") public String getTexpayerName() { return getStr("texpayer_name"); } @@ -135,19 +140,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param texpayerNum 税号 */ - @JSONField(name="texpayer_num") + @JSONField(name = "texpayer_num") public void setTexpayerNum(String texpayerNum) { set("texpayer_num", texpayerNum); } - + /** * @return texpayer_num 税号 */ - @JSONField(name="texpayer_num") + @JSONField(name = "texpayer_num") public String getTexpayerNum() { return getStr("texpayer_num"); } @@ -157,19 +163,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bankName 开户行名称 */ - @JSONField(name="bank_name") + @JSONField(name = "bank_name") public void setBankName(String bankName) { set("bank_name", bankName); } - + /** * @return bank_name 开户行名称 */ - @JSONField(name="bank_name") + @JSONField(name = "bank_name") public String getBankName() { return getStr("bank_name"); } @@ -179,19 +186,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bankAccount 开户行账号 */ - @JSONField(name="bank_account") + @JSONField(name = "bank_account") public void setBankAccount(String bankAccount) { set("bank_account", bankAccount); } - + /** * @return bank_account 开户行账号 */ - @JSONField(name="bank_account") + @JSONField(name = "bank_account") public String getBankAccount() { return getStr("bank_account"); } @@ -201,19 +209,20 @@ public abstract class BaseCustomer> extends BaseModel< * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param memo + * defaultValue: + * + * @param memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(String memo) { set("memo", memo); } - + /** - * @return memo + * @return memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public String getMemo() { return getStr("memo"); } @@ -224,18 +233,19 @@ public abstract class BaseCustomer> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 - * @param del + * + * @param del */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(Integer del) { set("del", del); } - + /** - * @return del + * @return del */ - @JSONField(name="del") + @JSONField(name = "del") public Integer getDel() { return getInt("del"); } @@ -246,18 +256,19 @@ public abstract class BaseCustomer> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param type 是否预付费客户，0.不是，1.是 */ - @JSONField(name="type") + @JSONField(name = "type") public void setType(Integer type) { set("type", type); } - + /** * @return type 是否预付费客户，0.不是，1.是 */ - @JSONField(name="type") + @JSONField(name = "type") public Integer getType() { return getInt("type"); } @@ -268,18 +279,19 @@ public abstract class BaseCustomer> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param invoiceType 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public void setInvoiceType(Integer invoiceType) { set("invoice_type", invoiceType); } - + /** * @return invoice_type 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public Integer getInvoiceType() { return getInt("invoice_type"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContact.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContact.java index 2be965d..e6f90cd 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContact.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerContact.java @@ -15,8 +15,8 @@ public abstract class BaseCustomerContact> exte public static final String tablename = "customer_contact"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseCustomerContact> exte * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseCustomerContact> exte * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerId 客户id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(java.lang.Integer customerId) { set("customer_id", customerId); } - + /** * @return customer_id 客户id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public java.lang.Integer getCustomerId() { return getInt("customer_id"); } @@ -69,19 +71,20 @@ public abstract class BaseCustomerContact> exte * type: VARCHAR(100) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name 姓名 */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** * @return name 姓名 */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -91,19 +94,20 @@ public abstract class BaseCustomerContact> exte * type: VARCHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param phone 电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public void setPhone(java.lang.String phone) { set("phone", phone); } - + /** * @return phone 电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public java.lang.String getPhone() { return getStr("phone"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerPact.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerPact.java index 183cf76..79160d3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerPact.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerPact.java @@ -15,8 +15,8 @@ public abstract class BaseCustomerPact> extends Ba public static final String tablename = "customer_pact"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseCustomerPact> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseCustomerPact> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param customerId + * defaultValue: + * + * @param customerId */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** - * @return customer_id + * @return customer_id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public Integer getCustomerId() { return getInt("customer_id"); } @@ -69,19 +71,20 @@ public abstract class BaseCustomerPact> extends Ba * type: DATE(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param signTime 签订日期 */ - @JSONField(name="sign_time") + @JSONField(name = "sign_time") public void setSignTime(java.util.Date signTime) { set("sign_time", signTime); } - + /** * @return sign_time 签订日期 */ - @JSONField(name="sign_time") + @JSONField(name = "sign_time") public java.util.Date getSignTime() { return get("sign_time"); } @@ -91,19 +94,20 @@ public abstract class BaseCustomerPact> extends Ba * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param singTotalPrice 总价 */ - @JSONField(name="sing_total_price") + @JSONField(name = "sing_total_price") public void setSingTotalPrice(java.math.BigDecimal singTotalPrice) { set("sing_total_price", singTotalPrice); } - + /** * @return sing_total_price 总价 */ - @JSONField(name="sing_total_price") + @JSONField(name = "sing_total_price") public java.math.BigDecimal getSingTotalPrice() { return get("sing_total_price"); } @@ -113,19 +117,20 @@ public abstract class BaseCustomerPact> extends Ba * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param singTotalWeight 总吨数 */ - @JSONField(name="sing_total_weight") + @JSONField(name = "sing_total_weight") public void setSingTotalWeight(java.math.BigDecimal singTotalWeight) { set("sing_total_weight", singTotalWeight); } - + /** * @return sing_total_weight 总吨数 */ - @JSONField(name="sing_total_weight") + @JSONField(name = "sing_total_weight") public java.math.BigDecimal getSingTotalWeight() { return get("sing_total_weight"); } @@ -135,19 +140,20 @@ public abstract class BaseCustomerPact> extends Ba * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param signUserName 签订人 */ - @JSONField(name="sign_user_name") + @JSONField(name = "sign_user_name") public void setSignUserName(String signUserName) { set("sign_user_name", signUserName); } - + /** * @return sign_user_name 签订人 */ - @JSONField(name="sign_user_name") + @JSONField(name = "sign_user_name") public String getSignUserName() { return getStr("sign_user_name"); } @@ -157,19 +163,20 @@ public abstract class BaseCustomerPact> extends Ba * type: DATE(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param cutoffTime 截止时间 */ - @JSONField(name="cutoff_time") + @JSONField(name = "cutoff_time") public void setCutoffTime(java.util.Date cutoffTime) { set("cutoff_time", cutoffTime); } - + /** * @return cutoff_time 截止时间 */ - @JSONField(name="cutoff_time") + @JSONField(name = "cutoff_time") public java.util.Date getCutoffTime() { return get("cutoff_time"); } @@ -180,18 +187,19 @@ public abstract class BaseCustomerPact> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 - * @param del + * + * @param del */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(Integer del) { set("del", del); } - + /** - * @return del + * @return del */ - @JSONField(name="del") + @JSONField(name = "del") public Integer getDel() { return getInt("del"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java index 6dc53a2..db32312 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerReceiver.java @@ -15,8 +15,8 @@ public abstract class BaseCustomerReceiver> ex public static final String tablename = "customer_receiver"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseCustomerReceiver> ex * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseCustomerReceiver> ex * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param customerId + * defaultValue: + * + * @param customerId */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(java.lang.Integer customerId) { set("customer_id", customerId); } - + /** - * @return customer_id + * @return customer_id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public java.lang.Integer getCustomerId() { return getInt("customer_id"); } @@ -69,19 +71,20 @@ public abstract class BaseCustomerReceiver> ex * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name 收货人姓名 */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** * @return name 收货人姓名 */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -91,19 +94,20 @@ public abstract class BaseCustomerReceiver> ex * type: CHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param phone 收货人电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public void setPhone(java.lang.String phone) { set("phone", phone); } - + /** * @return phone 收货人电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public java.lang.String getPhone() { return getStr("phone"); } @@ -113,19 +117,20 @@ public abstract class BaseCustomerReceiver> ex * type: VARCHAR(256) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param address 收货地址 */ - @JSONField(name="address") + @JSONField(name = "address") public void setAddress(java.lang.String address) { set("address", address); } - + /** * @return address 收货地址 */ - @JSONField(name="address") + @JSONField(name = "address") public java.lang.String getAddress() { return getStr("address"); } @@ -135,19 +140,20 @@ public abstract class BaseCustomerReceiver> ex * type: DECIMAL(12,8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param lgtd 收货经度 */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public void setLgtd(java.math.BigDecimal lgtd) { set("lgtd", lgtd); } - + /** * @return lgtd 收货经度 */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public java.math.BigDecimal getLgtd() { return get("lgtd"); } @@ -157,19 +163,20 @@ public abstract class BaseCustomerReceiver> ex * type: DECIMAL(12,8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param lttd 收货纬度 */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public void setLttd(java.math.BigDecimal lttd) { set("lttd", lttd); } - + /** * @return lttd 收货纬度 */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public java.math.BigDecimal getLttd() { return get("lttd"); } @@ -179,19 +186,20 @@ public abstract class BaseCustomerReceiver> ex * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(java.lang.String memo) { set("memo", memo); } - + /** * @return memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public java.lang.String getMemo() { return getStr("memo"); } @@ -202,18 +210,19 @@ public abstract class BaseCustomerReceiver> ex * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param isdefault 默认收获地址，1 是设置为默认 */ - @JSONField(name="isdefault") + @JSONField(name = "isdefault") public void setIsdefault(java.lang.Integer isdefault) { set("isdefault", isdefault); } - + /** * @return isdefault 默认收获地址，1 是设置为默认 */ - @JSONField(name="isdefault") + @JSONField(name = "isdefault") public java.lang.Integer getIsdefault() { return getInt("isdefault"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerRegister.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerRegister.java index 83d0fc7..82258d8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerRegister.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseCustomerRegister.java @@ -15,8 +15,8 @@ public abstract class BaseCustomerRegister> ex public static final String tablename = "customer_register"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseCustomerRegister> ex * type: BIGINT(19) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(Long id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public Long getId() { return getLong("id"); } @@ -47,19 +48,20 @@ public abstract class BaseCustomerRegister> ex * type: CHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param sysuserPhone 电话 */ - @JSONField(name="sysuser_phone") + @JSONField(name = "sysuser_phone") public void setSysuserPhone(String sysuserPhone) { set("sysuser_phone", sysuserPhone); } - + /** * @return sysuser_phone 电话 */ - @JSONField(name="sysuser_phone") + @JSONField(name = "sysuser_phone") public String getSysuserPhone() { return getStr("sysuser_phone"); } @@ -69,19 +71,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(64) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param sysuserPassword 密码 */ - @JSONField(name="sysuser_password") + @JSONField(name = "sysuser_password") public void setSysuserPassword(String sysuserPassword) { set("sysuser_password", sysuserPassword); } - + /** * @return sysuser_password 密码 */ - @JSONField(name="sysuser_password") + @JSONField(name = "sysuser_password") public String getSysuserPassword() { return getStr("sysuser_password"); } @@ -91,19 +94,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param sysuserName 姓名 */ - @JSONField(name="sysuser_name") + @JSONField(name = "sysuser_name") public void setSysuserName(String sysuserName) { set("sysuser_name", sysuserName); } - + /** * @return sysuser_name 姓名 */ - @JSONField(name="sysuser_name") + @JSONField(name = "sysuser_name") public String getSysuserName() { return getStr("sysuser_name"); } @@ -113,19 +117,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(256) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerAddress 开票地址 */ - @JSONField(name="customer_address") + @JSONField(name = "customer_address") public void setCustomerAddress(String customerAddress) { set("customer_address", customerAddress); } - + /** * @return customer_address 开票地址 */ - @JSONField(name="customer_address") + @JSONField(name = "customer_address") public String getCustomerAddress() { return getStr("customer_address"); } @@ -135,19 +140,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerPhone 开票电话（可以是座机） */ - @JSONField(name="customer_phone") + @JSONField(name = "customer_phone") public void setCustomerPhone(String customerPhone) { set("customer_phone", customerPhone); } - + /** * @return customer_phone 开票电话（可以是座机） */ - @JSONField(name="customer_phone") + @JSONField(name = "customer_phone") public String getCustomerPhone() { return getStr("customer_phone"); } @@ -157,19 +163,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerTexpayerName 开票公司名称 */ - @JSONField(name="customer_texpayer_name") + @JSONField(name = "customer_texpayer_name") public void setCustomerTexpayerName(String customerTexpayerName) { set("customer_texpayer_name", customerTexpayerName); } - + /** * @return customer_texpayer_name 开票公司名称 */ - @JSONField(name="customer_texpayer_name") + @JSONField(name = "customer_texpayer_name") public String getCustomerTexpayerName() { return getStr("customer_texpayer_name"); } @@ -179,19 +186,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerTexpayerNum 税号 */ - @JSONField(name="customer_texpayer_num") + @JSONField(name = "customer_texpayer_num") public void setCustomerTexpayerNum(String customerTexpayerNum) { set("customer_texpayer_num", customerTexpayerNum); } - + /** * @return customer_texpayer_num 税号 */ - @JSONField(name="customer_texpayer_num") + @JSONField(name = "customer_texpayer_num") public String getCustomerTexpayerNum() { return getStr("customer_texpayer_num"); } @@ -201,19 +209,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerBankName 开户行名称 */ - @JSONField(name="customer_bank_name") + @JSONField(name = "customer_bank_name") public void setCustomerBankName(String customerBankName) { set("customer_bank_name", customerBankName); } - + /** * @return customer_bank_name 开户行名称 */ - @JSONField(name="customer_bank_name") + @JSONField(name = "customer_bank_name") public String getCustomerBankName() { return getStr("customer_bank_name"); } @@ -223,19 +232,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerBankAccount 开户行账号 */ - @JSONField(name="customer_bank_account") + @JSONField(name = "customer_bank_account") public void setCustomerBankAccount(String customerBankAccount) { set("customer_bank_account", customerBankAccount); } - + /** * @return customer_bank_account 开户行账号 */ - @JSONField(name="customer_bank_account") + @JSONField(name = "customer_bank_account") public String getCustomerBankAccount() { return getStr("customer_bank_account"); } @@ -245,19 +255,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param receiverName 收货人姓名 */ - @JSONField(name="receiver_name") + @JSONField(name = "receiver_name") public void setReceiverName(String receiverName) { set("receiver_name", receiverName); } - + /** * @return receiver_name 收货人姓名 */ - @JSONField(name="receiver_name") + @JSONField(name = "receiver_name") public String getReceiverName() { return getStr("receiver_name"); } @@ -267,19 +278,20 @@ public abstract class BaseCustomerRegister> ex * type: CHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param receiverPhone 收货人电话 */ - @JSONField(name="receiver_phone") + @JSONField(name = "receiver_phone") public void setReceiverPhone(String receiverPhone) { set("receiver_phone", receiverPhone); } - + /** * @return receiver_phone 收货人电话 */ - @JSONField(name="receiver_phone") + @JSONField(name = "receiver_phone") public String getReceiverPhone() { return getStr("receiver_phone"); } @@ -289,19 +301,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(256) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param receiverAddress 收货地址 */ - @JSONField(name="receiver_address") + @JSONField(name = "receiver_address") public void setReceiverAddress(String receiverAddress) { set("receiver_address", receiverAddress); } - + /** * @return receiver_address 收货地址 */ - @JSONField(name="receiver_address") + @JSONField(name = "receiver_address") public String getReceiverAddress() { return getStr("receiver_address"); } @@ -311,19 +324,20 @@ public abstract class BaseCustomerRegister> ex * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param state 1 新申请，5 审核通过，9 审核未通过或过期 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1 新申请，5 审核通过，9 审核未通过或过期 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -334,18 +348,19 @@ public abstract class BaseCustomerRegister> ex * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -356,18 +371,19 @@ public abstract class BaseCustomerRegister> ex * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -377,19 +393,20 @@ public abstract class BaseCustomerRegister> ex * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param verifyTime 审核时间，不论审核是否通过都更新 */ - @JSONField(name="verify_time") + @JSONField(name = "verify_time") public void setVerifyTime(java.util.Date verifyTime) { set("verify_time", verifyTime); } - + /** * @return verify_time 审核时间，不论审核是否通过都更新 */ - @JSONField(name="verify_time") + @JSONField(name = "verify_time") public java.util.Date getVerifyTime() { return get("verify_time"); } @@ -399,19 +416,20 @@ public abstract class BaseCustomerRegister> ex * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param verifyUserId 审核用户id */ - @JSONField(name="verify_user_id") + @JSONField(name = "verify_user_id") public void setVerifyUserId(Integer verifyUserId) { set("verify_user_id", verifyUserId); } - + /** * @return verify_user_id 审核用户id */ - @JSONField(name="verify_user_id") + @JSONField(name = "verify_user_id") public Integer getVerifyUserId() { return getInt("verify_user_id"); } @@ -421,19 +439,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param verifyUserName 审核用户姓名 */ - @JSONField(name="verify_user_name") + @JSONField(name = "verify_user_name") public void setVerifyUserName(String verifyUserName) { set("verify_user_name", verifyUserName); } - + /** * @return verify_user_name 审核用户姓名 */ - @JSONField(name="verify_user_name") + @JSONField(name = "verify_user_name") public String getVerifyUserName() { return getStr("verify_user_name"); } @@ -443,19 +462,20 @@ public abstract class BaseCustomerRegister> ex * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param verifyMemo 审核说明 */ - @JSONField(name="verify_memo") + @JSONField(name = "verify_memo") public void setVerifyMemo(String verifyMemo) { set("verify_memo", verifyMemo); } - + /** * @return verify_memo 审核说明 */ - @JSONField(name="verify_memo") + @JSONField(name = "verify_memo") public String getVerifyMemo() { return getStr("verify_memo"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDeviceConfig.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDeviceConfig.java index 6152906..3ecc674 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDeviceConfig.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDeviceConfig.java @@ -15,8 +15,8 @@ public abstract class BaseDeviceConfig> extends Ba public static final String tablename = "device_config"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseDeviceConfig> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -47,57 +48,58 @@ public abstract class BaseDeviceConfig> extends Ba * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param content { - cameras: [ - { id: 'in', ip: '', port: 123 }, - { id: 'out', ip: '', port: 123 } - ], - - scales: [ - { id: 'in', ip: '', port: 123 }, - { id: 'out', ip: '', port: 123 } - ], - - leds: [ - { id: 'in', ip: '', port: 123 }, - { id: 'out', ip: '', port: 123 } - ] - - plcs: [ - { id: 'all', ip: '', port: 123 } - ] -} + * cameras: [ + * { id: 'in', ip: '', port: 123 }, + * { id: 'out', ip: '', port: 123 } + * ], + *

+ * scales: [ + * { id: 'in', ip: '', port: 123 }, + * { id: 'out', ip: '', port: 123 } + * ], + *

+ * leds: [ + * { id: 'in', ip: '', port: 123 }, + * { id: 'out', ip: '', port: 123 } + * ] + *

+ * plcs: [ + * { id: 'all', ip: '', port: 123 } + * ] + * } */ - @JSONField(name="content") + @JSONField(name = "content") public void setContent(String content) { set("content", content); } - + /** * @return content { - cameras: [ - { id: 'in', ip: '', port: 123 }, - { id: 'out', ip: '', port: 123 } - ], - - scales: [ - { id: 'in', ip: '', port: 123 }, - { id: 'out', ip: '', port: 123 } - ], - - leds: [ - { id: 'in', ip: '', port: 123 }, - { id: 'out', ip: '', port: 123 } - ] - - plcs: [ - { id: 'all', ip: '', port: 123 } - ] -} + * cameras: [ + * { id: 'in', ip: '', port: 123 }, + * { id: 'out', ip: '', port: 123 } + * ], + *

+ * scales: [ + * { id: 'in', ip: '', port: 123 }, + * { id: 'out', ip: '', port: 123 } + * ], + *

+ * leds: [ + * { id: 'in', ip: '', port: 123 }, + * { id: 'out', ip: '', port: 123 } + * ] + *

+ * plcs: [ + * { id: 'all', ip: '', port: 123 } + * ] + * } */ - @JSONField(name="content") + @JSONField(name = "content") public String getContent() { return getStr("content"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDriver.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDriver.java index c8cc8a4..7181a7c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDriver.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseDriver.java @@ -15,8 +15,8 @@ public abstract class BaseDriver> extends BaseModel i public static final String tablename = "driver"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseDriver> extends BaseModel i * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseDriver> extends BaseModel i * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 所属物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(java.lang.Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 所属物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public java.lang.Integer getTransCoId() { return getInt("trans_co_id"); } @@ -69,19 +71,20 @@ public abstract class BaseDriver> extends BaseModel i * type: VARCHAR(8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name 司机姓名 */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** * @return name 司机姓名 */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -91,19 +94,20 @@ public abstract class BaseDriver> extends BaseModel i * type: CHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param phone 司机电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public void setPhone(java.lang.String phone) { set("phone", phone); } - + /** * @return phone 司机电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public java.lang.String getPhone() { return getStr("phone"); } @@ -113,19 +117,20 @@ public abstract class BaseDriver> extends BaseModel i * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param memo + * defaultValue: + * + * @param memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(java.lang.String memo) { set("memo", memo); } - + /** - * @return memo + * @return memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public java.lang.String getMemo() { return getStr("memo"); } @@ -136,18 +141,19 @@ public abstract class BaseDriver> extends BaseModel i * isNullable: YES * isPrimaryKey: NO * defaultValue: 0 + * * @param del 逻辑删除字段 */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(java.lang.Integer del) { set("del", del); } - + /** * @return del 逻辑删除字段 */ - @JSONField(name="del") + @JSONField(name = "del") public java.lang.Integer getDel() { return getInt("del"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceLog.java index 98ff33e..675e940 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceLog.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceLog.java @@ -15,8 +15,8 @@ public abstract class BaseInvoiceLog> extends BaseMo public static final String tablename = "invoice_log"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invoiceReceiveId 领用记录id */ - @JSONField(name="invoice_receive_id") + @JSONField(name = "invoice_receive_id") public void setInvoiceReceiveId(Integer invoiceReceiveId) { set("invoice_receive_id", invoiceReceiveId); } - + /** * @return invoice_receive_id 领用记录id */ - @JSONField(name="invoice_receive_id") + @JSONField(name = "invoice_receive_id") public Integer getInvoiceReceiveId() { return getInt("invoice_receive_id"); } @@ -69,19 +71,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param code 发票代码 */ - @JSONField(name="code") + @JSONField(name = "code") public void setCode(String code) { set("code", code); } - + /** * @return code 发票代码 */ - @JSONField(name="code") + @JSONField(name = "code") public String getCode() { return getStr("code"); } @@ -92,18 +95,19 @@ public abstract class BaseInvoiceLog> extends BaseMo * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -114,18 +118,19 @@ public abstract class BaseInvoiceLog> extends BaseMo * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -136,18 +141,19 @@ public abstract class BaseInvoiceLog> extends BaseMo * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 1 新领取、未使用，5 已使用，9 作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1 新领取、未使用，5 已使用，9 作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -157,19 +163,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementTime 开票时间 */ - @JSONField(name="settlement_time") + @JSONField(name = "settlement_time") public void setSettlementTime(java.util.Date settlementTime) { set("settlement_time", settlementTime); } - + /** * @return settlement_time 开票时间 */ - @JSONField(name="settlement_time") + @JSONField(name = "settlement_time") public java.util.Date getSettlementTime() { return get("settlement_time"); } @@ -179,19 +186,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserId 开票用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public void setSettlementUserId(Integer settlementUserId) { set("settlement_user_id", settlementUserId); } - + /** * @return settlement_user_id 开票用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public Integer getSettlementUserId() { return getInt("settlement_user_id"); } @@ -201,19 +209,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserName 开票用户姓名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public void setSettlementUserName(String settlementUserName) { set("settlement_user_name", settlementUserName); } - + /** * @return settlement_user_name 开票用户姓名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public String getSettlementUserName() { return getStr("settlement_user_name"); } @@ -223,19 +232,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invalidTime 作废时间 */ - @JSONField(name="invalid_time") + @JSONField(name = "invalid_time") public void setInvalidTime(java.util.Date invalidTime) { set("invalid_time", invalidTime); } - + /** * @return invalid_time 作废时间 */ - @JSONField(name="invalid_time") + @JSONField(name = "invalid_time") public java.util.Date getInvalidTime() { return get("invalid_time"); } @@ -245,19 +255,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invalidUserId 作废用户id */ - @JSONField(name="invalid_user_id") + @JSONField(name = "invalid_user_id") public void setInvalidUserId(Integer invalidUserId) { set("invalid_user_id", invalidUserId); } - + /** * @return invalid_user_id 作废用户id */ - @JSONField(name="invalid_user_id") + @JSONField(name = "invalid_user_id") public Integer getInvalidUserId() { return getInt("invalid_user_id"); } @@ -267,19 +278,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invalidUserName 作废用户姓名 */ - @JSONField(name="invalid_user_name") + @JSONField(name = "invalid_user_name") public void setInvalidUserName(String invalidUserName) { set("invalid_user_name", invalidUserName); } - + /** * @return invalid_user_name 作废用户姓名 */ - @JSONField(name="invalid_user_name") + @JSONField(name = "invalid_user_name") public String getInvalidUserName() { return getStr("invalid_user_name"); } @@ -289,19 +301,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invalidMemo 作废说明 */ - @JSONField(name="invalid_memo") + @JSONField(name = "invalid_memo") public void setInvalidMemo(String invalidMemo) { set("invalid_memo", invalidMemo); } - + /** * @return invalid_memo 作废说明 */ - @JSONField(name="invalid_memo") + @JSONField(name = "invalid_memo") public String getInvalidMemo() { return getStr("invalid_memo"); } @@ -311,19 +324,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: CHAR(16) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param orderSn 关联订单号，方便查询 */ - @JSONField(name="order_sn") + @JSONField(name = "order_sn") public void setOrderSn(String orderSn) { set("order_sn", orderSn); } - + /** * @return order_sn 关联订单号，方便查询 */ - @JSONField(name="order_sn") + @JSONField(name = "order_sn") public String getOrderSn() { return getStr("order_sn"); } @@ -333,19 +347,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: SMALLINT(5) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param type 1、2、3、4、5 */ - @JSONField(name="type") + @JSONField(name = "type") public void setType(Integer type) { set("type", type); } - + /** * @return type 1、2、3、4、5 */ - @JSONField(name="type") + @JSONField(name = "type") public Integer getType() { return getInt("type"); } @@ -356,18 +371,19 @@ public abstract class BaseInvoiceLog> extends BaseMo * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param invoiceType 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public void setInvoiceType(Integer invoiceType) { set("invoice_type", invoiceType); } - + /** * @return invoice_type 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public Integer getInvoiceType() { return getInt("invoice_type"); } @@ -377,19 +393,20 @@ public abstract class BaseInvoiceLog> extends BaseMo * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invoiceNumber 发票代码 */ - @JSONField(name="invoice_number") + @JSONField(name = "invoice_number") public void setInvoiceNumber(String invoiceNumber) { set("invoice_number", invoiceNumber); } - + /** * @return invoice_number 发票代码 */ - @JSONField(name="invoice_number") + @JSONField(name = "invoice_number") public String getInvoiceNumber() { return getStr("invoice_number"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java index 89a059c..c8a9cb5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseInvoiceReceive.java @@ -15,8 +15,8 @@ public abstract class BaseInvoiceReceive> extend public static final String tablename = "invoice_receive"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseInvoiceReceive> extend * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseInvoiceReceive> extend * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param surplus 剩余数量 */ - @JSONField(name="surplus") + @JSONField(name = "surplus") public void setSurplus(Integer surplus) { set("surplus", surplus); } - + /** * @return surplus 剩余数量 */ - @JSONField(name="surplus") + @JSONField(name = "surplus") public Integer getSurplus() { return getInt("surplus"); } @@ -69,19 +71,20 @@ public abstract class BaseInvoiceReceive> extend * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param startCode 发票起始号码 */ - @JSONField(name="start_code") + @JSONField(name = "start_code") public void setStartCode(String startCode) { set("start_code", startCode); } - + /** * @return start_code 发票起始号码 */ - @JSONField(name="start_code") + @JSONField(name = "start_code") public String getStartCode() { return getStr("start_code"); } @@ -91,19 +94,20 @@ public abstract class BaseInvoiceReceive> extend * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param endCode 发票截止号码 */ - @JSONField(name="end_code") + @JSONField(name = "end_code") public void setEndCode(String endCode) { set("end_code", endCode); } - + /** * @return end_code 发票截止号码 */ - @JSONField(name="end_code") + @JSONField(name = "end_code") public String getEndCode() { return getStr("end_code"); } @@ -113,19 +117,20 @@ public abstract class BaseInvoiceReceive> extend * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param currentCode 当前使用到的发票号码 */ - @JSONField(name="current_code") + @JSONField(name = "current_code") public void setCurrentCode(String currentCode) { set("current_code", currentCode); } - + /** * @return current_code 当前使用到的发票号码 */ - @JSONField(name="current_code") + @JSONField(name = "current_code") public String getCurrentCode() { return getStr("current_code"); } @@ -136,18 +141,19 @@ public abstract class BaseInvoiceReceive> extend * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -158,18 +164,19 @@ public abstract class BaseInvoiceReceive> extend * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -179,19 +186,20 @@ public abstract class BaseInvoiceReceive> extend * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param receiveUserId 领取用户id */ - @JSONField(name="receive_user_id") + @JSONField(name = "receive_user_id") public void setReceiveUserId(Integer receiveUserId) { set("receive_user_id", receiveUserId); } - + /** * @return receive_user_id 领取用户id */ - @JSONField(name="receive_user_id") + @JSONField(name = "receive_user_id") public Integer getReceiveUserId() { return getInt("receive_user_id"); } @@ -201,19 +209,20 @@ public abstract class BaseInvoiceReceive> extend * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param receiveUserName 领取用户姓名 */ - @JSONField(name="receive_user_name") + @JSONField(name = "receive_user_name") public void setReceiveUserName(String receiveUserName) { set("receive_user_name", receiveUserName); } - + /** * @return receive_user_name 领取用户姓名 */ - @JSONField(name="receive_user_name") + @JSONField(name = "receive_user_name") public String getReceiveUserName() { return getStr("receive_user_name"); } @@ -223,19 +232,20 @@ public abstract class BaseInvoiceReceive> extend * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 领取超市id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 领取超市id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -246,18 +256,19 @@ public abstract class BaseInvoiceReceive> extend * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param invoiceType 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public void setInvoiceType(Integer invoiceType) { set("invoice_type", invoiceType); } - + /** * @return invoice_type 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public Integer getInvoiceType() { return getInt("invoice_type"); } @@ -267,19 +278,20 @@ public abstract class BaseInvoiceReceive> extend * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invoiceNumber 发票代码 */ - @JSONField(name="invoice_number") + @JSONField(name = "invoice_number") public void setInvoiceNumber(String invoiceNumber) { set("invoice_number", invoiceNumber); } - + /** * @return invoice_number 发票代码 */ - @JSONField(name="invoice_number") + @JSONField(name = "invoice_number") public String getInvoiceNumber() { return getStr("invoice_number"); } @@ -290,18 +302,19 @@ public abstract class BaseInvoiceReceive> extend * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param invalidCount 作废数量 */ - @JSONField(name="invalid_count") + @JSONField(name = "invalid_count") public void setInvalidCount(Integer invalidCount) { set("invalid_count", invalidCount); } - + /** * @return invalid_count 作废数量 */ - @JSONField(name="invalid_count") + @JSONField(name = "invalid_count") public Integer getInvalidCount() { return getInt("invalid_count"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java index c1f82c8..f11d217 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java @@ -15,8 +15,8 @@ public abstract class BaseModifyLog> extends BaseMode public static final String tablename = "modify_log"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserId 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** * @return create_user_id 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -69,19 +71,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -91,19 +94,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: VARCHAR(50) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param table 修改的数据表名 */ - @JSONField(name="table") + @JSONField(name = "table") public void setTable(String table) { set("table", table); } - + /** * @return table 修改的数据表名 */ - @JSONField(name="table") + @JSONField(name = "table") public String getTable() { return getStr("table"); } @@ -113,19 +117,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: VARCHAR(50) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param pks 主键数组，兼容复合主键 */ - @JSONField(name="pks") + @JSONField(name = "pks") public void setPks(String pks) { set("pks", pks); } - + /** * @return pks 主键数组，兼容复合主键 */ - @JSONField(name="pks") + @JSONField(name = "pks") public String getPks() { return getStr("pks"); } @@ -135,19 +140,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param newdata 修改后的数据 */ - @JSONField(name="newdata") + @JSONField(name = "newdata") public void setNewdata(String newdata) { set("newdata", newdata); } - + /** * @return newdata 修改后的数据 */ - @JSONField(name="newdata") + @JSONField(name = "newdata") public String getNewdata() { return getStr("newdata"); } @@ -157,19 +163,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param olddata 修改前的数据 */ - @JSONField(name="olddata") + @JSONField(name = "olddata") public void setOlddata(String olddata) { set("olddata", olddata); } - + /** * @return olddata 修改前的数据 */ - @JSONField(name="olddata") + @JSONField(name = "olddata") public String getOlddata() { return getStr("olddata"); } @@ -179,19 +186,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param editdata 只记录修改的部分，包含主键 */ - @JSONField(name="editdata") + @JSONField(name = "editdata") public void setEditdata(String editdata) { set("editdata", editdata); } - + /** * @return editdata 只记录修改的部分，包含主键 */ - @JSONField(name="editdata") + @JSONField(name = "editdata") public String getEditdata() { return getStr("editdata"); } @@ -201,19 +209,20 @@ public abstract class BaseModifyLog> extends BaseMode * type: SMALLINT(5) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param type 1.新增、2.修改、3.删除 */ - @JSONField(name="type") + @JSONField(name = "type") public void setType(Integer type) { set("type", type); } - + /** * @return type 1.新增、2.修改、3.删除 */ - @JSONField(name="type") + @JSONField(name = "type") public Integer getType() { return getInt("type"); } @@ -224,18 +233,19 @@ public abstract class BaseModifyLog> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 最后修改时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 最后修改时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderPurchase.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderPurchase.java index 856118a..57d87d1 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderPurchase.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderPurchase.java @@ -15,8 +15,8 @@ public abstract class BaseOrderPurchase> extends public static final String tablename = "order_purchase"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseOrderPurchase> extends * type: CHAR(16) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public void setSn(String sn) { set("sn", sn); } - + /** * @return sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public String getSn() { return getStr("sn"); } @@ -47,19 +48,20 @@ public abstract class BaseOrderPurchase> extends * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public void setUuid(String uuid) { set("uuid", uuid); } - + /** * @return uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public String getUuid() { return getStr("uuid"); } @@ -69,19 +71,20 @@ public abstract class BaseOrderPurchase> extends * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transportId 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public void setTransportId(String transportId) { set("transport_id", transportId); } - + /** * @return transport_id 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public String getTransportId() { return getStr("transport_id"); } @@ -91,19 +94,20 @@ public abstract class BaseOrderPurchase> extends * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -113,19 +117,20 @@ public abstract class BaseOrderPurchase> extends * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param purchaseId 砂场(采购点)id */ - @JSONField(name="purchase_id") + @JSONField(name = "purchase_id") public void setPurchaseId(Integer purchaseId) { set("purchase_id", purchaseId); } - + /** * @return purchase_id 砂场(采购点)id */ - @JSONField(name="purchase_id") + @JSONField(name = "purchase_id") public Integer getPurchaseId() { return getInt("purchase_id"); } @@ -135,19 +140,20 @@ public abstract class BaseOrderPurchase> extends * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param weight 运输重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public void setWeight(java.math.BigDecimal weight) { set("weight", weight); } - + /** * @return weight 运输重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public java.math.BigDecimal getWeight() { return get("weight"); } @@ -157,19 +163,20 @@ public abstract class BaseOrderPurchase> extends * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param sourceWeight 底单重量，从采购点出场的重量 */ - @JSONField(name="source_weight") + @JSONField(name = "source_weight") public void setSourceWeight(java.math.BigDecimal sourceWeight) { set("source_weight", sourceWeight); } - + /** * @return source_weight 底单重量，从采购点出场的重量 */ - @JSONField(name="source_weight") + @JSONField(name = "source_weight") public java.math.BigDecimal getSourceWeight() { return get("source_weight"); } @@ -179,19 +186,20 @@ public abstract class BaseOrderPurchase> extends * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public Integer getTransCoId() { return getInt("trans_co_id"); } @@ -201,19 +209,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoName + * defaultValue: + * + * @param transCoName */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public void setTransCoName(String transCoName) { set("trans_co_name", transCoName); } - + /** - * @return trans_co_name + * @return trans_co_name */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public String getTransCoName() { return getStr("trans_co_name"); } @@ -223,19 +232,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoTexpayerName 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public void setTransCoTexpayerName(String transCoTexpayerName) { set("trans_co_texpayer_name", transCoTexpayerName); } - + /** * @return trans_co_texpayer_name 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public String getTransCoTexpayerName() { return getStr("trans_co_texpayer_name"); } @@ -245,19 +255,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoTexpayerNum + * defaultValue: + * + * @param transCoTexpayerNum */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public void setTransCoTexpayerNum(String transCoTexpayerNum) { set("trans_co_texpayer_num", transCoTexpayerNum); } - + /** - * @return trans_co_texpayer_num + * @return trans_co_texpayer_num */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public String getTransCoTexpayerNum() { return getStr("trans_co_texpayer_num"); } @@ -267,19 +278,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoAddress + * defaultValue: + * + * @param transCoAddress */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public void setTransCoAddress(String transCoAddress) { set("trans_co_address", transCoAddress); } - + /** - * @return trans_co_address + * @return trans_co_address */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public String getTransCoAddress() { return getStr("trans_co_address"); } @@ -289,19 +301,20 @@ public abstract class BaseOrderPurchase> extends * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoPhone + * defaultValue: + * + * @param transCoPhone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public void setTransCoPhone(String transCoPhone) { set("trans_co_phone", transCoPhone); } - + /** - * @return trans_co_phone + * @return trans_co_phone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public String getTransCoPhone() { return getStr("trans_co_phone"); } @@ -311,19 +324,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankName + * defaultValue: + * + * @param transCoBankName */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public void setTransCoBankName(String transCoBankName) { set("trans_co_bank_name", transCoBankName); } - + /** - * @return trans_co_bank_name + * @return trans_co_bank_name */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public String getTransCoBankName() { return getStr("trans_co_bank_name"); } @@ -333,19 +347,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankAccount + * defaultValue: + * + * @param transCoBankAccount */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public void setTransCoBankAccount(String transCoBankAccount) { set("trans_co_bank_account", transCoBankAccount); } - + /** - * @return trans_co_bank_account + * @return trans_co_bank_account */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public String getTransCoBankAccount() { return getStr("trans_co_bank_account"); } @@ -355,19 +370,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param truckLicense 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** * @return truck_license 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -378,32 +394,31 @@ public abstract class BaseOrderPurchase> extends * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（ -后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（ + * 后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（ -后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（ + * 后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -413,19 +428,20 @@ public abstract class BaseOrderPurchase> extends * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transDistance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public void setTransDistance(java.math.BigDecimal transDistance) { set("trans_distance", transDistance); } - + /** * @return trans_distance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public java.math.BigDecimal getTransDistance() { return get("trans_distance"); } @@ -435,19 +451,20 @@ public abstract class BaseOrderPurchase> extends * type: DECIMAL(10,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transPrice 运费 */ - @JSONField(name="trans_price") + @JSONField(name = "trans_price") public void setTransPrice(java.math.BigDecimal transPrice) { set("trans_price", transPrice); } - + /** * @return trans_price 运费 */ - @JSONField(name="trans_price") + @JSONField(name = "trans_price") public java.math.BigDecimal getTransPrice() { return get("trans_price"); } @@ -457,19 +474,20 @@ public abstract class BaseOrderPurchase> extends * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transUnitPrice 运输单价 */ - @JSONField(name="trans_unit_price") + @JSONField(name = "trans_unit_price") public void setTransUnitPrice(java.math.BigDecimal transUnitPrice) { set("trans_unit_price", transUnitPrice); } - + /** * @return trans_unit_price 运输单价 */ - @JSONField(name="trans_unit_price") + @JSONField(name = "trans_unit_price") public java.math.BigDecimal getTransUnitPrice() { return get("trans_unit_price"); } @@ -479,19 +497,20 @@ public abstract class BaseOrderPurchase> extends * type: DATETIME(19) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param createTime + * defaultValue: + * + * @param createTime */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** - * @return create_time + * @return create_time */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -501,19 +520,20 @@ public abstract class BaseOrderPurchase> extends * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param createUserId + * defaultValue: + * + * @param createUserId */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** - * @return create_user_id + * @return create_user_id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -523,19 +543,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -545,19 +566,20 @@ public abstract class BaseOrderPurchase> extends * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserId 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public void setSettlementUserId(Integer settlementUserId) { set("settlement_user_id", settlementUserId); } - + /** * @return settlement_user_id 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public Integer getSettlementUserId() { return getInt("settlement_user_id"); } @@ -567,19 +589,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserName 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public void setSettlementUserName(String settlementUserName) { set("settlement_user_name", settlementUserName); } - + /** * @return settlement_user_name 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public String getSettlementUserName() { return getStr("settlement_user_name"); } @@ -590,18 +613,19 @@ public abstract class BaseOrderPurchase> extends * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -611,19 +635,20 @@ public abstract class BaseOrderPurchase> extends * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productId 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(Integer productId) { set("product_id", productId); } - + /** * @return product_id 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public Integer getProductId() { return getInt("product_id"); } @@ -633,19 +658,20 @@ public abstract class BaseOrderPurchase> extends * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productName 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public void setProductName(String productName) { set("product_name", productName); } - + /** * @return product_name 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public String getProductName() { return getStr("product_name"); } @@ -655,19 +681,20 @@ public abstract class BaseOrderPurchase> extends * type: CHAR(13) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param oldSn 兼容旧系统的数据 */ - @JSONField(name="old_sn") + @JSONField(name = "old_sn") public void setOldSn(String oldSn) { set("old_sn", oldSn); } - + /** * @return old_sn 兼容旧系统的数据 */ - @JSONField(name="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/BaseOrderSale.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSale.java index 7924f80..a70fb68 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSale.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSale.java @@ -15,8 +15,8 @@ public abstract class BaseOrderSale> extends BaseMode public static final String tablename = "order_sale"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: CHAR(16) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public void setSn(String sn) { set("sn", sn); } - + /** * @return sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public String getSn() { return getStr("sn"); } @@ -47,19 +48,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param uuid UUID 唯一验证，避免重复提交 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public void setUuid(String uuid) { set("uuid", uuid); } - + /** * @return uuid UUID 唯一验证，避免重复提交 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public String getUuid() { return getStr("uuid"); } @@ -69,19 +71,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transportId 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public void setTransportId(String transportId) { set("transport_id", transportId); } - + /** * @return transport_id 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public String getTransportId() { return getStr("transport_id"); } @@ -91,19 +94,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -113,19 +117,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerId + * defaultValue: + * + * @param customerId */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** - * @return customer_id + * @return customer_id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public Integer getCustomerId() { return getInt("customer_id"); } @@ -135,19 +140,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerName + * defaultValue: + * + * @param customerName */ - @JSONField(name="customer_name") + @JSONField(name = "customer_name") public void setCustomerName(String customerName) { set("customer_name", customerName); } - + /** - * @return customer_name + * @return customer_name */ - @JSONField(name="customer_name") + @JSONField(name = "customer_name") public String getCustomerName() { return getStr("customer_name"); } @@ -157,19 +163,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerTexpayerName 客户开票公司名称 */ - @JSONField(name="customer_texpayer_name") + @JSONField(name = "customer_texpayer_name") public void setCustomerTexpayerName(String customerTexpayerName) { set("customer_texpayer_name", customerTexpayerName); } - + /** * @return customer_texpayer_name 客户开票公司名称 */ - @JSONField(name="customer_texpayer_name") + @JSONField(name = "customer_texpayer_name") public String getCustomerTexpayerName() { return getStr("customer_texpayer_name"); } @@ -179,19 +186,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerTexpayerNum 客户纳税人识别号 */ - @JSONField(name="customer_texpayer_num") + @JSONField(name = "customer_texpayer_num") public void setCustomerTexpayerNum(String customerTexpayerNum) { set("customer_texpayer_num", customerTexpayerNum); } - + /** * @return customer_texpayer_num 客户纳税人识别号 */ - @JSONField(name="customer_texpayer_num") + @JSONField(name = "customer_texpayer_num") public String getCustomerTexpayerNum() { return getStr("customer_texpayer_num"); } @@ -201,19 +209,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerAddress + * defaultValue: + * + * @param customerAddress */ - @JSONField(name="customer_address") + @JSONField(name = "customer_address") public void setCustomerAddress(String customerAddress) { set("customer_address", customerAddress); } - + /** - * @return customer_address + * @return customer_address */ - @JSONField(name="customer_address") + @JSONField(name = "customer_address") public String getCustomerAddress() { return getStr("customer_address"); } @@ -223,19 +232,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerPhone + * defaultValue: + * + * @param customerPhone */ - @JSONField(name="customer_phone") + @JSONField(name = "customer_phone") public void setCustomerPhone(String customerPhone) { set("customer_phone", customerPhone); } - + /** - * @return customer_phone + * @return customer_phone */ - @JSONField(name="customer_phone") + @JSONField(name = "customer_phone") public String getCustomerPhone() { return getStr("customer_phone"); } @@ -245,19 +255,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerBankName + * defaultValue: + * + * @param customerBankName */ - @JSONField(name="customer_bank_name") + @JSONField(name = "customer_bank_name") public void setCustomerBankName(String customerBankName) { set("customer_bank_name", customerBankName); } - + /** - * @return customer_bank_name + * @return customer_bank_name */ - @JSONField(name="customer_bank_name") + @JSONField(name = "customer_bank_name") public String getCustomerBankName() { return getStr("customer_bank_name"); } @@ -267,19 +278,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerBankAccount + * defaultValue: + * + * @param customerBankAccount */ - @JSONField(name="customer_bank_account") + @JSONField(name = "customer_bank_account") public void setCustomerBankAccount(String customerBankAccount) { set("customer_bank_account", customerBankAccount); } - + /** - * @return customer_bank_account + * @return customer_bank_account */ - @JSONField(name="customer_bank_account") + @JSONField(name = "customer_bank_account") public String getCustomerBankAccount() { return getStr("customer_bank_account"); } @@ -289,19 +301,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverName 收货人 */ - @JSONField(name="customer_receiver_name") + @JSONField(name = "customer_receiver_name") public void setCustomerReceiverName(String customerReceiverName) { set("customer_receiver_name", customerReceiverName); } - + /** * @return customer_receiver_name 收货人 */ - @JSONField(name="customer_receiver_name") + @JSONField(name = "customer_receiver_name") public String getCustomerReceiverName() { return getStr("customer_receiver_name"); } @@ -311,19 +324,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: CHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverPhone 收货人电话 */ - @JSONField(name="customer_receiver_phone") + @JSONField(name = "customer_receiver_phone") public void setCustomerReceiverPhone(String customerReceiverPhone) { set("customer_receiver_phone", customerReceiverPhone); } - + /** * @return customer_receiver_phone 收货人电话 */ - @JSONField(name="customer_receiver_phone") + @JSONField(name = "customer_receiver_phone") public String getCustomerReceiverPhone() { return getStr("customer_receiver_phone"); } @@ -333,19 +347,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(256) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverAddress 送货地址 */ - @JSONField(name="customer_receiver_address") + @JSONField(name = "customer_receiver_address") public void setCustomerReceiverAddress(String customerReceiverAddress) { set("customer_receiver_address", customerReceiverAddress); } - + /** * @return customer_receiver_address 送货地址 */ - @JSONField(name="customer_receiver_address") + @JSONField(name = "customer_receiver_address") public String getCustomerReceiverAddress() { return getStr("customer_receiver_address"); } @@ -355,19 +370,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(12,8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverLgtd 收货地址经度 */ - @JSONField(name="customer_receiver_lgtd") + @JSONField(name = "customer_receiver_lgtd") public void setCustomerReceiverLgtd(java.math.BigDecimal customerReceiverLgtd) { set("customer_receiver_lgtd", customerReceiverLgtd); } - + /** * @return customer_receiver_lgtd 收货地址经度 */ - @JSONField(name="customer_receiver_lgtd") + @JSONField(name = "customer_receiver_lgtd") public java.math.BigDecimal getCustomerReceiverLgtd() { return get("customer_receiver_lgtd"); } @@ -377,19 +393,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(12,8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverLttd 收货地址纬度 */ - @JSONField(name="customer_receiver_lttd") + @JSONField(name = "customer_receiver_lttd") public void setCustomerReceiverLttd(java.math.BigDecimal customerReceiverLttd) { set("customer_receiver_lttd", customerReceiverLttd); } - + /** * @return customer_receiver_lttd 收货地址纬度 */ - @JSONField(name="customer_receiver_lttd") + @JSONField(name = "customer_receiver_lttd") public java.math.BigDecimal getCustomerReceiverLttd() { return get("customer_receiver_lttd"); } @@ -399,19 +416,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public Integer getTransCoId() { return getInt("trans_co_id"); } @@ -421,19 +439,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param transCoName + * defaultValue: + * + * @param transCoName */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public void setTransCoName(String transCoName) { set("trans_co_name", transCoName); } - + /** - * @return trans_co_name + * @return trans_co_name */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public String getTransCoName() { return getStr("trans_co_name"); } @@ -443,19 +462,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoTexpayerName 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public void setTransCoTexpayerName(String transCoTexpayerName) { set("trans_co_texpayer_name", transCoTexpayerName); } - + /** * @return trans_co_texpayer_name 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public String getTransCoTexpayerName() { return getStr("trans_co_texpayer_name"); } @@ -465,19 +485,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoTexpayerNum + * defaultValue: + * + * @param transCoTexpayerNum */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public void setTransCoTexpayerNum(String transCoTexpayerNum) { set("trans_co_texpayer_num", transCoTexpayerNum); } - + /** - * @return trans_co_texpayer_num + * @return trans_co_texpayer_num */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public String getTransCoTexpayerNum() { return getStr("trans_co_texpayer_num"); } @@ -487,19 +508,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoAddress + * defaultValue: + * + * @param transCoAddress */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public void setTransCoAddress(String transCoAddress) { set("trans_co_address", transCoAddress); } - + /** - * @return trans_co_address + * @return trans_co_address */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public String getTransCoAddress() { return getStr("trans_co_address"); } @@ -509,19 +531,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoPhone + * defaultValue: + * + * @param transCoPhone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public void setTransCoPhone(String transCoPhone) { set("trans_co_phone", transCoPhone); } - + /** - * @return trans_co_phone + * @return trans_co_phone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public String getTransCoPhone() { return getStr("trans_co_phone"); } @@ -531,19 +554,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankName + * defaultValue: + * + * @param transCoBankName */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public void setTransCoBankName(String transCoBankName) { set("trans_co_bank_name", transCoBankName); } - + /** - * @return trans_co_bank_name + * @return trans_co_bank_name */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public String getTransCoBankName() { return getStr("trans_co_bank_name"); } @@ -553,19 +577,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankAccount + * defaultValue: + * + * @param transCoBankAccount */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public void setTransCoBankAccount(String transCoBankAccount) { set("trans_co_bank_account", transCoBankAccount); } - + /** - * @return trans_co_bank_account + * @return trans_co_bank_account */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public String getTransCoBankAccount() { return getStr("trans_co_bank_account"); } @@ -575,19 +600,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param truckLicense 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** * @return truck_license 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -597,19 +623,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param driverName 司机姓名 */ - @JSONField(name="driver_name") + @JSONField(name = "driver_name") public void setDriverName(String driverName) { set("driver_name", driverName); } - + /** * @return driver_name 司机姓名 */ - @JSONField(name="driver_name") + @JSONField(name = "driver_name") public String getDriverName() { return getStr("driver_name"); } @@ -619,19 +646,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param driverPhone 司机手机号 */ - @JSONField(name="driver_phone") + @JSONField(name = "driver_phone") public void setDriverPhone(String driverPhone) { set("driver_phone", driverPhone); } - + /** * @return driver_phone 司机手机号 */ - @JSONField(name="driver_phone") + @JSONField(name = "driver_phone") public String getDriverPhone() { return getStr("driver_phone"); } @@ -641,19 +669,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param unitPrice 单价 */ - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public void setUnitPrice(java.math.BigDecimal unitPrice) { set("unit_price", unitPrice); } - + /** * @return unit_price 单价 */ - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public java.math.BigDecimal getUnitPrice() { return get("unit_price"); } @@ -663,19 +692,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param totalPrice 总价，应付金额 */ - @JSONField(name="total_price") + @JSONField(name = "total_price") public void setTotalPrice(java.math.BigDecimal totalPrice) { set("total_price", totalPrice); } - + /** * @return total_price 总价，应付金额 */ - @JSONField(name="total_price") + @JSONField(name = "total_price") public java.math.BigDecimal getTotalPrice() { return get("total_price"); } @@ -685,19 +715,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param weight 购买重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public void setWeight(java.math.BigDecimal weight) { set("weight", weight); } - + /** * @return weight 购买重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public java.math.BigDecimal getWeight() { return get("weight"); } @@ -707,19 +738,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param paid 实际支付金额 */ - @JSONField(name="paid") + @JSONField(name = "paid") public void setPaid(java.math.BigDecimal paid) { set("paid", paid); } - + /** * @return paid 实际支付金额 */ - @JSONField(name="paid") + @JSONField(name = "paid") public java.math.BigDecimal getPaid() { return get("paid"); } @@ -729,19 +761,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param pickTime 提货时间 */ - @JSONField(name="pick_time") + @JSONField(name = "pick_time") public void setPickTime(java.util.Date pickTime) { set("pick_time", pickTime); } - + /** * @return pick_time 提货时间 */ - @JSONField(name="pick_time") + @JSONField(name = "pick_time") public java.util.Date getPickTime() { return get("pick_time"); } @@ -751,19 +784,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transDistance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public void setTransDistance(java.math.BigDecimal transDistance) { set("trans_distance", transDistance); } - + /** * @return trans_distance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public java.math.BigDecimal getTransDistance() { return get("trans_distance"); } @@ -773,19 +807,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(10,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transPrice 运费 */ - @JSONField(name="trans_price") + @JSONField(name = "trans_price") public void setTransPrice(java.math.BigDecimal transPrice) { set("trans_price", transPrice); } - + /** * @return trans_price 运费 */ - @JSONField(name="trans_price") + @JSONField(name = "trans_price") public java.math.BigDecimal getTransPrice() { return get("trans_price"); } @@ -795,19 +830,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transUnitPrice 运输单价 */ - @JSONField(name="trans_unit_price") + @JSONField(name = "trans_unit_price") public void setTransUnitPrice(java.math.BigDecimal transUnitPrice) { set("trans_unit_price", transUnitPrice); } - + /** * @return trans_unit_price 运输单价 */ - @JSONField(name="trans_unit_price") + @JSONField(name = "trans_unit_price") public java.math.BigDecimal getTransUnitPrice() { return get("trans_unit_price"); } @@ -818,18 +854,19 @@ public abstract class BaseOrderSale> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param payType 支付方式： 1，现场支付； 2，在线支付 */ - @JSONField(name="pay_type") + @JSONField(name = "pay_type") public void setPayType(Integer payType) { set("pay_type", payType); } - + /** * @return pay_type 支付方式： 1，现场支付； 2，在线支付 */ - @JSONField(name="pay_type") + @JSONField(name = "pay_type") public Integer getPayType() { return getInt("pay_type"); } @@ -839,19 +876,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: DATETIME(19) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param createTime + * defaultValue: + * + * @param createTime */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** - * @return create_time + * @return create_time */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -861,19 +899,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserId 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** * @return create_user_id 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -883,19 +922,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -905,19 +945,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserId 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public void setSettlementUserId(Integer settlementUserId) { set("settlement_user_id", settlementUserId); } - + /** * @return settlement_user_id 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public Integer getSettlementUserId() { return getInt("settlement_user_id"); } @@ -927,19 +968,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserName 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public void setSettlementUserName(String settlementUserName) { set("settlement_user_name", settlementUserName); } - + /** * @return settlement_user_name 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public String getSettlementUserName() { return getStr("settlement_user_name"); } @@ -950,30 +992,29 @@ public abstract class BaseOrderSale> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -984,18 +1025,19 @@ public abstract class BaseOrderSale> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param reqReceipt 是否需要发票，0 默认不需要，1需要 */ - @JSONField(name="req_receipt") + @JSONField(name = "req_receipt") public void setReqReceipt(Integer reqReceipt) { set("req_receipt", reqReceipt); } - + /** * @return req_receipt 是否需要发票，0 默认不需要，1需要 */ - @JSONField(name="req_receipt") + @JSONField(name = "req_receipt") public Integer getReqReceipt() { return getInt("req_receipt"); } @@ -1005,19 +1047,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param orderclusterId ordercluste id */ - @JSONField(name="ordercluster_id") + @JSONField(name = "ordercluster_id") public void setOrderclusterId(Integer orderclusterId) { set("ordercluster_id", orderclusterId); } - + /** * @return ordercluster_id ordercluste id */ - @JSONField(name="ordercluster_id") + @JSONField(name = "ordercluster_id") public Integer getOrderclusterId() { return getInt("ordercluster_id"); } @@ -1028,18 +1071,19 @@ public abstract class BaseOrderSale> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -1050,18 +1094,19 @@ public abstract class BaseOrderSale> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param isprepaid 是否已预付，在结算时勾选 */ - @JSONField(name="isprepaid") + @JSONField(name = "isprepaid") public void setIsprepaid(Integer isprepaid) { set("isprepaid", isprepaid); } - + /** * @return isprepaid 是否已预付，在结算时勾选 */ - @JSONField(name="isprepaid") + @JSONField(name = "isprepaid") public Integer getIsprepaid() { return getInt("isprepaid"); } @@ -1071,19 +1116,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(String memo) { set("memo", memo); } - + /** * @return memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public String getMemo() { return getStr("memo"); } @@ -1093,19 +1139,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productId 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(Integer productId) { set("product_id", productId); } - + /** * @return product_id 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public Integer getProductId() { return getInt("product_id"); } @@ -1115,19 +1162,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productName 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public void setProductName(String productName) { set("product_name", productName); } - + /** * @return product_name 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public String getProductName() { return getStr("product_name"); } @@ -1137,19 +1185,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param prepayCustomerId 预付费客户 prepay_customer 表的id */ - @JSONField(name="prepay_customer_id") + @JSONField(name = "prepay_customer_id") public void setPrepayCustomerId(Integer prepayCustomerId) { set("prepay_customer_id", prepayCustomerId); } - + /** * @return prepay_customer_id 预付费客户 prepay_customer 表的id */ - @JSONField(name="prepay_customer_id") + @JSONField(name = "prepay_customer_id") public Integer getPrepayCustomerId() { return getInt("prepay_customer_id"); } @@ -1159,19 +1208,20 @@ public abstract class BaseOrderSale> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invoiceCode 发票号码 */ - @JSONField(name="invoice_code") + @JSONField(name = "invoice_code") public void setInvoiceCode(String invoiceCode) { set("invoice_code", invoiceCode); } - + /** * @return invoice_code 发票号码 */ - @JSONField(name="invoice_code") + @JSONField(name = "invoice_code") public String getInvoiceCode() { return getStr("invoice_code"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSeq.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSeq.java index 99182bf..6718562 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSeq.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderSeq.java @@ -15,8 +15,8 @@ public abstract class BaseOrderSeq> extends BaseModel< public static final String tablename = "order_seq"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseOrderSeq> extends BaseModel< * type: DATE(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param tm 日期 */ - @JSONField(name="tm") + @JSONField(name = "tm") public void setTm(java.util.Date tm) { set("tm", tm); } - + /** * @return tm 日期 */ - @JSONField(name="tm") + @JSONField(name = "tm") public java.util.Date getTm() { return get("tm"); } @@ -47,19 +48,20 @@ public abstract class BaseOrderSeq> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -69,19 +71,20 @@ public abstract class BaseOrderSeq> extends BaseModel< * type: SMALLINT(5) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param type 订单类型 */ - @JSONField(name="type") + @JSONField(name = "type") public void setType(Integer type) { set("type", type); } - + /** * @return type 订单类型 */ - @JSONField(name="type") + @JSONField(name = "type") public Integer getType() { return getInt("type"); } @@ -91,19 +94,20 @@ public abstract class BaseOrderSeq> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param seq 序列号 */ - @JSONField(name="seq") + @JSONField(name = "seq") public void setSeq(Integer seq) { set("seq", seq); } - + /** * @return seq 序列号 */ - @JSONField(name="seq") + @JSONField(name = "seq") public Integer getSeq() { return getInt("seq"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTemp.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTemp.java index 6eeef14..89e44c6 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTemp.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTemp.java @@ -15,8 +15,8 @@ public abstract class BaseOrderTemp> extends BaseMode public static final String tablename = "order_temp"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: CHAR(16) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public void setSn(String sn) { set("sn", sn); } - + /** * @return sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public String getSn() { return getStr("sn"); } @@ -47,19 +48,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public void setUuid(String uuid) { set("uuid", uuid); } - + /** * @return uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public String getUuid() { return getStr("uuid"); } @@ -69,19 +71,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transportId 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public void setTransportId(String transportId) { set("transport_id", transportId); } - + /** * @return transport_id 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public String getTransportId() { return getStr("transport_id"); } @@ -91,19 +94,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 超市id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 超市id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -113,19 +117,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param weight 购买重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public void setWeight(java.math.BigDecimal weight) { set("weight", weight); } - + /** * @return weight 购买重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public java.math.BigDecimal getWeight() { return get("weight"); } @@ -135,19 +140,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param truckLicense 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** * @return truck_license 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -158,32 +164,31 @@ public abstract class BaseOrderTemp> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（ -后台自动设置）（扩展，已生成待支付订单） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（ + * 后台自动设置）（扩展，已生成待支付订单） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（ -后台自动设置）（扩展，已生成待支付订单） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（ + * 后台自动设置）（扩展，已生成待支付订单） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -193,19 +198,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: DATETIME(19) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createTime 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -215,19 +221,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserId 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** * @return create_user_id 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -237,19 +244,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -259,19 +267,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserId 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public void setSettlementUserId(Integer settlementUserId) { set("settlement_user_id", settlementUserId); } - + /** * @return settlement_user_id 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public Integer getSettlementUserId() { return getInt("settlement_user_id"); } @@ -281,19 +290,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserName 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public void setSettlementUserName(String settlementUserName) { set("settlement_user_name", settlementUserName); } - + /** * @return settlement_user_name 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public String getSettlementUserName() { return getStr("settlement_user_name"); } @@ -303,19 +313,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param unitPrice 单价 */ - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public void setUnitPrice(java.math.BigDecimal unitPrice) { set("unit_price", unitPrice); } - + /** * @return unit_price 单价 */ - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public java.math.BigDecimal getUnitPrice() { return get("unit_price"); } @@ -325,19 +336,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param totalPrice 总价，应付费 */ - @JSONField(name="total_price") + @JSONField(name = "total_price") public void setTotalPrice(java.math.BigDecimal totalPrice) { set("total_price", totalPrice); } - + /** * @return total_price 总价，应付费 */ - @JSONField(name="total_price") + @JSONField(name = "total_price") public java.math.BigDecimal getTotalPrice() { return get("total_price"); } @@ -347,19 +359,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param paid 实际支付金额 */ - @JSONField(name="paid") + @JSONField(name = "paid") public void setPaid(java.math.BigDecimal paid) { set("paid", paid); } - + /** * @return paid 实际支付金额 */ - @JSONField(name="paid") + @JSONField(name = "paid") public java.math.BigDecimal getPaid() { return get("paid"); } @@ -370,18 +383,19 @@ public abstract class BaseOrderTemp> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param payType 支付方式： 1，现场支付； 2，在线支付 */ - @JSONField(name="pay_type") + @JSONField(name = "pay_type") public void setPayType(Integer payType) { set("pay_type", payType); } - + /** * @return pay_type 支付方式： 1，现场支付； 2，在线支付 */ - @JSONField(name="pay_type") + @JSONField(name = "pay_type") public Integer getPayType() { return getInt("pay_type"); } @@ -392,18 +406,19 @@ public abstract class BaseOrderTemp> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -414,18 +429,19 @@ public abstract class BaseOrderTemp> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param isprepaid 是否已预付，在结算时勾选 */ - @JSONField(name="isprepaid") + @JSONField(name = "isprepaid") public void setIsprepaid(Integer isprepaid) { set("isprepaid", isprepaid); } - + /** * @return isprepaid 是否已预付，在结算时勾选 */ - @JSONField(name="isprepaid") + @JSONField(name = "isprepaid") public Integer getIsprepaid() { return getInt("isprepaid"); } @@ -435,19 +451,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(String memo) { set("memo", memo); } - + /** * @return memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public String getMemo() { return getStr("memo"); } @@ -457,19 +474,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerId + * defaultValue: + * + * @param customerId */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** - * @return customer_id + * @return customer_id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public Integer getCustomerId() { return getInt("customer_id"); } @@ -479,19 +497,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerName + * defaultValue: + * + * @param customerName */ - @JSONField(name="customer_name") + @JSONField(name = "customer_name") public void setCustomerName(String customerName) { set("customer_name", customerName); } - + /** - * @return customer_name + * @return customer_name */ - @JSONField(name="customer_name") + @JSONField(name = "customer_name") public String getCustomerName() { return getStr("customer_name"); } @@ -501,19 +520,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerTexpayerName 客户开票公司名称 */ - @JSONField(name="customer_texpayer_name") + @JSONField(name = "customer_texpayer_name") public void setCustomerTexpayerName(String customerTexpayerName) { set("customer_texpayer_name", customerTexpayerName); } - + /** * @return customer_texpayer_name 客户开票公司名称 */ - @JSONField(name="customer_texpayer_name") + @JSONField(name = "customer_texpayer_name") public String getCustomerTexpayerName() { return getStr("customer_texpayer_name"); } @@ -523,19 +543,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerTexpayerNum 客户纳税人识别号 */ - @JSONField(name="customer_texpayer_num") + @JSONField(name = "customer_texpayer_num") public void setCustomerTexpayerNum(String customerTexpayerNum) { set("customer_texpayer_num", customerTexpayerNum); } - + /** * @return customer_texpayer_num 客户纳税人识别号 */ - @JSONField(name="customer_texpayer_num") + @JSONField(name = "customer_texpayer_num") public String getCustomerTexpayerNum() { return getStr("customer_texpayer_num"); } @@ -545,19 +566,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerAddress + * defaultValue: + * + * @param customerAddress */ - @JSONField(name="customer_address") + @JSONField(name = "customer_address") public void setCustomerAddress(String customerAddress) { set("customer_address", customerAddress); } - + /** - * @return customer_address + * @return customer_address */ - @JSONField(name="customer_address") + @JSONField(name = "customer_address") public String getCustomerAddress() { return getStr("customer_address"); } @@ -567,19 +589,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerPhone + * defaultValue: + * + * @param customerPhone */ - @JSONField(name="customer_phone") + @JSONField(name = "customer_phone") public void setCustomerPhone(String customerPhone) { set("customer_phone", customerPhone); } - + /** - * @return customer_phone + * @return customer_phone */ - @JSONField(name="customer_phone") + @JSONField(name = "customer_phone") public String getCustomerPhone() { return getStr("customer_phone"); } @@ -589,19 +612,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerBankName + * defaultValue: + * + * @param customerBankName */ - @JSONField(name="customer_bank_name") + @JSONField(name = "customer_bank_name") public void setCustomerBankName(String customerBankName) { set("customer_bank_name", customerBankName); } - + /** - * @return customer_bank_name + * @return customer_bank_name */ - @JSONField(name="customer_bank_name") + @JSONField(name = "customer_bank_name") public String getCustomerBankName() { return getStr("customer_bank_name"); } @@ -611,19 +635,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerBankAccount + * defaultValue: + * + * @param customerBankAccount */ - @JSONField(name="customer_bank_account") + @JSONField(name = "customer_bank_account") public void setCustomerBankAccount(String customerBankAccount) { set("customer_bank_account", customerBankAccount); } - + /** - * @return customer_bank_account + * @return customer_bank_account */ - @JSONField(name="customer_bank_account") + @JSONField(name = "customer_bank_account") public String getCustomerBankAccount() { return getStr("customer_bank_account"); } @@ -633,19 +658,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverName 收货人 */ - @JSONField(name="customer_receiver_name") + @JSONField(name = "customer_receiver_name") public void setCustomerReceiverName(String customerReceiverName) { set("customer_receiver_name", customerReceiverName); } - + /** * @return customer_receiver_name 收货人 */ - @JSONField(name="customer_receiver_name") + @JSONField(name = "customer_receiver_name") public String getCustomerReceiverName() { return getStr("customer_receiver_name"); } @@ -655,19 +681,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverPhone 收货人电话 */ - @JSONField(name="customer_receiver_phone") + @JSONField(name = "customer_receiver_phone") public void setCustomerReceiverPhone(String customerReceiverPhone) { set("customer_receiver_phone", customerReceiverPhone); } - + /** * @return customer_receiver_phone 收货人电话 */ - @JSONField(name="customer_receiver_phone") + @JSONField(name = "customer_receiver_phone") public String getCustomerReceiverPhone() { return getStr("customer_receiver_phone"); } @@ -677,19 +704,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverAddress 送货地址 */ - @JSONField(name="customer_receiver_address") + @JSONField(name = "customer_receiver_address") public void setCustomerReceiverAddress(String customerReceiverAddress) { set("customer_receiver_address", customerReceiverAddress); } - + /** * @return customer_receiver_address 送货地址 */ - @JSONField(name="customer_receiver_address") + @JSONField(name = "customer_receiver_address") public String getCustomerReceiverAddress() { return getStr("customer_receiver_address"); } @@ -699,19 +727,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: DECIMAL(12,8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverLgtd 收货地址经度 */ - @JSONField(name="customer_receiver_lgtd") + @JSONField(name = "customer_receiver_lgtd") public void setCustomerReceiverLgtd(java.math.BigDecimal customerReceiverLgtd) { set("customer_receiver_lgtd", customerReceiverLgtd); } - + /** * @return customer_receiver_lgtd 收货地址经度 */ - @JSONField(name="customer_receiver_lgtd") + @JSONField(name = "customer_receiver_lgtd") public java.math.BigDecimal getCustomerReceiverLgtd() { return get("customer_receiver_lgtd"); } @@ -721,19 +750,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: DECIMAL(12,8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverLttd 收货地址纬度 */ - @JSONField(name="customer_receiver_lttd") + @JSONField(name = "customer_receiver_lttd") public void setCustomerReceiverLttd(java.math.BigDecimal customerReceiverLttd) { set("customer_receiver_lttd", customerReceiverLttd); } - + /** * @return customer_receiver_lttd 收货地址纬度 */ - @JSONField(name="customer_receiver_lttd") + @JSONField(name = "customer_receiver_lttd") public java.math.BigDecimal getCustomerReceiverLttd() { return get("customer_receiver_lttd"); } @@ -743,19 +773,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public Integer getTransCoId() { return getInt("trans_co_id"); } @@ -765,19 +796,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoName + * defaultValue: + * + * @param transCoName */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public void setTransCoName(String transCoName) { set("trans_co_name", transCoName); } - + /** - * @return trans_co_name + * @return trans_co_name */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public String getTransCoName() { return getStr("trans_co_name"); } @@ -787,19 +819,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoTexpayerName 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public void setTransCoTexpayerName(String transCoTexpayerName) { set("trans_co_texpayer_name", transCoTexpayerName); } - + /** * @return trans_co_texpayer_name 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public String getTransCoTexpayerName() { return getStr("trans_co_texpayer_name"); } @@ -809,19 +842,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoTexpayerNum + * defaultValue: + * + * @param transCoTexpayerNum */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public void setTransCoTexpayerNum(String transCoTexpayerNum) { set("trans_co_texpayer_num", transCoTexpayerNum); } - + /** - * @return trans_co_texpayer_num + * @return trans_co_texpayer_num */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public String getTransCoTexpayerNum() { return getStr("trans_co_texpayer_num"); } @@ -831,19 +865,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoAddress + * defaultValue: + * + * @param transCoAddress */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public void setTransCoAddress(String transCoAddress) { set("trans_co_address", transCoAddress); } - + /** - * @return trans_co_address + * @return trans_co_address */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public String getTransCoAddress() { return getStr("trans_co_address"); } @@ -853,19 +888,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoPhone + * defaultValue: + * + * @param transCoPhone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public void setTransCoPhone(String transCoPhone) { set("trans_co_phone", transCoPhone); } - + /** - * @return trans_co_phone + * @return trans_co_phone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public String getTransCoPhone() { return getStr("trans_co_phone"); } @@ -875,19 +911,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankName + * defaultValue: + * + * @param transCoBankName */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public void setTransCoBankName(String transCoBankName) { set("trans_co_bank_name", transCoBankName); } - + /** - * @return trans_co_bank_name + * @return trans_co_bank_name */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public String getTransCoBankName() { return getStr("trans_co_bank_name"); } @@ -897,19 +934,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankAccount + * defaultValue: + * + * @param transCoBankAccount */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public void setTransCoBankAccount(String transCoBankAccount) { set("trans_co_bank_account", transCoBankAccount); } - + /** - * @return trans_co_bank_account + * @return trans_co_bank_account */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public String getTransCoBankAccount() { return getStr("trans_co_bank_account"); } @@ -919,19 +957,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productId 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(Integer productId) { set("product_id", productId); } - + /** * @return product_id 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public Integer getProductId() { return getInt("product_id"); } @@ -941,19 +980,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productName 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public void setProductName(String productName) { set("product_name", productName); } - + /** * @return product_name 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public String getProductName() { return getStr("product_name"); } @@ -963,19 +1003,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param orderclusterId ordercluste id */ - @JSONField(name="ordercluster_id") + @JSONField(name = "ordercluster_id") public void setOrderclusterId(Integer orderclusterId) { set("ordercluster_id", orderclusterId); } - + /** * @return ordercluster_id ordercluste id */ - @JSONField(name="ordercluster_id") + @JSONField(name = "ordercluster_id") public Integer getOrderclusterId() { return getInt("ordercluster_id"); } @@ -985,19 +1026,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param prepayCustomerId 预付费客户 prepay_customer 表的id */ - @JSONField(name="prepay_customer_id") + @JSONField(name = "prepay_customer_id") public void setPrepayCustomerId(Integer prepayCustomerId) { set("prepay_customer_id", prepayCustomerId); } - + /** * @return prepay_customer_id 预付费客户 prepay_customer 表的id */ - @JSONField(name="prepay_customer_id") + @JSONField(name = "prepay_customer_id") public Integer getPrepayCustomerId() { return getInt("prepay_customer_id"); } @@ -1007,19 +1049,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: CHAR(13) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param oldSn 兼容旧系统的数据 */ - @JSONField(name="old_sn") + @JSONField(name = "old_sn") public void setOldSn(String oldSn) { set("old_sn", oldSn); } - + /** * @return old_sn 兼容旧系统的数据 */ - @JSONField(name="old_sn") + @JSONField(name = "old_sn") public String getOldSn() { return getStr("old_sn"); } @@ -1029,19 +1072,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invoiceCode 发票号码 */ - @JSONField(name="invoice_code") + @JSONField(name = "invoice_code") public void setInvoiceCode(String invoiceCode) { set("invoice_code", invoiceCode); } - + /** * @return invoice_code 发票号码 */ - @JSONField(name="invoice_code") + @JSONField(name = "invoice_code") public String getInvoiceCode() { return getStr("invoice_code"); } @@ -1051,19 +1095,20 @@ public abstract class BaseOrderTemp> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param invoiceNumber 发票代码 */ - @JSONField(name="invoice_number") + @JSONField(name = "invoice_number") public void setInvoiceNumber(String invoiceNumber) { set("invoice_number", invoiceNumber); } - + /** * @return invoice_number 发票代码 */ - @JSONField(name="invoice_number") + @JSONField(name = "invoice_number") public String getInvoiceNumber() { return getStr("invoice_number"); } @@ -1074,18 +1119,19 @@ public abstract class BaseOrderTemp> extends BaseMode * isNullable: YES * isPrimaryKey: NO * defaultValue: 1 + * * @param invoiceType 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public void setInvoiceType(Integer invoiceType) { set("invoice_type", invoiceType); } - + /** * @return invoice_type 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public Integer getInvoiceType() { return getInt("invoice_type"); } @@ -1096,18 +1142,19 @@ public abstract class BaseOrderTemp> extends BaseMode * isNullable: YES * isPrimaryKey: NO * defaultValue: 1 + * * @param invoiceSite 1.砂站，2.结算中心 */ - @JSONField(name="invoice_site") + @JSONField(name = "invoice_site") public void setInvoiceSite(Integer invoiceSite) { set("invoice_site", invoiceSite); } - + /** * @return invoice_site 1.砂站，2.结算中心 */ - @JSONField(name="invoice_site") + @JSONField(name = "invoice_site") public Integer getInvoiceSite() { return getInt("invoice_site"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java index d860c52..af60317 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTransfer.java @@ -15,8 +15,8 @@ public abstract class BaseOrderTransfer> extends public static final String tablename = "order_transfer"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseOrderTransfer> extends * type: CHAR(16) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public void setSn(String sn) { set("sn", sn); } - + /** * @return sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public String getSn() { return getStr("sn"); } @@ -47,19 +48,20 @@ public abstract class BaseOrderTransfer> extends * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public void setUuid(String uuid) { set("uuid", uuid); } - + /** * @return uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public String getUuid() { return getStr("uuid"); } @@ -69,19 +71,20 @@ public abstract class BaseOrderTransfer> extends * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transportId 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public void setTransportId(String transportId) { set("transport_id", transportId); } - + /** * @return transport_id 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public String getTransportId() { return getStr("transport_id"); } @@ -91,19 +94,20 @@ public abstract class BaseOrderTransfer> extends * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -113,19 +117,20 @@ public abstract class BaseOrderTransfer> extends * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param sandfarmId 砂场id */ - @JSONField(name="sandfarm_id") + @JSONField(name = "sandfarm_id") public void setSandfarmId(Integer sandfarmId) { set("sandfarm_id", sandfarmId); } - + /** * @return sandfarm_id 砂场id */ - @JSONField(name="sandfarm_id") + @JSONField(name = "sandfarm_id") public Integer getSandfarmId() { return getInt("sandfarm_id"); } @@ -135,19 +140,20 @@ public abstract class BaseOrderTransfer> extends * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param weight 运输重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public void setWeight(java.math.BigDecimal weight) { set("weight", weight); } - + /** * @return weight 运输重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public java.math.BigDecimal getWeight() { return get("weight"); } @@ -157,19 +163,20 @@ public abstract class BaseOrderTransfer> extends * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param sourceWeight 底单重量，从采砂点出场的重量 */ - @JSONField(name="source_weight") + @JSONField(name = "source_weight") public void setSourceWeight(java.math.BigDecimal sourceWeight) { set("source_weight", sourceWeight); } - + /** * @return source_weight 底单重量，从采砂点出场的重量 */ - @JSONField(name="source_weight") + @JSONField(name = "source_weight") public java.math.BigDecimal getSourceWeight() { return get("source_weight"); } @@ -179,19 +186,20 @@ public abstract class BaseOrderTransfer> extends * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public Integer getTransCoId() { return getInt("trans_co_id"); } @@ -201,19 +209,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param transCoName + * defaultValue: + * + * @param transCoName */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public void setTransCoName(String transCoName) { set("trans_co_name", transCoName); } - + /** - * @return trans_co_name + * @return trans_co_name */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public String getTransCoName() { return getStr("trans_co_name"); } @@ -223,19 +232,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoTexpayerName 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public void setTransCoTexpayerName(String transCoTexpayerName) { set("trans_co_texpayer_name", transCoTexpayerName); } - + /** * @return trans_co_texpayer_name 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public String getTransCoTexpayerName() { return getStr("trans_co_texpayer_name"); } @@ -245,19 +255,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoTexpayerNum + * defaultValue: + * + * @param transCoTexpayerNum */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public void setTransCoTexpayerNum(String transCoTexpayerNum) { set("trans_co_texpayer_num", transCoTexpayerNum); } - + /** - * @return trans_co_texpayer_num + * @return trans_co_texpayer_num */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public String getTransCoTexpayerNum() { return getStr("trans_co_texpayer_num"); } @@ -267,19 +278,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoAddress + * defaultValue: + * + * @param transCoAddress */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public void setTransCoAddress(String transCoAddress) { set("trans_co_address", transCoAddress); } - + /** - * @return trans_co_address + * @return trans_co_address */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public String getTransCoAddress() { return getStr("trans_co_address"); } @@ -289,19 +301,20 @@ public abstract class BaseOrderTransfer> extends * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoPhone + * defaultValue: + * + * @param transCoPhone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public void setTransCoPhone(String transCoPhone) { set("trans_co_phone", transCoPhone); } - + /** - * @return trans_co_phone + * @return trans_co_phone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public String getTransCoPhone() { return getStr("trans_co_phone"); } @@ -311,19 +324,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankName + * defaultValue: + * + * @param transCoBankName */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public void setTransCoBankName(String transCoBankName) { set("trans_co_bank_name", transCoBankName); } - + /** - * @return trans_co_bank_name + * @return trans_co_bank_name */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public String getTransCoBankName() { return getStr("trans_co_bank_name"); } @@ -333,19 +347,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankAccount + * defaultValue: + * + * @param transCoBankAccount */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public void setTransCoBankAccount(String transCoBankAccount) { set("trans_co_bank_account", transCoBankAccount); } - + /** - * @return trans_co_bank_account + * @return trans_co_bank_account */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public String getTransCoBankAccount() { return getStr("trans_co_bank_account"); } @@ -355,19 +370,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param truckLicense 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** * @return truck_license 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -378,32 +394,31 @@ public abstract class BaseOrderTransfer> extends * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（ -后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（ + * 后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（ -后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（ + * 后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -413,19 +428,20 @@ public abstract class BaseOrderTransfer> extends * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transDistance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public void setTransDistance(java.math.BigDecimal transDistance) { set("trans_distance", transDistance); } - + /** * @return trans_distance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public java.math.BigDecimal getTransDistance() { return get("trans_distance"); } @@ -435,19 +451,20 @@ public abstract class BaseOrderTransfer> extends * type: DECIMAL(10,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transPrice 运费 */ - @JSONField(name="trans_price") + @JSONField(name = "trans_price") public void setTransPrice(java.math.BigDecimal transPrice) { set("trans_price", transPrice); } - + /** * @return trans_price 运费 */ - @JSONField(name="trans_price") + @JSONField(name = "trans_price") public java.math.BigDecimal getTransPrice() { return get("trans_price"); } @@ -457,19 +474,20 @@ public abstract class BaseOrderTransfer> extends * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transUnitPrice 运输单价 */ - @JSONField(name="trans_unit_price") + @JSONField(name = "trans_unit_price") public void setTransUnitPrice(java.math.BigDecimal transUnitPrice) { set("trans_unit_price", transUnitPrice); } - + /** * @return trans_unit_price 运输单价 */ - @JSONField(name="trans_unit_price") + @JSONField(name = "trans_unit_price") public java.math.BigDecimal getTransUnitPrice() { return get("trans_unit_price"); } @@ -479,19 +497,20 @@ public abstract class BaseOrderTransfer> extends * type: DATETIME(19) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param createTime + * defaultValue: + * + * @param createTime */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** - * @return create_time + * @return create_time */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -501,19 +520,20 @@ public abstract class BaseOrderTransfer> extends * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param createUserId + * defaultValue: + * + * @param createUserId */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** - * @return create_user_id + * @return create_user_id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -523,19 +543,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -545,19 +566,20 @@ public abstract class BaseOrderTransfer> extends * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserId 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public void setSettlementUserId(Integer settlementUserId) { set("settlement_user_id", settlementUserId); } - + /** * @return settlement_user_id 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public Integer getSettlementUserId() { return getInt("settlement_user_id"); } @@ -567,19 +589,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserName 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public void setSettlementUserName(String settlementUserName) { set("settlement_user_name", settlementUserName); } - + /** * @return settlement_user_name 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public String getSettlementUserName() { return getStr("settlement_user_name"); } @@ -590,18 +613,19 @@ public abstract class BaseOrderTransfer> extends * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -611,19 +635,20 @@ public abstract class BaseOrderTransfer> extends * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productId 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(Integer productId) { set("product_id", productId); } - + /** * @return product_id 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public Integer getProductId() { return getInt("product_id"); } @@ -633,19 +658,20 @@ public abstract class BaseOrderTransfer> extends * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productName 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public void setProductName(String productName) { set("product_name", productName); } - + /** * @return product_name 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public String getProductName() { return getStr("product_name"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTrash.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTrash.java index addd71c..e8625e6 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTrash.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderTrash.java @@ -8,7 +8,7 @@ import com.alibaba.fastjson.annotation.JSONField; * Generated by COWR Fri May 01 22:23:27 CST 2020 * TableName: order_trash * Remarks: 订单相关 - 废料运出单 - + *

* PrimaryKey: sn */ @SuppressWarnings("serial") @@ -16,8 +16,8 @@ public abstract class BaseOrderTrash> extends BaseMo public static final String tablename = "order_trash"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -26,19 +26,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: CHAR(16) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public void setSn(String sn) { set("sn", sn); } - + /** * @return sn YYYYMMDD + 两位销售点id（避免离线生成订单号重复） + 两位订单类型 + 四位序列号 */ - @JSONField(name="sn") + @JSONField(name = "sn") public String getSn() { return getStr("sn"); } @@ -48,19 +49,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public void setUuid(String uuid) { set("uuid", uuid); } - + /** * @return uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public String getUuid() { return getStr("uuid"); } @@ -70,19 +72,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transportId 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public void setTransportId(String transportId) { set("transport_id", transportId); } - + /** * @return transport_id 出入场记录id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public String getTransportId() { return getStr("transport_id"); } @@ -92,19 +95,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -114,19 +118,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param weight 重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public void setWeight(java.math.BigDecimal weight) { set("weight", weight); } - + /** * @return weight 重量 */ - @JSONField(name="weight") + @JSONField(name = "weight") public java.math.BigDecimal getWeight() { return get("weight"); } @@ -136,19 +141,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param truckLicense 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** * @return truck_license 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -159,32 +165,31 @@ public abstract class BaseOrderTrash> extends BaseMo * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（ -后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（ + * 后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（ -后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（ + * 后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -194,19 +199,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transDistance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public void setTransDistance(java.math.BigDecimal transDistance) { set("trans_distance", transDistance); } - + /** * @return trans_distance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public java.math.BigDecimal getTransDistance() { return get("trans_distance"); } @@ -216,19 +222,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: DECIMAL(10,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transPrice 运费 */ - @JSONField(name="trans_price") + @JSONField(name = "trans_price") public void setTransPrice(java.math.BigDecimal transPrice) { set("trans_price", transPrice); } - + /** * @return trans_price 运费 */ - @JSONField(name="trans_price") + @JSONField(name = "trans_price") public java.math.BigDecimal getTransPrice() { return get("trans_price"); } @@ -238,19 +245,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transUnitPrice 运输单价 */ - @JSONField(name="trans_unit_price") + @JSONField(name = "trans_unit_price") public void setTransUnitPrice(java.math.BigDecimal transUnitPrice) { set("trans_unit_price", transUnitPrice); } - + /** * @return trans_unit_price 运输单价 */ - @JSONField(name="trans_unit_price") + @JSONField(name = "trans_unit_price") public java.math.BigDecimal getTransUnitPrice() { return get("trans_unit_price"); } @@ -260,19 +268,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: DATETIME(19) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param createTime + * defaultValue: + * + * @param createTime */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** - * @return create_time + * @return create_time */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -282,19 +291,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param createUserId + * defaultValue: + * + * @param createUserId */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** - * @return create_user_id + * @return create_user_id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -304,19 +314,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -326,19 +337,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserId 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public void setSettlementUserId(Integer settlementUserId) { set("settlement_user_id", settlementUserId); } - + /** * @return settlement_user_id 结算用户id */ - @JSONField(name="settlement_user_id") + @JSONField(name = "settlement_user_id") public Integer getSettlementUserId() { return getInt("settlement_user_id"); } @@ -348,19 +360,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param settlementUserName 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public void setSettlementUserName(String settlementUserName) { set("settlement_user_name", settlementUserName); } - + /** * @return settlement_user_name 结算用户名 */ - @JSONField(name="settlement_user_name") + @JSONField(name = "settlement_user_name") public String getSettlementUserName() { return getStr("settlement_user_name"); } @@ -371,18 +384,19 @@ public abstract class BaseOrderTrash> extends BaseMo * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -392,19 +406,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productId 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(Integer productId) { set("product_id", productId); } - + /** * @return product_id 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public Integer getProductId() { return getInt("product_id"); } @@ -414,19 +429,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productName 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public void setProductName(String productName) { set("product_name", productName); } - + /** * @return product_name 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public String getProductName() { return getStr("product_name"); } @@ -436,19 +452,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public Integer getTransCoId() { return getInt("trans_co_id"); } @@ -458,19 +475,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoName + * defaultValue: + * + * @param transCoName */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public void setTransCoName(String transCoName) { set("trans_co_name", transCoName); } - + /** - * @return trans_co_name + * @return trans_co_name */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public String getTransCoName() { return getStr("trans_co_name"); } @@ -480,19 +498,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoTexpayerName 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public void setTransCoTexpayerName(String transCoTexpayerName) { set("trans_co_texpayer_name", transCoTexpayerName); } - + /** * @return trans_co_texpayer_name 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public String getTransCoTexpayerName() { return getStr("trans_co_texpayer_name"); } @@ -502,19 +521,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoTexpayerNum + * defaultValue: + * + * @param transCoTexpayerNum */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public void setTransCoTexpayerNum(String transCoTexpayerNum) { set("trans_co_texpayer_num", transCoTexpayerNum); } - + /** - * @return trans_co_texpayer_num + * @return trans_co_texpayer_num */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public String getTransCoTexpayerNum() { return getStr("trans_co_texpayer_num"); } @@ -524,19 +544,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoAddress + * defaultValue: + * + * @param transCoAddress */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public void setTransCoAddress(String transCoAddress) { set("trans_co_address", transCoAddress); } - + /** - * @return trans_co_address + * @return trans_co_address */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public String getTransCoAddress() { return getStr("trans_co_address"); } @@ -546,19 +567,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoPhone + * defaultValue: + * + * @param transCoPhone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public void setTransCoPhone(String transCoPhone) { set("trans_co_phone", transCoPhone); } - + /** - * @return trans_co_phone + * @return trans_co_phone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public String getTransCoPhone() { return getStr("trans_co_phone"); } @@ -568,19 +590,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankName + * defaultValue: + * + * @param transCoBankName */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public void setTransCoBankName(String transCoBankName) { set("trans_co_bank_name", transCoBankName); } - + /** - * @return trans_co_bank_name + * @return trans_co_bank_name */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public String getTransCoBankName() { return getStr("trans_co_bank_name"); } @@ -590,19 +613,20 @@ public abstract class BaseOrderTrash> extends BaseMo * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankAccount + * defaultValue: + * + * @param transCoBankAccount */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public void setTransCoBankAccount(String transCoBankAccount) { set("trans_co_bank_account", transCoBankAccount); } - + /** - * @return trans_co_bank_account + * @return trans_co_bank_account */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public String getTransCoBankAccount() { return getStr("trans_co_bank_account"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java index 094ec56..7cda88f 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrdercluster.java @@ -15,8 +15,8 @@ public abstract class BaseOrdercluster> extends Ba public static final String tablename = "ordercluster"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseOrdercluster> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id 主键 */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(Integer id) { set("id", id); } - + /** * @return id 主键 */ - @JSONField(name="id") + @JSONField(name = "id") public Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseOrdercluster> extends Ba * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public void setUuid(String uuid) { set("uuid", uuid); } - + /** * @return uuid UUID 唯一验证 */ - @JSONField(name="uuid") + @JSONField(name = "uuid") public String getUuid() { return getStr("uuid"); } @@ -69,19 +71,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param totalWeight 总量 */ - @JSONField(name="total_weight") + @JSONField(name = "total_weight") public void setTotalWeight(java.math.BigDecimal totalWeight) { set("total_weight", totalWeight); } - + /** * @return total_weight 总量 */ - @JSONField(name="total_weight") + @JSONField(name = "total_weight") public java.math.BigDecimal getTotalWeight() { return get("total_weight"); } @@ -91,19 +94,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param avgWeight 预估每车重量，根据这个生成订单。实际结算已净重为准 */ - @JSONField(name="avg_weight") + @JSONField(name = "avg_weight") public void setAvgWeight(java.math.BigDecimal avgWeight) { set("avg_weight", avgWeight); } - + /** * @return avg_weight 预估每车重量，根据这个生成订单。实际结算已净重为准 */ - @JSONField(name="avg_weight") + @JSONField(name = "avg_weight") public java.math.BigDecimal getAvgWeight() { return get("avg_weight"); } @@ -113,19 +117,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createTime 下单时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 下单时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -135,19 +140,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DATETIME(19) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param cutoffTime 客户要求的送货截止时间（限定的执行日期，只能在执行当前进行） */ - @JSONField(name="cutoff_time") + @JSONField(name = "cutoff_time") public void setCutoffTime(java.util.Date cutoffTime) { set("cutoff_time", cutoffTime); } - + /** * @return cutoff_time 客户要求的送货截止时间（限定的执行日期，只能在执行当前进行） */ - @JSONField(name="cutoff_time") + @JSONField(name = "cutoff_time") public java.util.Date getCutoffTime() { return get("cutoff_time"); } @@ -157,19 +163,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param completeTime 实际完成时间 */ - @JSONField(name="complete_time") + @JSONField(name = "complete_time") public void setCompleteTime(java.util.Date completeTime) { set("complete_time", completeTime); } - + /** * @return complete_time 实际完成时间 */ - @JSONField(name="complete_time") + @JSONField(name = "complete_time") public java.util.Date getCompleteTime() { return get("complete_time"); } @@ -179,19 +186,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param unitPrice 单价，以实际结算时的商品单价为准 */ - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public void setUnitPrice(java.math.BigDecimal unitPrice) { set("unit_price", unitPrice); } - + /** * @return unit_price 单价，以实际结算时的商品单价为准 */ - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public java.math.BigDecimal getUnitPrice() { return get("unit_price"); } @@ -201,19 +209,20 @@ public abstract class BaseOrdercluster> extends Ba * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param state 1.新建, 2.执行中 5.完成，9.取消 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1.新建, 2.执行中 5.完成，9.取消 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -223,19 +232,20 @@ public abstract class BaseOrdercluster> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -245,19 +255,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transDistance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public void setTransDistance(java.math.BigDecimal transDistance) { set("trans_distance", transDistance); } - + /** * @return trans_distance 运距 */ - @JSONField(name="trans_distance") + @JSONField(name = "trans_distance") public java.math.BigDecimal getTransDistance() { return get("trans_distance"); } @@ -268,18 +279,19 @@ public abstract class BaseOrdercluster> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param payType 支付方式： 1，现场支付； 2，在线支付 */ - @JSONField(name="pay_type") + @JSONField(name = "pay_type") public void setPayType(Integer payType) { set("pay_type", payType); } - + /** * @return pay_type 支付方式： 1，现场支付； 2，在线支付 */ - @JSONField(name="pay_type") + @JSONField(name = "pay_type") public Integer getPayType() { return getInt("pay_type"); } @@ -289,19 +301,20 @@ public abstract class BaseOrdercluster> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserId 创建该记录的用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** * @return create_user_id 创建该记录的用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -311,19 +324,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -334,18 +348,19 @@ public abstract class BaseOrdercluster> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param reqReceipt 是否需要发票，0 默认不需要，1需要 */ - @JSONField(name="req_receipt") + @JSONField(name = "req_receipt") public void setReqReceipt(Integer reqReceipt) { set("req_receipt", reqReceipt); } - + /** * @return req_receipt 是否需要发票，0 默认不需要，1需要 */ - @JSONField(name="req_receipt") + @JSONField(name = "req_receipt") public Integer getReqReceipt() { return getInt("req_receipt"); } @@ -356,18 +371,19 @@ public abstract class BaseOrdercluster> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -377,19 +393,20 @@ public abstract class BaseOrdercluster> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productId 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(Integer productId) { set("product_id", productId); } - + /** * @return product_id 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public Integer getProductId() { return getInt("product_id"); } @@ -399,19 +416,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productName 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public void setProductName(String productName) { set("product_name", productName); } - + /** * @return product_name 品类名称 */ - @JSONField(name="product_name") + @JSONField(name = "product_name") public String getProductName() { return getStr("product_name"); } @@ -421,19 +439,20 @@ public abstract class BaseOrdercluster> extends Ba * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerId + * defaultValue: + * + * @param customerId */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** - * @return customer_id + * @return customer_id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public Integer getCustomerId() { return getInt("customer_id"); } @@ -443,19 +462,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerName + * defaultValue: + * + * @param customerName */ - @JSONField(name="customer_name") + @JSONField(name = "customer_name") public void setCustomerName(String customerName) { set("customer_name", customerName); } - + /** - * @return customer_name + * @return customer_name */ - @JSONField(name="customer_name") + @JSONField(name = "customer_name") public String getCustomerName() { return getStr("customer_name"); } @@ -465,19 +485,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerTexpayerName 客户开票公司名称 */ - @JSONField(name="customer_texpayer_name") + @JSONField(name = "customer_texpayer_name") public void setCustomerTexpayerName(String customerTexpayerName) { set("customer_texpayer_name", customerTexpayerName); } - + /** * @return customer_texpayer_name 客户开票公司名称 */ - @JSONField(name="customer_texpayer_name") + @JSONField(name = "customer_texpayer_name") public String getCustomerTexpayerName() { return getStr("customer_texpayer_name"); } @@ -487,19 +508,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerTexpayerNum 客户纳税人识别号 */ - @JSONField(name="customer_texpayer_num") + @JSONField(name = "customer_texpayer_num") public void setCustomerTexpayerNum(String customerTexpayerNum) { set("customer_texpayer_num", customerTexpayerNum); } - + /** * @return customer_texpayer_num 客户纳税人识别号 */ - @JSONField(name="customer_texpayer_num") + @JSONField(name = "customer_texpayer_num") public String getCustomerTexpayerNum() { return getStr("customer_texpayer_num"); } @@ -509,19 +531,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerAddress + * defaultValue: + * + * @param customerAddress */ - @JSONField(name="customer_address") + @JSONField(name = "customer_address") public void setCustomerAddress(String customerAddress) { set("customer_address", customerAddress); } - + /** - * @return customer_address + * @return customer_address */ - @JSONField(name="customer_address") + @JSONField(name = "customer_address") public String getCustomerAddress() { return getStr("customer_address"); } @@ -531,19 +554,20 @@ public abstract class BaseOrdercluster> extends Ba * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerPhone + * defaultValue: + * + * @param customerPhone */ - @JSONField(name="customer_phone") + @JSONField(name = "customer_phone") public void setCustomerPhone(String customerPhone) { set("customer_phone", customerPhone); } - + /** - * @return customer_phone + * @return customer_phone */ - @JSONField(name="customer_phone") + @JSONField(name = "customer_phone") public String getCustomerPhone() { return getStr("customer_phone"); } @@ -553,19 +577,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerBankName + * defaultValue: + * + * @param customerBankName */ - @JSONField(name="customer_bank_name") + @JSONField(name = "customer_bank_name") public void setCustomerBankName(String customerBankName) { set("customer_bank_name", customerBankName); } - + /** - * @return customer_bank_name + * @return customer_bank_name */ - @JSONField(name="customer_bank_name") + @JSONField(name = "customer_bank_name") public String getCustomerBankName() { return getStr("customer_bank_name"); } @@ -575,19 +600,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param customerBankAccount + * defaultValue: + * + * @param customerBankAccount */ - @JSONField(name="customer_bank_account") + @JSONField(name = "customer_bank_account") public void setCustomerBankAccount(String customerBankAccount) { set("customer_bank_account", customerBankAccount); } - + /** - * @return customer_bank_account + * @return customer_bank_account */ - @JSONField(name="customer_bank_account") + @JSONField(name = "customer_bank_account") public String getCustomerBankAccount() { return getStr("customer_bank_account"); } @@ -597,19 +623,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverName 收货人 */ - @JSONField(name="customer_receiver_name") + @JSONField(name = "customer_receiver_name") public void setCustomerReceiverName(String customerReceiverName) { set("customer_receiver_name", customerReceiverName); } - + /** * @return customer_receiver_name 收货人 */ - @JSONField(name="customer_receiver_name") + @JSONField(name = "customer_receiver_name") public String getCustomerReceiverName() { return getStr("customer_receiver_name"); } @@ -619,19 +646,20 @@ public abstract class BaseOrdercluster> extends Ba * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverPhone 收货人电话 */ - @JSONField(name="customer_receiver_phone") + @JSONField(name = "customer_receiver_phone") public void setCustomerReceiverPhone(String customerReceiverPhone) { set("customer_receiver_phone", customerReceiverPhone); } - + /** * @return customer_receiver_phone 收货人电话 */ - @JSONField(name="customer_receiver_phone") + @JSONField(name = "customer_receiver_phone") public String getCustomerReceiverPhone() { return getStr("customer_receiver_phone"); } @@ -641,19 +669,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverAddress 送货地址 */ - @JSONField(name="customer_receiver_address") + @JSONField(name = "customer_receiver_address") public void setCustomerReceiverAddress(String customerReceiverAddress) { set("customer_receiver_address", customerReceiverAddress); } - + /** * @return customer_receiver_address 送货地址 */ - @JSONField(name="customer_receiver_address") + @JSONField(name = "customer_receiver_address") public String getCustomerReceiverAddress() { return getStr("customer_receiver_address"); } @@ -663,19 +692,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DECIMAL(12,8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverLgtd 收货地址经度 */ - @JSONField(name="customer_receiver_lgtd") + @JSONField(name = "customer_receiver_lgtd") public void setCustomerReceiverLgtd(java.math.BigDecimal customerReceiverLgtd) { set("customer_receiver_lgtd", customerReceiverLgtd); } - + /** * @return customer_receiver_lgtd 收货地址经度 */ - @JSONField(name="customer_receiver_lgtd") + @JSONField(name = "customer_receiver_lgtd") public java.math.BigDecimal getCustomerReceiverLgtd() { return get("customer_receiver_lgtd"); } @@ -685,19 +715,20 @@ public abstract class BaseOrdercluster> extends Ba * type: DECIMAL(12,8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerReceiverLttd 收货地址纬度 */ - @JSONField(name="customer_receiver_lttd") + @JSONField(name = "customer_receiver_lttd") public void setCustomerReceiverLttd(java.math.BigDecimal customerReceiverLttd) { set("customer_receiver_lttd", customerReceiverLttd); } - + /** * @return customer_receiver_lttd 收货地址纬度 */ - @JSONField(name="customer_receiver_lttd") + @JSONField(name = "customer_receiver_lttd") public java.math.BigDecimal getCustomerReceiverLttd() { return get("customer_receiver_lttd"); } @@ -707,19 +738,20 @@ public abstract class BaseOrdercluster> extends Ba * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public Integer getTransCoId() { return getInt("trans_co_id"); } @@ -729,19 +761,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoName + * defaultValue: + * + * @param transCoName */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public void setTransCoName(String transCoName) { set("trans_co_name", transCoName); } - + /** - * @return trans_co_name + * @return trans_co_name */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public String getTransCoName() { return getStr("trans_co_name"); } @@ -751,19 +784,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoTexpayerName 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public void setTransCoTexpayerName(String transCoTexpayerName) { set("trans_co_texpayer_name", transCoTexpayerName); } - + /** * @return trans_co_texpayer_name 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public String getTransCoTexpayerName() { return getStr("trans_co_texpayer_name"); } @@ -773,19 +807,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoTexpayerNum + * defaultValue: + * + * @param transCoTexpayerNum */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public void setTransCoTexpayerNum(String transCoTexpayerNum) { set("trans_co_texpayer_num", transCoTexpayerNum); } - + /** - * @return trans_co_texpayer_num + * @return trans_co_texpayer_num */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public String getTransCoTexpayerNum() { return getStr("trans_co_texpayer_num"); } @@ -795,19 +830,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoAddress + * defaultValue: + * + * @param transCoAddress */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public void setTransCoAddress(String transCoAddress) { set("trans_co_address", transCoAddress); } - + /** - * @return trans_co_address + * @return trans_co_address */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public String getTransCoAddress() { return getStr("trans_co_address"); } @@ -817,19 +853,20 @@ public abstract class BaseOrdercluster> extends Ba * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoPhone + * defaultValue: + * + * @param transCoPhone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public void setTransCoPhone(String transCoPhone) { set("trans_co_phone", transCoPhone); } - + /** - * @return trans_co_phone + * @return trans_co_phone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public String getTransCoPhone() { return getStr("trans_co_phone"); } @@ -839,19 +876,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankName + * defaultValue: + * + * @param transCoBankName */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public void setTransCoBankName(String transCoBankName) { set("trans_co_bank_name", transCoBankName); } - + /** - * @return trans_co_bank_name + * @return trans_co_bank_name */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public String getTransCoBankName() { return getStr("trans_co_bank_name"); } @@ -861,19 +899,20 @@ public abstract class BaseOrdercluster> extends Ba * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankAccount + * defaultValue: + * + * @param transCoBankAccount */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public void setTransCoBankAccount(String transCoBankAccount) { set("trans_co_bank_account", transCoBankAccount); } - + /** - * @return trans_co_bank_account + * @return trans_co_bank_account */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public String getTransCoBankAccount() { return getStr("trans_co_bank_account"); } @@ -884,18 +923,19 @@ public abstract class BaseOrdercluster> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param timeInterval 1.全天，2.上午，3.下午 */ - @JSONField(name="time_interval") + @JSONField(name = "time_interval") public void setTimeInterval(Integer timeInterval) { set("time_interval", timeInterval); } - + /** * @return time_interval 1.全天，2.上午，3.下午 */ - @JSONField(name="time_interval") + @JSONField(name = "time_interval") public Integer getTimeInterval() { return getInt("time_interval"); } @@ -906,18 +946,19 @@ public abstract class BaseOrdercluster> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param miniTruck 最少指派的车辆数 */ - @JSONField(name="mini_truck") + @JSONField(name = "mini_truck") public void setMiniTruck(Integer miniTruck) { set("mini_truck", miniTruck); } - + /** * @return mini_truck 最少指派的车辆数 */ - @JSONField(name="mini_truck") + @JSONField(name = "mini_truck") public Integer getMiniTruck() { return getInt("mini_truck"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java index 786a512..98da9d0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderclusterTruck.java @@ -15,8 +15,8 @@ public abstract class BaseOrderclusterTruck> public static final String tablename = "ordercluster_truck"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseOrderclusterTruck> * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseOrderclusterTruck> * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param orderclusterId + * defaultValue: + * + * @param orderclusterId */ - @JSONField(name="ordercluster_id") + @JSONField(name = "ordercluster_id") public void setOrderclusterId(Integer orderclusterId) { set("ordercluster_id", orderclusterId); } - + /** - * @return ordercluster_id + * @return ordercluster_id */ - @JSONField(name="ordercluster_id") + @JSONField(name = "ordercluster_id") public Integer getOrderclusterId() { return getInt("ordercluster_id"); } @@ -69,19 +71,20 @@ public abstract class BaseOrderclusterTruck> * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param truckLicense + * defaultValue: + * + * @param truckLicense */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** - * @return truck_license + * @return truck_license */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -92,18 +95,19 @@ public abstract class BaseOrderclusterTruck> * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOssfileLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOssfileLog.java index a0db2ff..1fae125 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOssfileLog.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOssfileLog.java @@ -15,8 +15,8 @@ public abstract class BaseOssfileLog> extends BaseMo public static final String tablename = "ossfile_log"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseOssfileLog> extends BaseMo * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseOssfileLog> extends BaseMo * type: CHAR(32) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transportId transport id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public void setTransportId(String transportId) { set("transport_id", transportId); } - + /** * @return transport_id transport id */ - @JSONField(name="transport_id") + @JSONField(name = "transport_id") public String getTransportId() { return getStr("transport_id"); } @@ -69,19 +71,20 @@ public abstract class BaseOssfileLog> extends BaseMo * type: SMALLINT(5) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param state 0 待上传，1上传成功 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 0 待上传，1上传成功 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -91,19 +94,20 @@ public abstract class BaseOssfileLog> extends BaseMo * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param osskey + * defaultValue: + * + * @param osskey */ - @JSONField(name="osskey") + @JSONField(name = "osskey") public void setOsskey(String osskey) { set("osskey", osskey); } - + /** - * @return osskey + * @return osskey */ - @JSONField(name="osskey") + @JSONField(name = "osskey") public String getOsskey() { return getStr("osskey"); } @@ -113,19 +117,20 @@ public abstract class BaseOssfileLog> extends BaseMo * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param absolutepath 文件绝对路径 */ - @JSONField(name="absolutepath") + @JSONField(name = "absolutepath") public void setAbsolutepath(String absolutepath) { set("absolutepath", absolutepath); } - + /** * @return absolutepath 文件绝对路径 */ - @JSONField(name="absolutepath") + @JSONField(name = "absolutepath") public String getAbsolutepath() { return getStr("absolutepath"); } @@ -135,19 +140,20 @@ public abstract class BaseOssfileLog> extends BaseMo * type: DATETIME(19) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createTime 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -158,18 +164,19 @@ public abstract class BaseOssfileLog> extends BaseMo * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayCustomer.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayCustomer.java index 21e0698..b9f1867 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayCustomer.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayCustomer.java @@ -15,8 +15,8 @@ public abstract class BasePrepayCustomer> extend public static final String tablename = "prepay_customer"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BasePrepayCustomer> extend * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BasePrepayCustomer> extend * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerId 客户表 customer 的 id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** * @return customer_id 客户表 customer 的 id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public Integer getCustomerId() { return getInt("customer_id"); } @@ -69,19 +71,20 @@ public abstract class BasePrepayCustomer> extend * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -92,18 +95,19 @@ public abstract class BasePrepayCustomer> extend * isNullable: NO * isPrimaryKey: NO * defaultValue: 0.00 + * * @param surplus 账户余额 */ - @JSONField(name="surplus") + @JSONField(name = "surplus") public void setSurplus(java.math.BigDecimal surplus) { set("surplus", surplus); } - + /** * @return surplus 账户余额 */ - @JSONField(name="surplus") + @JSONField(name = "surplus") public java.math.BigDecimal getSurplus() { return get("surplus"); } @@ -113,19 +117,20 @@ public abstract class BasePrepayCustomer> extend * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param rechargeTime 最后充值时间 */ - @JSONField(name="recharge_time") + @JSONField(name = "recharge_time") public void setRechargeTime(java.util.Date rechargeTime) { set("recharge_time", rechargeTime); } - + /** * @return recharge_time 最后充值时间 */ - @JSONField(name="recharge_time") + @JSONField(name = "recharge_time") public java.util.Date getRechargeTime() { return get("recharge_time"); } @@ -135,19 +140,20 @@ public abstract class BasePrepayCustomer> extend * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param spendTime 最后消费时间 */ - @JSONField(name="spend_time") + @JSONField(name = "spend_time") public void setSpendTime(java.util.Date spendTime) { set("spend_time", spendTime); } - + /** * @return spend_time 最后消费时间 */ - @JSONField(name="spend_time") + @JSONField(name = "spend_time") public java.util.Date getSpendTime() { return get("spend_time"); } @@ -157,19 +163,20 @@ public abstract class BasePrepayCustomer> extend * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param firstRechargeTime 第一次充值时间 */ - @JSONField(name="first_recharge_time") + @JSONField(name = "first_recharge_time") public void setFirstRechargeTime(java.util.Date firstRechargeTime) { set("first_recharge_time", firstRechargeTime); } - + /** * @return first_recharge_time 第一次充值时间 */ - @JSONField(name="first_recharge_time") + @JSONField(name = "first_recharge_time") public java.util.Date getFirstRechargeTime() { return get("first_recharge_time"); } @@ -180,9 +187,10 @@ public abstract class BasePrepayCustomer> extend * isNullable: YES * isPrimaryKey: NO * defaultValue: 3000.00 + * * @param threshold 余额预警阈值 */ - @JSONField(name="threshold") + @JSONField(name = "threshold") public void setThreshold(java.math.BigDecimal threshold) { set("threshold", threshold); } @@ -191,7 +199,7 @@ public abstract class BasePrepayCustomer> extend /** * @return threshold 余额预警阈值 */ - @JSONField(name="threshold") + @JSONField(name = "threshold") public java.math.BigDecimal getThreshold() { return get("threshold"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetail.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetail.java index 9ec8133..d90de04 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetail.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetail.java @@ -15,8 +15,8 @@ public abstract class BasePrepayDetail> extends Ba public static final String tablename = "prepay_detail"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BasePrepayDetail> extends Ba * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BasePrepayDetail> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerId 客户id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** * @return customer_id 客户id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public Integer getCustomerId() { return getInt("customer_id"); } @@ -69,19 +71,20 @@ public abstract class BasePrepayDetail> extends Ba * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -92,18 +95,19 @@ public abstract class BasePrepayDetail> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 0.00 + * * @param amount 充值金额 */ - @JSONField(name="amount") + @JSONField(name = "amount") public void setAmount(java.math.BigDecimal amount) { set("amount", amount); } - + /** * @return amount 充值金额 */ - @JSONField(name="amount") + @JSONField(name = "amount") public java.math.BigDecimal getAmount() { return get("amount"); } @@ -113,19 +117,20 @@ public abstract class BasePrepayDetail> extends Ba * type: VARCHAR(100) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param contactName 联系人 */ - @JSONField(name="contact_name") + @JSONField(name = "contact_name") public void setContactName(String contactName) { set("contact_name", contactName); } - + /** * @return contact_name 联系人 */ - @JSONField(name="contact_name") + @JSONField(name = "contact_name") public String getContactName() { return getStr("contact_name"); } @@ -135,19 +140,20 @@ public abstract class BasePrepayDetail> extends Ba * type: VARCHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param contactPhone 联系人电话 */ - @JSONField(name="contact_phone") + @JSONField(name = "contact_phone") public void setContactPhone(String contactPhone) { set("contact_phone", contactPhone); } - + /** * @return contact_phone 联系人电话 */ - @JSONField(name="contact_phone") + @JSONField(name = "contact_phone") public String getContactPhone() { return getStr("contact_phone"); } @@ -157,19 +163,20 @@ public abstract class BasePrepayDetail> extends Ba * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bankName 转账银行 */ - @JSONField(name="bank_name") + @JSONField(name = "bank_name") public void setBankName(String bankName) { set("bank_name", bankName); } - + /** * @return bank_name 转账银行 */ - @JSONField(name="bank_name") + @JSONField(name = "bank_name") public String getBankName() { return getStr("bank_name"); } @@ -179,19 +186,20 @@ public abstract class BasePrepayDetail> extends Ba * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bankAccount 转账人（单位）银行账号 */ - @JSONField(name="bank_account") + @JSONField(name = "bank_account") public void setBankAccount(String bankAccount) { set("bank_account", bankAccount); } - + /** * @return bank_account 转账人（单位）银行账号 */ - @JSONField(name="bank_account") + @JSONField(name = "bank_account") public String getBankAccount() { return getStr("bank_account"); } @@ -201,19 +209,20 @@ public abstract class BasePrepayDetail> extends Ba * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param serialnum 转账付费银行流水号 */ - @JSONField(name="serialnum") + @JSONField(name = "serialnum") public void setSerialnum(String serialnum) { set("serialnum", serialnum); } - + /** * @return serialnum 转账付费银行流水号 */ - @JSONField(name="serialnum") + @JSONField(name = "serialnum") public String getSerialnum() { return getStr("serialnum"); } @@ -224,24 +233,25 @@ public abstract class BasePrepayDetail> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 付费状态。 -1.提交、待审核，不计入余额 -2.审核通过，计入余额 -9.作废 + * 1.提交、待审核，不计入余额 + * 2.审核通过，计入余额 + * 9.作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 付费状态。 -1.提交、待审核，不计入余额 -2.审核通过，计入余额 -9.作废 + * 1.提交、待审核，不计入余额 + * 2.审核通过，计入余额 + * 9.作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -252,18 +262,19 @@ public abstract class BasePrepayDetail> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -274,18 +285,19 @@ public abstract class BasePrepayDetail> extends Ba * isNullable: YES * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -295,19 +307,20 @@ public abstract class BasePrepayDetail> extends Ba * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param verifyTime 审核时间，不论审核是否通过都更新 */ - @JSONField(name="verify_time") + @JSONField(name = "verify_time") public void setVerifyTime(java.util.Date verifyTime) { set("verify_time", verifyTime); } - + /** * @return verify_time 审核时间，不论审核是否通过都更新 */ - @JSONField(name="verify_time") + @JSONField(name = "verify_time") public java.util.Date getVerifyTime() { return get("verify_time"); } @@ -318,18 +331,19 @@ public abstract class BasePrepayDetail> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param type 1 正常充值，2 结算时补差额 */ - @JSONField(name="type") + @JSONField(name = "type") public void setType(Integer type) { set("type", type); } - + /** * @return type 1 正常充值，2 结算时补差额 */ - @JSONField(name="type") + @JSONField(name = "type") public Integer getType() { return getInt("type"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java index 8a096c7..64ea436 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePrepayDetailStateHistory.java @@ -8,7 +8,7 @@ import com.alibaba.fastjson.annotation.JSONField; * Generated by COWR Mon May 18 15:39:47 CST 2020 * TableName: prepay_detail_state_history * Remarks: 客户相关 - 客户预付费记录状态变化日志 - + *

* PrimaryKey: id */ @SuppressWarnings("serial") @@ -16,8 +16,8 @@ public abstract class BasePrepayDetailStateHistory> extends Base public static final String tablename = "prepay_truck"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BasePrepayTruck> extends Base * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BasePrepayTruck> extends Base * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerId 客户表 customer 的 id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** * @return customer_id 客户表 customer 的 id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public Integer getCustomerId() { return getInt("customer_id"); } @@ -69,19 +71,20 @@ public abstract class BasePrepayTruck> extends Base * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param truckLicense 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** * @return truck_license 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -91,19 +94,20 @@ public abstract class BasePrepayTruck> extends Base * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 物流公司 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public Integer getTransCoId() { return getInt("trans_co_id"); } @@ -113,19 +117,20 @@ public abstract class BasePrepayTruck> extends Base * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -136,18 +141,19 @@ public abstract class BasePrepayTruck> extends Base * isNullable: YES * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -157,19 +163,20 @@ public abstract class BasePrepayTruck> extends Base * type: DATE(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param validDate 有效日期 */ - @JSONField(name="valid_date") + @JSONField(name = "valid_date") public void setValidDate(java.util.Date validDate) { set("valid_date", validDate); } - + /** * @return valid_date 有效日期 */ - @JSONField(name="valid_date") + @JSONField(name = "valid_date") public java.util.Date getValidDate() { return get("valid_date"); } @@ -179,19 +186,20 @@ public abstract class BasePrepayTruck> extends Base * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserId 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** * @return create_user_id 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -201,19 +209,20 @@ public abstract class BasePrepayTruck> extends Base * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名称 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名称 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -224,18 +233,19 @@ public abstract class BasePrepayTruck> extends Base * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param type 1 配送车辆，算运费，3 外销车辆，不算运费，type 值和订单类型的type对应 */ - @JSONField(name="type") + @JSONField(name = "type") public void setType(Integer type) { set("type", type); } - + /** * @return type 1 配送车辆，算运费，3 外销车辆，不算运费，type 值和订单类型的type对应 */ - @JSONField(name="type") + @JSONField(name = "type") public Integer getType() { return getInt("type"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProduct.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProduct.java index 0b3ad1e..79a57cb 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProduct.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseProduct.java @@ -15,8 +15,8 @@ public abstract class BaseProduct> extends BaseModel public static final String tablename = "product"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseProduct> extends BaseModel * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseProduct> extends BaseModel * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name 商品名称 */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** * @return name 商品名称 */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -70,18 +72,19 @@ public abstract class BaseProduct> extends BaseModel * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param del 逻辑删除标记 */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(java.lang.Integer del) { set("del", del); } - + /** * @return del 逻辑删除标记 */ - @JSONField(name="del") + @JSONField(name = "del") public java.lang.Integer getDel() { return getInt("del"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePurchase.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePurchase.java index 250c9d6..4a5df90 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePurchase.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BasePurchase.java @@ -15,8 +15,8 @@ public abstract class BasePurchase> extends BaseModel< public static final String tablename = "purchase"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BasePurchase> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BasePurchase> extends BaseModel< * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name 名称 */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** * @return name 名称 */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -69,19 +71,20 @@ public abstract class BasePurchase> extends BaseModel< * type: DECIMAL(12,8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param lgtd + * defaultValue: + * + * @param lgtd */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public void setLgtd(java.math.BigDecimal lgtd) { set("lgtd", lgtd); } - + /** - * @return lgtd + * @return lgtd */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public java.math.BigDecimal getLgtd() { return get("lgtd"); } @@ -91,19 +94,20 @@ public abstract class BasePurchase> extends BaseModel< * type: DECIMAL(12,8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param lttd + * defaultValue: + * + * @param lttd */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public void setLttd(java.math.BigDecimal lttd) { set("lttd", lttd); } - + /** - * @return lttd + * @return lttd */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public java.math.BigDecimal getLttd() { return get("lttd"); } @@ -113,19 +117,20 @@ public abstract class BasePurchase> extends BaseModel< * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param address 地址 */ - @JSONField(name="address") + @JSONField(name = "address") public void setAddress(java.lang.String address) { set("address", address); } - + /** * @return address 地址 */ - @JSONField(name="address") + @JSONField(name = "address") public java.lang.String getAddress() { return getStr("address"); } @@ -135,19 +140,20 @@ public abstract class BasePurchase> extends BaseModel< * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param contactName 负责人姓名 */ - @JSONField(name="contact_name") + @JSONField(name = "contact_name") public void setContactName(java.lang.String contactName) { set("contact_name", contactName); } - + /** * @return contact_name 负责人姓名 */ - @JSONField(name="contact_name") + @JSONField(name = "contact_name") public java.lang.String getContactName() { return getStr("contact_name"); } @@ -157,19 +163,20 @@ public abstract class BasePurchase> extends BaseModel< * type: VARCHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param contactPhone 负责人手机号 */ - @JSONField(name="contact_phone") + @JSONField(name = "contact_phone") public void setContactPhone(java.lang.String contactPhone) { set("contact_phone", contactPhone); } - + /** * @return contact_phone 负责人手机号 */ - @JSONField(name="contact_phone") + @JSONField(name = "contact_phone") public java.lang.String getContactPhone() { return getStr("contact_phone"); } @@ -179,19 +186,20 @@ public abstract class BasePurchase> extends BaseModel< * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param memo + * defaultValue: + * + * @param memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(java.lang.String memo) { set("memo", memo); } - + /** - * @return memo + * @return memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public java.lang.String getMemo() { return getStr("memo"); } @@ -202,18 +210,19 @@ public abstract class BasePurchase> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param del 逻辑删除标记 */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(java.lang.Integer del) { set("del", del); } - + /** * @return del 逻辑删除标记 */ - @JSONField(name="del") + @JSONField(name = "del") public java.lang.Integer getDel() { return getInt("del"); } @@ -224,18 +233,19 @@ public abstract class BasePurchase> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: 0.00 + * * @param offset 因路况较差、在运费之外的基础上加上 净重 * 1 补贴，即最终运费： 运费单价 * 净重 + 净重 * 1 */ - @JSONField(name="offset") + @JSONField(name = "offset") public void setOffset(java.math.BigDecimal offset) { set("offset", offset); } - + /** * @return offset 因路况较差、在运费之外的基础上加上 净重 * 1 补贴，即最终运费： 运费单价 * 净重 + 净重 * 1 */ - @JSONField(name="offset") + @JSONField(name = "offset") public java.math.BigDecimal getOffset() { return get("offset"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetail.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetail.java index 9804b7f..bdd7ea4 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetail.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetail.java @@ -15,8 +15,8 @@ public abstract class BaseRefundDetail> extends Ba public static final String tablename = "refund_detail"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseRefundDetail> extends Ba * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseRefundDetail> extends Ba * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param customerId 客户id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public void setCustomerId(Integer customerId) { set("customer_id", customerId); } - + /** * @return customer_id 客户id */ - @JSONField(name="customer_id") + @JSONField(name = "customer_id") public Integer getCustomerId() { return getInt("customer_id"); } @@ -69,19 +71,20 @@ public abstract class BaseRefundDetail> extends Ba * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -92,18 +95,19 @@ public abstract class BaseRefundDetail> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 0.00 + * * @param amount 退费金额 */ - @JSONField(name="amount") + @JSONField(name = "amount") public void setAmount(java.math.BigDecimal amount) { set("amount", amount); } - + /** * @return amount 退费金额 */ - @JSONField(name="amount") + @JSONField(name = "amount") public java.math.BigDecimal getAmount() { return get("amount"); } @@ -113,19 +117,20 @@ public abstract class BaseRefundDetail> extends Ba * type: VARCHAR(100) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param contactName 联系人 */ - @JSONField(name="contact_name") + @JSONField(name = "contact_name") public void setContactName(String contactName) { set("contact_name", contactName); } - + /** * @return contact_name 联系人 */ - @JSONField(name="contact_name") + @JSONField(name = "contact_name") public String getContactName() { return getStr("contact_name"); } @@ -135,19 +140,20 @@ public abstract class BaseRefundDetail> extends Ba * type: VARCHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param contactPhone 联系人电话 */ - @JSONField(name="contact_phone") + @JSONField(name = "contact_phone") public void setContactPhone(String contactPhone) { set("contact_phone", contactPhone); } - + /** * @return contact_phone 联系人电话 */ - @JSONField(name="contact_phone") + @JSONField(name = "contact_phone") public String getContactPhone() { return getStr("contact_phone"); } @@ -157,19 +163,20 @@ public abstract class BaseRefundDetail> extends Ba * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bankName 转账银行 */ - @JSONField(name="bank_name") + @JSONField(name = "bank_name") public void setBankName(String bankName) { set("bank_name", bankName); } - + /** * @return bank_name 转账银行 */ - @JSONField(name="bank_name") + @JSONField(name = "bank_name") public String getBankName() { return getStr("bank_name"); } @@ -179,19 +186,20 @@ public abstract class BaseRefundDetail> extends Ba * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bankAccount 转账人（单位）银行账号 */ - @JSONField(name="bank_account") + @JSONField(name = "bank_account") public void setBankAccount(String bankAccount) { set("bank_account", bankAccount); } - + /** * @return bank_account 转账人（单位）银行账号 */ - @JSONField(name="bank_account") + @JSONField(name = "bank_account") public String getBankAccount() { return getStr("bank_account"); } @@ -201,19 +209,20 @@ public abstract class BaseRefundDetail> extends Ba * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param serialnum 转账付费银行流水号 */ - @JSONField(name="serialnum") + @JSONField(name = "serialnum") public void setSerialnum(String serialnum) { set("serialnum", serialnum); } - + /** * @return serialnum 转账付费银行流水号 */ - @JSONField(name="serialnum") + @JSONField(name = "serialnum") public String getSerialnum() { return getStr("serialnum"); } @@ -224,26 +233,27 @@ public abstract class BaseRefundDetail> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 付费状态。 -1.提交、待审核，不计入余额 -2.审核通过，不计入余额 -3.执行退费，计入余额 -9.作废 + * 1.提交、待审核，不计入余额 + * 2.审核通过，不计入余额 + * 3.执行退费，计入余额 + * 9.作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 付费状态。 -1.提交、待审核，不计入余额 -2.审核通过，不计入余额 -3.执行退费，计入余额 -9.作废 + * 1.提交、待审核，不计入余额 + * 2.审核通过，不计入余额 + * 3.执行退费，计入余额 + * 9.作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -254,18 +264,19 @@ public abstract class BaseRefundDetail> extends Ba * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -276,18 +287,19 @@ public abstract class BaseRefundDetail> extends Ba * isNullable: YES * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -297,19 +309,20 @@ public abstract class BaseRefundDetail> extends Ba * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param verifyTime 审核时间，不论审核是否通过都更新 */ - @JSONField(name="verify_time") + @JSONField(name = "verify_time") public void setVerifyTime(java.util.Date verifyTime) { set("verify_time", verifyTime); } - + /** * @return verify_time 审核时间，不论审核是否通过都更新 */ - @JSONField(name="verify_time") + @JSONField(name = "verify_time") public java.util.Date getVerifyTime() { return get("verify_time"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java index 758cbff..72dacee 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseRefundDetailStateHistory.java @@ -15,8 +15,8 @@ public abstract class BaseRefundDetailStateHistory> extends BaseModel< public static final String tablename = "sandfarm"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseSandfarm> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseSandfarm> extends BaseModel< * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name 名称 */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** * @return name 名称 */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -69,19 +71,20 @@ public abstract class BaseSandfarm> extends BaseModel< * type: DECIMAL(12,8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param lgtd + * defaultValue: + * + * @param lgtd */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public void setLgtd(java.math.BigDecimal lgtd) { set("lgtd", lgtd); } - + /** - * @return lgtd + * @return lgtd */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public java.math.BigDecimal getLgtd() { return get("lgtd"); } @@ -91,19 +94,20 @@ public abstract class BaseSandfarm> extends BaseModel< * type: DECIMAL(12,8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param lttd + * defaultValue: + * + * @param lttd */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public void setLttd(java.math.BigDecimal lttd) { set("lttd", lttd); } - + /** - * @return lttd + * @return lttd */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public java.math.BigDecimal getLttd() { return get("lttd"); } @@ -113,19 +117,20 @@ public abstract class BaseSandfarm> extends BaseModel< * type: VARCHAR(255) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param address 地址 */ - @JSONField(name="address") + @JSONField(name = "address") public void setAddress(java.lang.String address) { set("address", address); } - + /** * @return address 地址 */ - @JSONField(name="address") + @JSONField(name = "address") public java.lang.String getAddress() { return getStr("address"); } @@ -135,19 +140,20 @@ public abstract class BaseSandfarm> extends BaseModel< * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param contactName 负责人姓名 */ - @JSONField(name="contact_name") + @JSONField(name = "contact_name") public void setContactName(java.lang.String contactName) { set("contact_name", contactName); } - + /** * @return contact_name 负责人姓名 */ - @JSONField(name="contact_name") + @JSONField(name = "contact_name") public java.lang.String getContactName() { return getStr("contact_name"); } @@ -157,19 +163,20 @@ public abstract class BaseSandfarm> extends BaseModel< * type: VARCHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param contactPhone 负责人手机号 */ - @JSONField(name="contact_phone") + @JSONField(name = "contact_phone") public void setContactPhone(java.lang.String contactPhone) { set("contact_phone", contactPhone); } - + /** * @return contact_phone 负责人手机号 */ - @JSONField(name="contact_phone") + @JSONField(name = "contact_phone") public java.lang.String getContactPhone() { return getStr("contact_phone"); } @@ -179,19 +186,20 @@ public abstract class BaseSandfarm> extends BaseModel< * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param memo + * defaultValue: + * + * @param memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(java.lang.String memo) { set("memo", memo); } - + /** - * @return memo + * @return memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public java.lang.String getMemo() { return getStr("memo"); } @@ -202,18 +210,19 @@ public abstract class BaseSandfarm> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param del 逻辑删除标记 */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(java.lang.Integer del) { set("del", del); } - + /** * @return del 逻辑删除标记 */ - @JSONField(name="del") + @JSONField(name = "del") public java.lang.Integer getDel() { return getInt("del"); } @@ -224,18 +233,19 @@ public abstract class BaseSandfarm> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: 0.00 + * * @param offset 因路况较差、在运费之外的基础上加上 净重 * 1 补贴，即最终运费： 运费单价 * 净重 + 净重 * 1 */ - @JSONField(name="offset") + @JSONField(name = "offset") public void setOffset(java.math.BigDecimal offset) { set("offset", offset); } - + /** * @return offset 因路况较差、在运费之外的基础上加上 净重 * 1 补贴，即最终运费： 运费单价 * 净重 + 净重 * 1 */ - @JSONField(name="offset") + @JSONField(name = "offset") public java.math.BigDecimal getOffset() { return get("offset"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java index 694d516..2fe922d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java @@ -15,8 +15,8 @@ public abstract class BaseSmsLog> extends BaseModel i public static final String tablename = "sms_log"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param phone 手机号 */ - @JSONField(name="phone") + @JSONField(name = "phone") public void setPhone(String phone) { set("phone", phone); } - + /** * @return phone 手机号 */ - @JSONField(name="phone") + @JSONField(name = "phone") public String getPhone() { return getStr("phone"); } @@ -69,19 +71,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param content 发送内容json */ - @JSONField(name="content") + @JSONField(name = "content") public void setContent(String content) { set("content", content); } - + /** * @return content 发送内容json */ - @JSONField(name="content") + @JSONField(name = "content") public String getContent() { return getStr("content"); } @@ -91,19 +94,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: DATETIME(19) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createTime 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -114,18 +118,19 @@ public abstract class BaseSmsLog> extends BaseModel i * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -135,19 +140,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: VARCHAR(50) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bizid 发送回执ID，可根据该ID在接口QuerySendDetails中查询具体的发送状态。 */ - @JSONField(name="bizid") + @JSONField(name = "bizid") public void setBizid(String bizid) { set("bizid", bizid); } - + /** * @return bizid 发送回执ID，可根据该ID在接口QuerySendDetails中查询具体的发送状态。 */ - @JSONField(name="bizid") + @JSONField(name = "bizid") public String getBizid() { return getStr("bizid"); } @@ -157,23 +163,24 @@ public abstract class BaseSmsLog> extends BaseModel i * type: VARCHAR(100) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param code 请求状态码。 - -返回OK代表请求成功。 + *

+ * 返回OK代表请求成功。 */ - @JSONField(name="code") + @JSONField(name = "code") public void setCode(String code) { set("code", code); } - + /** * @return code 请求状态码。 - -返回OK代表请求成功。 + *

+ * 返回OK代表请求成功。 */ - @JSONField(name="code") + @JSONField(name = "code") public String getCode() { return getStr("code"); } @@ -183,19 +190,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: VARCHAR(50) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param requestid 请求 ID。无论调用接口成功与否，都会返回请求 ID。 */ - @JSONField(name="requestid") + @JSONField(name = "requestid") public void setRequestid(String requestid) { set("requestid", requestid); } - + /** * @return requestid 请求 ID。无论调用接口成功与否，都会返回请求 ID。 */ - @JSONField(name="requestid") + @JSONField(name = "requestid") public String getRequestid() { return getStr("requestid"); } @@ -206,26 +214,27 @@ public abstract class BaseSmsLog> extends BaseModel i * isNullable: YES * isPrimaryKey: NO * defaultValue: 0 + * * @param sendstatus 短信发送状态，包括： -0：待发送 -1：等待回执。 -2：发送失败。 -3：发送成功。 + * 0：待发送 + * 1：等待回执。 + * 2：发送失败。 + * 3：发送成功。 */ - @JSONField(name="sendstatus") + @JSONField(name = "sendstatus") public void setSendstatus(Integer sendstatus) { set("sendstatus", sendstatus); } - + /** * @return sendstatus 短信发送状态，包括： -0：待发送 -1：等待回执。 -2：发送失败。 -3：发送成功。 + * 0：待发送 + * 1：等待回执。 + * 2：发送失败。 + * 3：发送成功。 */ - @JSONField(name="sendstatus") + @JSONField(name = "sendstatus") public Integer getSendstatus() { return getInt("sendstatus"); } @@ -235,19 +244,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: VARCHAR(500) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param sendcontent 实际发送的内容字符串 */ - @JSONField(name="sendcontent") + @JSONField(name = "sendcontent") public void setSendcontent(String sendcontent) { set("sendcontent", sendcontent); } - + /** * @return sendcontent 实际发送的内容字符串 */ - @JSONField(name="sendcontent") + @JSONField(name = "sendcontent") public String getSendcontent() { return getStr("sendcontent"); } @@ -257,31 +267,32 @@ public abstract class BaseSmsLog> extends BaseModel i * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param billNum 计费条数 -国内短信内容计费规则 -短信字数＝短信模版内容字数 + 签名字数。 - -短信字数<=70个字数，按照70个字数一条短信计算。 - -短信字数>70个字数，即为长短信，按照67个字数记为一条短信计算。 + * 国内短信内容计费规则 + * 短信字数＝短信模版内容字数 + 签名字数。 + *

+ * 短信字数<=70个字数，按照70个字数一条短信计算。 + *

+ * 短信字数>70个字数，即为长短信，按照67个字数记为一条短信计算。 */ - @JSONField(name="bill_num") + @JSONField(name = "bill_num") public void setBillNum(Integer billNum) { set("bill_num", billNum); } - + /** * @return bill_num 计费条数 -国内短信内容计费规则 -短信字数＝短信模版内容字数 + 签名字数。 - -短信字数<=70个字数，按照70个字数一条短信计算。 - -短信字数>70个字数，即为长短信，按照67个字数记为一条短信计算。 + * 国内短信内容计费规则 + * 短信字数＝短信模版内容字数 + 签名字数。 + *

+ * 短信字数<=70个字数，按照70个字数一条短信计算。 + *

+ * 短信字数>70个字数，即为长短信，按照67个字数记为一条短信计算。 */ - @JSONField(name="bill_num") + @JSONField(name = "bill_num") public Integer getBillNum() { return getInt("bill_num"); } @@ -291,19 +302,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param receivedate 接收时间 */ - @JSONField(name="receivedate") + @JSONField(name = "receivedate") public void setReceivedate(java.util.Date receivedate) { set("receivedate", receivedate); } - + /** * @return receivedate 接收时间 */ - @JSONField(name="receivedate") + @JSONField(name = "receivedate") public java.util.Date getReceivedate() { return get("receivedate"); } @@ -313,19 +325,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param senddate 实际发送时间 */ - @JSONField(name="senddate") + @JSONField(name = "senddate") public void setSenddate(java.util.Date senddate) { set("senddate", senddate); } - + /** * @return senddate 实际发送时间 */ - @JSONField(name="senddate") + @JSONField(name = "senddate") public java.util.Date getSenddate() { return get("senddate"); } @@ -335,19 +348,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: VARCHAR(50) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param relateTable 关联业务表名 */ - @JSONField(name="relate_table") + @JSONField(name = "relate_table") public void setRelateTable(String relateTable) { set("relate_table", relateTable); } - + /** * @return relate_table 关联业务表名 */ - @JSONField(name="relate_table") + @JSONField(name = "relate_table") public String getRelateTable() { return getStr("relate_table"); } @@ -357,19 +371,20 @@ public abstract class BaseSmsLog> extends BaseModel i * type: VARCHAR(32) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param relateId 关联业务表主键值 */ - @JSONField(name="relate_id") + @JSONField(name = "relate_id") public void setRelateId(String relateId) { set("relate_id", relateId); } - + /** * @return relate_id 关联业务表主键值 */ - @JSONField(name="relate_id") + @JSONField(name = "relate_id") public String getRelateId() { return getStr("relate_id"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStock.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStock.java index 2681f76..b331bd5 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStock.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStock.java @@ -15,8 +15,8 @@ public abstract class BaseStock> extends BaseModel imp public static final String tablename = "stock"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseStock> extends BaseModel imp * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -47,19 +48,20 @@ public abstract class BaseStock> extends BaseModel imp * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param productId 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(Integer productId) { set("product_id", productId); } - + /** * @return product_id 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public Integer getProductId() { return getInt("product_id"); } @@ -69,19 +71,20 @@ public abstract class BaseStock> extends BaseModel imp * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param stockWeight 砂站库存量 */ - @JSONField(name="stock_weight") + @JSONField(name = "stock_weight") public void setStockWeight(java.math.BigDecimal stockWeight) { set("stock_weight", stockWeight); } - + /** * @return stock_weight 砂站库存量 */ - @JSONField(name="stock_weight") + @JSONField(name = "stock_weight") public java.math.BigDecimal getStockWeight() { return get("stock_weight"); } @@ -92,18 +95,19 @@ public abstract class BaseStock> extends BaseModel imp * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStockModifyLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStockModifyLog.java index 3e08d17..eb45a00 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStockModifyLog.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseStockModifyLog.java @@ -15,8 +15,8 @@ public abstract class BaseStockModifyLog> extend public static final String tablename = "stock_modify_log"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseStockModifyLog> extend * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseStockModifyLog> extend * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -69,19 +71,20 @@ public abstract class BaseStockModifyLog> extend * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param productId 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(Integer productId) { set("product_id", productId); } - + /** * @return product_id 品类id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public Integer getProductId() { return getInt("product_id"); } @@ -91,19 +94,20 @@ public abstract class BaseStockModifyLog> extend * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param oldStockWeight 修改签该砂站原有的库存量 */ - @JSONField(name="old_stock_weight") + @JSONField(name = "old_stock_weight") public void setOldStockWeight(java.math.BigDecimal oldStockWeight) { set("old_stock_weight", oldStockWeight); } - + /** * @return old_stock_weight 修改签该砂站原有的库存量 */ - @JSONField(name="old_stock_weight") + @JSONField(name = "old_stock_weight") public java.math.BigDecimal getOldStockWeight() { return get("old_stock_weight"); } @@ -113,19 +117,20 @@ public abstract class BaseStockModifyLog> extend * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param newStockWeight 修改后该砂站的库存量 */ - @JSONField(name="new_stock_weight") + @JSONField(name = "new_stock_weight") public void setNewStockWeight(java.math.BigDecimal newStockWeight) { set("new_stock_weight", newStockWeight); } - + /** * @return new_stock_weight 修改后该砂站的库存量 */ - @JSONField(name="new_stock_weight") + @JSONField(name = "new_stock_weight") public java.math.BigDecimal getNewStockWeight() { return get("new_stock_weight"); } @@ -135,19 +140,20 @@ public abstract class BaseStockModifyLog> extend * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserId 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public void setCreateUserId(Integer createUserId) { set("create_user_id", createUserId); } - + /** * @return create_user_id 创建用户id */ - @JSONField(name="create_user_id") + @JSONField(name = "create_user_id") public Integer getCreateUserId() { return getInt("create_user_id"); } @@ -157,19 +163,20 @@ public abstract class BaseStockModifyLog> extend * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param createUserName 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public void setCreateUserName(String createUserName) { set("create_user_name", createUserName); } - + /** * @return create_user_name 创建用户名 */ - @JSONField(name="create_user_name") + @JSONField(name = "create_user_name") public String getCreateUserName() { return getStr("create_user_name"); } @@ -180,18 +187,19 @@ public abstract class BaseStockModifyLog> extend * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarket.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarket.java index b6bc2c3..3968913 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarket.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarket.java @@ -15,8 +15,8 @@ public abstract class BaseSupermarket> extends Base public static final String tablename = "supermarket"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseSupermarket> extends Base * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseSupermarket> extends Base * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param name + * defaultValue: + * + * @param name */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(String name) { set("name", name); } - + /** - * @return name + * @return name */ - @JSONField(name="name") + @JSONField(name = "name") public String getName() { return getStr("name"); } @@ -69,19 +71,20 @@ public abstract class BaseSupermarket> extends Base * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name2 名称简写 */ - @JSONField(name="name2") + @JSONField(name = "name2") public void setName2(String name2) { set("name2", name2); } - + /** * @return name2 名称简写 */ - @JSONField(name="name2") + @JSONField(name = "name2") public String getName2() { return getStr("name2"); } @@ -91,19 +94,20 @@ public abstract class BaseSupermarket> extends Base * type: DECIMAL(12,8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param lgtd + * defaultValue: + * + * @param lgtd */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public void setLgtd(java.math.BigDecimal lgtd) { set("lgtd", lgtd); } - + /** - * @return lgtd + * @return lgtd */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public java.math.BigDecimal getLgtd() { return get("lgtd"); } @@ -113,19 +117,20 @@ public abstract class BaseSupermarket> extends Base * type: DECIMAL(12,8) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param lttd + * defaultValue: + * + * @param lttd */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public void setLttd(java.math.BigDecimal lttd) { set("lttd", lttd); } - + /** - * @return lttd + * @return lttd */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public java.math.BigDecimal getLttd() { return get("lttd"); } @@ -135,19 +140,20 @@ public abstract class BaseSupermarket> extends Base * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param address 地址 */ - @JSONField(name="address") + @JSONField(name = "address") public void setAddress(String address) { set("address", address); } - + /** * @return address 地址 */ - @JSONField(name="address") + @JSONField(name = "address") public String getAddress() { return getStr("address"); } @@ -157,19 +163,20 @@ public abstract class BaseSupermarket> extends Base * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param phone 电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public void setPhone(String phone) { set("phone", phone); } - + /** * @return phone 电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public String getPhone() { return getStr("phone"); } @@ -180,18 +187,19 @@ public abstract class BaseSupermarket> extends Base * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param del 逻辑删除标志 */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(Integer del) { set("del", del); } - + /** * @return del 逻辑删除标志 */ - @JSONField(name="del") + @JSONField(name = "del") public Integer getDel() { return getInt("del"); } @@ -202,20 +210,21 @@ public abstract class BaseSupermarket> extends Base * isNullable: YES * isPrimaryKey: NO * defaultValue: 0 + * * @param isdeploy 0.未部署，1.已部署 -本地程序以砂站为单位部署，云端只对已部署的本地程序发送数据，并记录日志，可在本地程序重新上线后，补发数据 + * 本地程序以砂站为单位部署，云端只对已部署的本地程序发送数据，并记录日志，可在本地程序重新上线后，补发数据 */ - @JSONField(name="isdeploy") + @JSONField(name = "isdeploy") public void setIsdeploy(Integer isdeploy) { set("isdeploy", isdeploy); } - + /** * @return isdeploy 0.未部署，1.已部署 -本地程序以砂站为单位部署，云端只对已部署的本地程序发送数据，并记录日志，可在本地程序重新上线后，补发数据 + * 本地程序以砂站为单位部署，云端只对已部署的本地程序发送数据，并记录日志，可在本地程序重新上线后，补发数据 */ - @JSONField(name="isdeploy") + @JSONField(name = "isdeploy") public Integer getIsdeploy() { return getInt("isdeploy"); } @@ -226,18 +235,19 @@ public abstract class BaseSupermarket> extends Base * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param invoiceType 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public void setInvoiceType(Integer invoiceType) { set("invoice_type", invoiceType); } - + /** * @return invoice_type 1.普票，2.专票 */ - @JSONField(name="invoice_type") + @JSONField(name = "invoice_type") public Integer getInvoiceType() { return getInt("invoice_type"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java index 42f8705..2920487 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketCustomerDistance.java @@ -15,8 +15,8 @@ public abstract class BaseSupermarketCustomerDistance public static final String tablename = "supermarket_product"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseSupermarketProduct * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(java.lang.Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public java.lang.Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -47,19 +48,20 @@ public abstract class BaseSupermarketProduct * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param productId 商品id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public void setProductId(java.lang.Integer productId) { set("product_id", productId); } - + /** * @return product_id 商品id */ - @JSONField(name="product_id") + @JSONField(name = "product_id") public java.lang.Integer getProductId() { return getInt("product_id"); } @@ -69,19 +71,20 @@ public abstract class BaseSupermarketProduct * type: DECIMAL(12,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param unitPrice 商品在砂站的销售单价 */ - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public void setUnitPrice(java.math.BigDecimal unitPrice) { set("unit_price", unitPrice); } - + /** * @return unit_price 商品在砂站的销售单价 */ - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public java.math.BigDecimal getUnitPrice() { return get("unit_price"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java index e46de7d..6c67477 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketReceiverDistance.java @@ -15,8 +15,8 @@ public abstract class BaseSupermarketReceiverDistance * PrimaryKey: supermarket_id,sandfarm_id */ @SuppressWarnings("serial") @@ -16,8 +16,8 @@ public abstract class BaseSupermarketSandfarmDistance> extends BaseModel< public static final String tablename = "sync_task"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseSyncTask> extends BaseModel< * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id 用uuid */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id 用uuid */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -48,18 +49,19 @@ public abstract class BaseSyncTask> extends BaseModel< * isNullable: YES * isPrimaryKey: NO * defaultValue: 0 + * * @param state 同步状态0，待同步，1已同步 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 同步状态0，待同步，1已同步 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } @@ -70,18 +72,19 @@ public abstract class BaseSyncTask> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -91,19 +94,20 @@ public abstract class BaseSyncTask> extends BaseModel< * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 超市id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 超市id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -114,18 +118,19 @@ public abstract class BaseSyncTask> extends BaseModel< * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param createTime 创建时间，先创建，先推送 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public void setCreateTime(java.util.Date createTime) { set("create_time", createTime); } - + /** * @return create_time 创建时间，先创建，先推送 */ - @JSONField(name="create_time") + @JSONField(name = "create_time") public java.util.Date getCreateTime() { return get("create_time"); } @@ -135,25 +140,26 @@ public abstract class BaseSyncTask> extends BaseModel< * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param saveData 需要新增的数据 -{ - tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } -} + * { + * tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } + * } */ - @JSONField(name="save_data") + @JSONField(name = "save_data") public void setSaveData(String saveData) { set("save_data", saveData); } - + /** * @return save_data 需要新增的数据 -{ - tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } -} + * { + * tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } + * } */ - @JSONField(name="save_data") + @JSONField(name = "save_data") public String getSaveData() { return getStr("save_data"); } @@ -163,25 +169,26 @@ public abstract class BaseSyncTask> extends BaseModel< * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param updateData 需要新增的数据 -{ - tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } -} + * { + * tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } + * } */ - @JSONField(name="update_data") + @JSONField(name = "update_data") public void setUpdateData(String updateData) { set("update_data", updateData); } - + /** * @return update_data 需要新增的数据 -{ - tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } -} + * { + * tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } + * } */ - @JSONField(name="update_data") + @JSONField(name = "update_data") public String getUpdateData() { return getStr("update_data"); } @@ -191,25 +198,26 @@ public abstract class BaseSyncTask> extends BaseModel< * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param deleteData 需要删除的数据 -{ - tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } -} + * { + * tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } + * } */ - @JSONField(name="delete_data") + @JSONField(name = "delete_data") public void setDeleteData(String deleteData) { set("delete_data", deleteData); } - + /** * @return delete_data 需要删除的数据 -{ - tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } -} + * { + * tablename: { pks: '多个主键逗号分隔', data: [{数据体}] } + * } */ - @JSONField(name="delete_data") + @JSONField(name = "delete_data") public String getDeleteData() { return getStr("delete_data"); } @@ -219,35 +227,36 @@ public abstract class BaseSyncTask> extends BaseModel< * type: JSON(1073741824) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param incrementData 需要修改的数据 -{ - tablename: { - pks: '', - increment: { - key: value - } - } -} + * { + * tablename: { + * pks: '', + * increment: { + * key: value + * } + * } + * } */ - @JSONField(name="increment_data") + @JSONField(name = "increment_data") public void setIncrementData(String incrementData) { set("increment_data", incrementData); } - + /** * @return increment_data 需要修改的数据 -{ - tablename: { - pks: '', - increment: { - key: value - } - } -} + * { + * tablename: { + * pks: '', + * increment: { + * key: value + * } + * } + * } */ - @JSONField(name="increment_data") + @JSONField(name = "increment_data") public String getIncrementData() { return getStr("increment_data"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java index 60996cd..bc0014a 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java @@ -15,8 +15,8 @@ public abstract class BaseSysuser> extends BaseModel public static final String tablename = "sysuser"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseSysuser> extends BaseModel * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseSysuser> extends BaseModel * type: CHAR(11) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param phone 电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public void setPhone(java.lang.String phone) { set("phone", phone); } - + /** * @return phone 电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public java.lang.String getPhone() { return getStr("phone"); } @@ -69,19 +71,20 @@ public abstract class BaseSysuser> extends BaseModel * type: VARCHAR(20) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param name 姓名 */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** * @return name 姓名 */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -91,19 +94,20 @@ public abstract class BaseSysuser> extends BaseModel * type: VARCHAR(64) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param password 密码 */ - @JSONField(name="password") + @JSONField(name = "password") public void setPassword(java.lang.String password) { set("password", password); } - + /** * @return password 密码 */ - @JSONField(name="password") + @JSONField(name = "password") public java.lang.String getPassword() { return getStr("password"); } @@ -113,33 +117,34 @@ public abstract class BaseSysuser> extends BaseModel * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param type 1，砂站用户 - 负责具体某个砂站相关操作的用户需要关联某个砂站 - 2，物流公司用户 - 需要关联物流公司 - 3，用户开放注册时的用户注册，可以审核关联客户表信息，否则就是个人用户不进行customer关联 - 修改操作不允许修改此字段 - 4. 司机 - 5. 楚和公司用户，可以查看管理全部砂站情况 + * defaultValue: + * + * @param type 1，砂站用户 + * 负责具体某个砂站相关操作的用户需要关联某个砂站 + * 2，物流公司用户 + * 需要关联物流公司 + * 3，用户开放注册时的用户注册，可以审核关联客户表信息，否则就是个人用户不进行customer关联 + * 修改操作不允许修改此字段 + * 4. 司机 + * 5. 楚和公司用户，可以查看管理全部砂站情况 */ - @JSONField(name="type") + @JSONField(name = "type") public void setType(java.lang.Integer type) { set("type", type); } - + /** * @return type 1，砂站用户 - 负责具体某个砂站相关操作的用户需要关联某个砂站 - 2，物流公司用户 - 需要关联物流公司 - 3，用户开放注册时的用户注册，可以审核关联客户表信息，否则就是个人用户不进行customer关联 - 修改操作不允许修改此字段 - 4. 司机 - 5. 楚和公司用户，可以查看管理全部砂站情况 + * 负责具体某个砂站相关操作的用户需要关联某个砂站 + * 2，物流公司用户 + * 需要关联物流公司 + * 3，用户开放注册时的用户注册，可以审核关联客户表信息，否则就是个人用户不进行customer关联 + * 修改操作不允许修改此字段 + * 4. 司机 + * 5. 楚和公司用户，可以查看管理全部砂站情况 */ - @JSONField(name="type") + @JSONField(name = "type") public java.lang.Integer getType() { return getInt("type"); } @@ -149,19 +154,20 @@ public abstract class BaseSysuser> extends BaseModel * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param entityId 如果用户的相关操作关联了某个砂站,物流公司，则填写 */ - @JSONField(name="entity_id") + @JSONField(name = "entity_id") public void setEntityId(java.lang.Integer entityId) { set("entity_id", entityId); } - + /** * @return entity_id 如果用户的相关操作关联了某个砂站,物流公司，则填写 */ - @JSONField(name="entity_id") + @JSONField(name = "entity_id") public java.lang.Integer getEntityId() { return getInt("entity_id"); } @@ -171,43 +177,44 @@ public abstract class BaseSysuser> extends BaseModel * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param role 100 砂站管理员 -101 砂站管理调度 -102 砂站装卸货 - -201 物流管理人员 -202 司机 - -300 预留给注册用户 -400 占位 - -500 公司总经理，权限：查看、付费审核、退费审核 -501 公司财务人员，权限：查看、付费、退费 -502 公司领导，权限：查看 + * 101 砂站管理调度 + * 102 砂站装卸货 + *

+ * 201 物流管理人员 + * 202 司机 + *

+ * 300 预留给注册用户 + * 400 占位 + *

+ * 500 公司总经理，权限：查看、付费审核、退费审核 + * 501 公司财务人员，权限：查看、付费、退费 + * 502 公司领导，权限：查看 */ - @JSONField(name="role") + @JSONField(name = "role") public void setRole(java.lang.Integer role) { set("role", role); } - + /** * @return role 100 砂站管理员 -101 砂站管理调度 -102 砂站装卸货 - -201 物流管理人员 -202 司机 - -300 预留给注册用户 -400 占位 - -500 公司总经理，权限：查看、付费审核、退费审核 -501 公司财务人员，权限：查看、付费、退费 -502 公司领导，权限：查看 + * 101 砂站管理调度 + * 102 砂站装卸货 + *

+ * 201 物流管理人员 + * 202 司机 + *

+ * 300 预留给注册用户 + * 400 占位 + *

+ * 500 公司总经理，权限：查看、付费审核、退费审核 + * 501 公司财务人员，权限：查看、付费、退费 + * 502 公司领导，权限：查看 */ - @JSONField(name="role") + @JSONField(name = "role") public java.lang.Integer getRole() { return getInt("role"); } @@ -218,18 +225,19 @@ public abstract class BaseSysuser> extends BaseModel * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param del 逻辑删除标记位 */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(java.lang.Integer del) { set("del", del); } - + /** * @return del 逻辑删除标记位 */ - @JSONField(name="del") + @JSONField(name = "del") public java.lang.Integer getDel() { return getInt("del"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java index edb5695..8440ab6 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransPriceConfigSale.java @@ -8,7 +8,7 @@ import com.alibaba.fastjson.annotation.JSONField; * Generated by COWR Fri Apr 17 16:59:35 CST 2020 * TableName: trans_price_config_sale * Remarks: 系统配置 - 销售运费配置信息 - + *

* PrimaryKey: id */ @SuppressWarnings("serial") @@ -16,8 +16,8 @@ public abstract class BaseTransPriceConfigSale * PrimaryKey: id */ @SuppressWarnings("serial") @@ -16,8 +16,8 @@ public abstract class BaseTransPriceConfigTransfer * PrimaryKey: id */ @SuppressWarnings("serial") @@ -16,8 +16,8 @@ public abstract class BaseTransPriceConfigTrash> extends BaseMode public static final String tablename = "transport"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseTransport> extends BaseMode * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES - * defaultValue: + * defaultValue: + * * @param id uuid，上传时，避免冲突 */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(String id) { set("id", id); } - + /** * @return id uuid，上传时，避免冲突 */ - @JSONField(name="id") + @JSONField(name = "id") public String getId() { return getStr("id"); } @@ -47,19 +48,20 @@ public abstract class BaseTransport> extends BaseMode * type: CHAR(16) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param orderSn 关联订单号，方便查询 */ - @JSONField(name="order_sn") + @JSONField(name = "order_sn") public void setOrderSn(String orderSn) { set("order_sn", orderSn); } - + /** * @return order_sn 关联订单号，方便查询 */ - @JSONField(name="order_sn") + @JSONField(name = "order_sn") public String getOrderSn() { return getStr("order_sn"); } @@ -69,19 +71,20 @@ public abstract class BaseTransport> extends BaseMode * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param supermarketId 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public void setSupermarketId(Integer supermarketId) { set("supermarket_id", supermarketId); } - + /** * @return supermarket_id 砂站id */ - @JSONField(name="supermarket_id") + @JSONField(name = "supermarket_id") public Integer getSupermarketId() { return getInt("supermarket_id"); } @@ -91,19 +94,20 @@ public abstract class BaseTransport> extends BaseMode * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param inTime 进场时间 */ - @JSONField(name="in_time") + @JSONField(name = "in_time") public void setInTime(java.util.Date inTime) { set("in_time", inTime); } - + /** * @return in_time 进场时间 */ - @JSONField(name="in_time") + @JSONField(name = "in_time") public java.util.Date getInTime() { return get("in_time"); } @@ -113,19 +117,20 @@ public abstract class BaseTransport> extends BaseMode * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param outTime 出场时间 */ - @JSONField(name="out_time") + @JSONField(name = "out_time") public void setOutTime(java.util.Date outTime) { set("out_time", outTime); } - + /** * @return out_time 出场时间 */ - @JSONField(name="out_time") + @JSONField(name = "out_time") public java.util.Date getOutTime() { return get("out_time"); } @@ -135,19 +140,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param inWhich 入场地点 */ - @JSONField(name="in_which") + @JSONField(name = "in_which") public void setInWhich(String inWhich) { set("in_which", inWhich); } - + /** * @return in_which 入场地点 */ - @JSONField(name="in_which") + @JSONField(name = "in_which") public String getInWhich() { return getStr("in_which"); } @@ -157,19 +163,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param outWhich 出场地点 */ - @JSONField(name="out_which") + @JSONField(name = "out_which") public void setOutWhich(String outWhich) { set("out_which", outWhich); } - + /** * @return out_which 出场地点 */ - @JSONField(name="out_which") + @JSONField(name = "out_which") public String getOutWhich() { return getStr("out_which"); } @@ -180,18 +187,19 @@ public abstract class BaseTransport> extends BaseMode * isNullable: YES * isPrimaryKey: NO * defaultValue: 1 + * * @param inMode 入场方式，1.系统自动，2.手动 */ - @JSONField(name="in_mode") + @JSONField(name = "in_mode") public void setInMode(Integer inMode) { set("in_mode", inMode); } - + /** * @return in_mode 入场方式，1.系统自动，2.手动 */ - @JSONField(name="in_mode") + @JSONField(name = "in_mode") public Integer getInMode() { return getInt("in_mode"); } @@ -201,19 +209,20 @@ public abstract class BaseTransport> extends BaseMode * type: SMALLINT(5) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param outMode 出场方式，1.系统自动，2.手动 */ - @JSONField(name="out_mode") + @JSONField(name = "out_mode") public void setOutMode(Integer outMode) { set("out_mode", outMode); } - + /** * @return out_mode 出场方式，1.系统自动，2.手动 */ - @JSONField(name="out_mode") + @JSONField(name = "out_mode") public Integer getOutMode() { return getInt("out_mode"); } @@ -223,19 +232,20 @@ public abstract class BaseTransport> extends BaseMode * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param firstWeight 进场称重 */ - @JSONField(name="first_weight") + @JSONField(name = "first_weight") public void setFirstWeight(java.math.BigDecimal firstWeight) { set("first_weight", firstWeight); } - + /** * @return first_weight 进场称重 */ - @JSONField(name="first_weight") + @JSONField(name = "first_weight") public java.math.BigDecimal getFirstWeight() { return get("first_weight"); } @@ -245,19 +255,20 @@ public abstract class BaseTransport> extends BaseMode * type: DECIMAL(12,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param secondWeight 出场称重 */ - @JSONField(name="second_weight") + @JSONField(name = "second_weight") public void setSecondWeight(java.math.BigDecimal secondWeight) { set("second_weight", secondWeight); } - + /** * @return second_weight 出场称重 */ - @JSONField(name="second_weight") + @JSONField(name = "second_weight") public java.math.BigDecimal getSecondWeight() { return get("second_weight"); } @@ -267,19 +278,20 @@ public abstract class BaseTransport> extends BaseMode * type: SMALLINT(5) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param firstWeighMode 第一次称重方式，1.系统自动，2.手动 */ - @JSONField(name="first_weigh_mode") + @JSONField(name = "first_weigh_mode") public void setFirstWeighMode(Integer firstWeighMode) { set("first_weigh_mode", firstWeighMode); } - + /** * @return first_weigh_mode 第一次称重方式，1.系统自动，2.手动 */ - @JSONField(name="first_weigh_mode") + @JSONField(name = "first_weigh_mode") public Integer getFirstWeighMode() { return getInt("first_weigh_mode"); } @@ -289,19 +301,20 @@ public abstract class BaseTransport> extends BaseMode * type: SMALLINT(5) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param secondWeightMode 第二次称重方式，1.系统自动，2.手动 */ - @JSONField(name="second_weight_mode") + @JSONField(name = "second_weight_mode") public void setSecondWeightMode(Integer secondWeightMode) { set("second_weight_mode", secondWeightMode); } - + /** * @return second_weight_mode 第二次称重方式，1.系统自动，2.手动 */ - @JSONField(name="second_weight_mode") + @JSONField(name = "second_weight_mode") public Integer getSecondWeightMode() { return getInt("second_weight_mode"); } @@ -311,19 +324,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param firstPic 入场车牌识别图片key */ - @JSONField(name="first_pic") + @JSONField(name = "first_pic") public void setFirstPic(String firstPic) { set("first_pic", firstPic); } - + /** * @return first_pic 入场车牌识别图片key */ - @JSONField(name="first_pic") + @JSONField(name = "first_pic") public String getFirstPic() { return getStr("first_pic"); } @@ -333,19 +347,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param firstWeightWhich 入场称重地点 */ - @JSONField(name="first_weight_which") + @JSONField(name = "first_weight_which") public void setFirstWeightWhich(String firstWeightWhich) { set("first_weight_which", firstWeightWhich); } - + /** * @return first_weight_which 入场称重地点 */ - @JSONField(name="first_weight_which") + @JSONField(name = "first_weight_which") public String getFirstWeightWhich() { return getStr("first_weight_which"); } @@ -355,19 +370,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param secondWeightWhich 出场称重地点 */ - @JSONField(name="second_weight_which") + @JSONField(name = "second_weight_which") public void setSecondWeightWhich(String secondWeightWhich) { set("second_weight_which", secondWeightWhich); } - + /** * @return second_weight_which 出场称重地点 */ - @JSONField(name="second_weight_which") + @JSONField(name = "second_weight_which") public String getSecondWeightWhich() { return getStr("second_weight_which"); } @@ -377,19 +393,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param secondPic 出场车牌识别图片key */ - @JSONField(name="second_pic") + @JSONField(name = "second_pic") public void setSecondPic(String secondPic) { set("second_pic", secondPic); } - + /** * @return second_pic 出场车牌识别图片key */ - @JSONField(name="second_pic") + @JSONField(name = "second_pic") public String getSecondPic() { return getStr("second_pic"); } @@ -399,19 +416,20 @@ public abstract class BaseTransport> extends BaseMode * type: DATETIME(19) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param arriveTime 完成时间 */ - @JSONField(name="arrive_time") + @JSONField(name = "arrive_time") public void setArriveTime(java.util.Date arriveTime) { set("arrive_time", arriveTime); } - + /** * @return arrive_time 完成时间 */ - @JSONField(name="arrive_time") + @JSONField(name = "arrive_time") public java.util.Date getArriveTime() { return get("arrive_time"); } @@ -421,19 +439,20 @@ public abstract class BaseTransport> extends BaseMode * type: SMALLINT(5) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param type 1、2、3、4、5 */ - @JSONField(name="type") + @JSONField(name = "type") public void setType(Integer type) { set("type", type); } - + /** * @return type 1、2、3、4、5 */ - @JSONField(name="type") + @JSONField(name = "type") public Integer getType() { return getInt("type"); } @@ -443,19 +462,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param truckLicense 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public void setTruckLicense(String truckLicense) { set("truck_license", truckLicense); } - + /** * @return truck_license 车牌号 */ - @JSONField(name="truck_license") + @JSONField(name = "truck_license") public String getTruckLicense() { return getStr("truck_license"); } @@ -465,19 +485,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(String memo) { set("memo", memo); } - + /** * @return memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public String getMemo() { return getStr("memo"); } @@ -488,18 +509,19 @@ public abstract class BaseTransport> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: CURRENT_TIMESTAMP + * * @param changeTime 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public void setChangeTime(java.util.Date changeTime) { set("change_time", changeTime); } - + /** * @return change_time 最后修改时间 */ - @JSONField(name="change_time") + @JSONField(name = "change_time") public java.util.Date getChangeTime() { return get("change_time"); } @@ -509,19 +531,20 @@ public abstract class BaseTransport> extends BaseMode * type: INT(10) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoId 物流公司，物流公司信息存在这里，主要是方便查询，不用去关联订单，另外可以避免车辆跟换物流公司的问题 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(Integer transCoId) { set("trans_co_id", transCoId); } - + /** * @return trans_co_id 物流公司，物流公司信息存在这里，主要是方便查询，不用去关联订单，另外可以避免车辆跟换物流公司的问题 */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public Integer getTransCoId() { return getInt("trans_co_id"); } @@ -531,19 +554,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoName + * defaultValue: + * + * @param transCoName */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public void setTransCoName(String transCoName) { set("trans_co_name", transCoName); } - + /** - * @return trans_co_name + * @return trans_co_name */ - @JSONField(name="trans_co_name") + @JSONField(name = "trans_co_name") public String getTransCoName() { return getStr("trans_co_name"); } @@ -553,19 +577,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param transCoTexpayerName 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public void setTransCoTexpayerName(String transCoTexpayerName) { set("trans_co_texpayer_name", transCoTexpayerName); } - + /** * @return trans_co_texpayer_name 物流公司开票公司名称 */ - @JSONField(name="trans_co_texpayer_name") + @JSONField(name = "trans_co_texpayer_name") public String getTransCoTexpayerName() { return getStr("trans_co_texpayer_name"); } @@ -575,19 +600,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoTexpayerNum + * defaultValue: + * + * @param transCoTexpayerNum */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public void setTransCoTexpayerNum(String transCoTexpayerNum) { set("trans_co_texpayer_num", transCoTexpayerNum); } - + /** - * @return trans_co_texpayer_num + * @return trans_co_texpayer_num */ - @JSONField(name="trans_co_texpayer_num") + @JSONField(name = "trans_co_texpayer_num") public String getTransCoTexpayerNum() { return getStr("trans_co_texpayer_num"); } @@ -597,19 +623,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoAddress + * defaultValue: + * + * @param transCoAddress */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public void setTransCoAddress(String transCoAddress) { set("trans_co_address", transCoAddress); } - + /** - * @return trans_co_address + * @return trans_co_address */ - @JSONField(name="trans_co_address") + @JSONField(name = "trans_co_address") public String getTransCoAddress() { return getStr("trans_co_address"); } @@ -619,19 +646,20 @@ public abstract class BaseTransport> extends BaseMode * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoPhone + * defaultValue: + * + * @param transCoPhone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public void setTransCoPhone(String transCoPhone) { set("trans_co_phone", transCoPhone); } - + /** - * @return trans_co_phone + * @return trans_co_phone */ - @JSONField(name="trans_co_phone") + @JSONField(name = "trans_co_phone") public String getTransCoPhone() { return getStr("trans_co_phone"); } @@ -641,19 +669,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankName + * defaultValue: + * + * @param transCoBankName */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public void setTransCoBankName(String transCoBankName) { set("trans_co_bank_name", transCoBankName); } - + /** - * @return trans_co_bank_name + * @return trans_co_bank_name */ - @JSONField(name="trans_co_bank_name") + @JSONField(name = "trans_co_bank_name") public String getTransCoBankName() { return getStr("trans_co_bank_name"); } @@ -663,19 +692,20 @@ public abstract class BaseTransport> extends BaseMode * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param transCoBankAccount + * defaultValue: + * + * @param transCoBankAccount */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public void setTransCoBankAccount(String transCoBankAccount) { set("trans_co_bank_account", transCoBankAccount); } - + /** - * @return trans_co_bank_account + * @return trans_co_bank_account */ - @JSONField(name="trans_co_bank_account") + @JSONField(name = "trans_co_bank_account") public String getTransCoBankAccount() { return getStr("trans_co_bank_account"); } @@ -686,30 +716,29 @@ public abstract class BaseTransport> extends BaseMode * isNullable: NO * isPrimaryKey: NO * defaultValue: 1 + * * @param state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(Integer state) { set("state", state); } - + /** * @return state 1，初始状态； -2，已进场；(后台自动设置) -3，已装载 -4，已离场（后台自动设置） -5，已收货 -9，订单作废 - + * 2，已进场；(后台自动设置) + * 3，已装载 + * 4，已离场（后台自动设置） + * 5，已收货 + * 9，订单作废 */ - @JSONField(name="state") + @JSONField(name = "state") public Integer getState() { return getInt("state"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java index 3b35257..fd45ab1 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTransportCompany.java @@ -15,8 +15,8 @@ public abstract class BaseTransportCompany> ex public static final String tablename = "transport_company"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseTransportCompany> ex * type: INT(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param id + * defaultValue: + * + * @param id */ - @JSONField(name="id") + @JSONField(name = "id") public void setId(java.lang.Integer id) { set("id", id); } - + /** - * @return id + * @return id */ - @JSONField(name="id") + @JSONField(name = "id") public java.lang.Integer getId() { return getInt("id"); } @@ -47,19 +48,20 @@ public abstract class BaseTransportCompany> ex * type: VARCHAR(128) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param name + * defaultValue: + * + * @param name */ - @JSONField(name="name") + @JSONField(name = "name") public void setName(java.lang.String name) { set("name", name); } - + /** - * @return name + * @return name */ - @JSONField(name="name") + @JSONField(name = "name") public java.lang.String getName() { return getStr("name"); } @@ -69,19 +71,20 @@ public abstract class BaseTransportCompany> ex * type: DECIMAL(12,8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param lgtd + * defaultValue: + * + * @param lgtd */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public void setLgtd(java.math.BigDecimal lgtd) { set("lgtd", lgtd); } - + /** - * @return lgtd + * @return lgtd */ - @JSONField(name="lgtd") + @JSONField(name = "lgtd") public java.math.BigDecimal getLgtd() { return get("lgtd"); } @@ -91,19 +94,20 @@ public abstract class BaseTransportCompany> ex * type: DECIMAL(12,8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param lttd + * defaultValue: + * + * @param lttd */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public void setLttd(java.math.BigDecimal lttd) { set("lttd", lttd); } - + /** - * @return lttd + * @return lttd */ - @JSONField(name="lttd") + @JSONField(name = "lttd") public java.math.BigDecimal getLttd() { return get("lttd"); } @@ -113,19 +117,20 @@ public abstract class BaseTransportCompany> ex * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param address 开票地址 */ - @JSONField(name="address") + @JSONField(name = "address") public void setAddress(java.lang.String address) { set("address", address); } - + /** * @return address 开票地址 */ - @JSONField(name="address") + @JSONField(name = "address") public java.lang.String getAddress() { return getStr("address"); } @@ -135,19 +140,20 @@ public abstract class BaseTransportCompany> ex * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param phone 开票电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public void setPhone(java.lang.String phone) { set("phone", phone); } - + /** * @return phone 开票电话 */ - @JSONField(name="phone") + @JSONField(name = "phone") public java.lang.String getPhone() { return getStr("phone"); } @@ -157,19 +163,20 @@ public abstract class BaseTransportCompany> ex * type: VARCHAR(255) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param texpayerName 开票公司名称 */ - @JSONField(name="texpayer_name") + @JSONField(name = "texpayer_name") public void setTexpayerName(java.lang.String texpayerName) { set("texpayer_name", texpayerName); } - + /** * @return texpayer_name 开票公司名称 */ - @JSONField(name="texpayer_name") + @JSONField(name = "texpayer_name") public java.lang.String getTexpayerName() { return getStr("texpayer_name"); } @@ -179,19 +186,20 @@ public abstract class BaseTransportCompany> ex * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param texpayerNum 税号 */ - @JSONField(name="texpayer_num") + @JSONField(name = "texpayer_num") public void setTexpayerNum(java.lang.String texpayerNum) { set("texpayer_num", texpayerNum); } - + /** * @return texpayer_num 税号 */ - @JSONField(name="texpayer_num") + @JSONField(name = "texpayer_num") public java.lang.String getTexpayerNum() { return getStr("texpayer_num"); } @@ -201,19 +209,20 @@ public abstract class BaseTransportCompany> ex * type: VARCHAR(128) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bankName 开户行 */ - @JSONField(name="bank_name") + @JSONField(name = "bank_name") public void setBankName(java.lang.String bankName) { set("bank_name", bankName); } - + /** * @return bank_name 开户行 */ - @JSONField(name="bank_name") + @JSONField(name = "bank_name") public java.lang.String getBankName() { return getStr("bank_name"); } @@ -223,19 +232,20 @@ public abstract class BaseTransportCompany> ex * type: VARCHAR(20) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param bankAccount 开户行账号 */ - @JSONField(name="bank_account") + @JSONField(name = "bank_account") public void setBankAccount(java.lang.String bankAccount) { set("bank_account", bankAccount); } - + /** * @return bank_account 开户行账号 */ - @JSONField(name="bank_account") + @JSONField(name = "bank_account") public java.lang.String getBankAccount() { return getStr("bank_account"); } @@ -245,19 +255,20 @@ public abstract class BaseTransportCompany> ex * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(java.lang.String memo) { set("memo", memo); } - + /** * @return memo 备注 */ - @JSONField(name="memo") + @JSONField(name = "memo") public java.lang.String getMemo() { return getStr("memo"); } @@ -268,18 +279,19 @@ public abstract class BaseTransportCompany> ex * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 + * * @param del 逻辑删除标志 */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(java.lang.Integer del) { set("del", del); } - + /** * @return del 逻辑删除标志 */ - @JSONField(name="del") + @JSONField(name = "del") public java.lang.Integer getDel() { return getInt("del"); } @@ -290,18 +302,19 @@ public abstract class BaseTransportCompany> ex * isNullable: NO * isPrimaryKey: NO * defaultValue: 1.0000 + * * @param priceModulus 价格折扣系数 */ - @JSONField(name="price_modulus") + @JSONField(name = "price_modulus") public void setPriceModulus(java.math.BigDecimal priceModulus) { set("price_modulus", priceModulus); } - + /** * @return price_modulus 价格折扣系数 */ - @JSONField(name="price_modulus") + @JSONField(name = "price_modulus") public java.math.BigDecimal getPriceModulus() { return get("price_modulus"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruck.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruck.java index fb8f01e..57c22b4 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruck.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruck.java @@ -15,8 +15,8 @@ public abstract class BaseTruck> extends BaseModel imp public static final String tablename = "truck"; - @JSONField(serialize=false) - public String getTablename(){ + @JSONField(serialize = false) + public String getTablename() { return tablename; } @@ -25,19 +25,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: VARCHAR(10) * isNullable: NO * isPrimaryKey: YES - * defaultValue: - * @param license + * defaultValue: + * + * @param license */ - @JSONField(name="license") + @JSONField(name = "license") public void setLicense(java.lang.String license) { set("license", license); } - + /** - * @return license + * @return license */ - @JSONField(name="license") + @JSONField(name = "license") public java.lang.String getLicense() { return getStr("license"); } @@ -47,19 +48,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: INT(10) * isNullable: NO * isPrimaryKey: NO - * defaultValue: - * @param transCoId + * defaultValue: + * + * @param transCoId */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public void setTransCoId(java.lang.Integer transCoId) { set("trans_co_id", transCoId); } - + /** - * @return trans_co_id + * @return trans_co_id */ - @JSONField(name="trans_co_id") + @JSONField(name = "trans_co_id") public java.lang.Integer getTransCoId() { return getInt("trans_co_id"); } @@ -69,19 +71,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: DECIMAL(10,2) * isNullable: NO * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param capacity 载重 */ - @JSONField(name="capacity") + @JSONField(name = "capacity") public void setCapacity(java.math.BigDecimal capacity) { set("capacity", capacity); } - + /** * @return capacity 载重 */ - @JSONField(name="capacity") + @JSONField(name = "capacity") public java.math.BigDecimal getCapacity() { return get("capacity"); } @@ -91,19 +94,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: VARCHAR(256) * isNullable: YES * isPrimaryKey: NO - * defaultValue: - * @param memo + * defaultValue: + * + * @param memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public void setMemo(java.lang.String memo) { set("memo", memo); } - + /** - * @return memo + * @return memo */ - @JSONField(name="memo") + @JSONField(name = "memo") public java.lang.String getMemo() { return getStr("memo"); } @@ -114,18 +118,19 @@ public abstract class BaseTruck> extends BaseModel imp * isNullable: YES * isPrimaryKey: NO * defaultValue: 1 + * * @param state 状态： 1，正常 2，黑名单 */ - @JSONField(name="state") + @JSONField(name = "state") public void setState(java.lang.Integer state) { set("state", state); } - + /** * @return state 状态： 1，正常 2，黑名单 */ - @JSONField(name="state") + @JSONField(name = "state") public java.lang.Integer getState() { return getInt("state"); } @@ -136,18 +141,19 @@ public abstract class BaseTruck> extends BaseModel imp * isNullable: NO * isPrimaryKey: NO * defaultValue: 0 - * @param del + * + * @param del */ - @JSONField(name="del") + @JSONField(name = "del") public void setDel(java.lang.Integer del) { set("del", del); } - + /** - * @return del + * @return del */ - @JSONField(name="del") + @JSONField(name = "del") public java.lang.Integer getDel() { return getInt("del"); } @@ -157,19 +163,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: DECIMAL(10,2) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param tare 皮重 */ - @JSONField(name="tare") + @JSONField(name = "tare") public void setTare(java.math.BigDecimal tare) { set("tare", tare); } - + /** * @return tare 皮重 */ - @JSONField(name="tare") + @JSONField(name = "tare") public java.math.BigDecimal getTare() { return get("tare"); } @@ -179,19 +186,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: VARCHAR(32) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param model 型号 */ - @JSONField(name="model") + @JSONField(name = "model") public void setModel(java.lang.String model) { set("model", model); } - + /** * @return model 型号 */ - @JSONField(name="model") + @JSONField(name = "model") public java.lang.String getModel() { return getStr("model"); } @@ -201,19 +209,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: VARCHAR(4) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param number 车辆编码，每个物流公司唯一 */ - @JSONField(name="number") + @JSONField(name = "number") public void setNumber(java.lang.String number) { set("number", number); } - + /** * @return number 车辆编码，每个物流公司唯一 */ - @JSONField(name="number") + @JSONField(name = "number") public java.lang.String getNumber() { return getStr("number"); } @@ -223,19 +232,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: VARCHAR(8) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param ownerName 车主姓名 */ - @JSONField(name="owner_name") + @JSONField(name = "owner_name") public void setOwnerName(java.lang.String ownerName) { set("owner_name", ownerName); } - + /** * @return owner_name 车主姓名 */ - @JSONField(name="owner_name") + @JSONField(name = "owner_name") public java.lang.String getOwnerName() { return getStr("owner_name"); } @@ -245,19 +255,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: CHAR(11) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param ownerPhone 车主电话 */ - @JSONField(name="owner_phone") + @JSONField(name = "owner_phone") public void setOwnerPhone(java.lang.String ownerPhone) { set("owner_phone", ownerPhone); } - + /** * @return owner_phone 车主电话 */ - @JSONField(name="owner_phone") + @JSONField(name = "owner_phone") public java.lang.String getOwnerPhone() { return getStr("owner_phone"); } @@ -267,19 +278,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: VARCHAR(32) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param gps GPS 设备号 */ - @JSONField(name="gps") + @JSONField(name = "gps") public void setGps(java.lang.String gps) { set("gps", gps); } - + /** * @return gps GPS 设备号 */ - @JSONField(name="gps") + @JSONField(name = "gps") public java.lang.String getGps() { return getStr("gps"); } @@ -289,19 +301,20 @@ public abstract class BaseTruck> extends BaseModel imp * type: VARCHAR(32) * isNullable: YES * isPrimaryKey: NO - * defaultValue: + * defaultValue: + * * @param sim GPS 设备上安装的手机卡号 */ - @JSONField(name="sim") + @JSONField(name = "sim") public void setSim(java.lang.String sim) { set("sim", sim); } - + /** * @return sim GPS 设备上安装的手机卡号 */ - @JSONField(name="sim") + @JSONField(name = "sim") public java.lang.String getSim() { return getStr("sim"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java b/ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java index 4e69551..4ce7a62 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java @@ -20,7 +20,7 @@ public class AliyunSmsService { } public String generator(String temp_code_str, JSONObject param) throws Exception { - if(temp_code_str == null){ + if (temp_code_str == null) { throw new Exception("模板文件不存在"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/CacheData.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/CacheData.java index 1916219..8ff3f1e 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/CacheData.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/CacheData.java @@ -11,7 +11,7 @@ public class CacheData { public static String print_vendor = ""; public static String print_vendorTaxId = ""; public static Double start_trans_distance = 5.0; - public static Double weight_distinguish = null; + public static Double weight_distinguish = null; // 需要通过数据库加载的参数 public static Map TRANS_CO_PRICE_MODULUS; // 物流公司运输起步价格系数 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 79063cf..1807be0 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 @@ -19,30 +19,30 @@ import java.util.List; * PrimaryKey: truck_license */ public class AuthLicenseService extends BaseService { - public static final AuthLicenseService me = new AuthLicenseService(); + public static final AuthLicenseService me = new AuthLicenseService(); public Page find(PageParam pp, String truck_license, String stm, String etm) { - String selectsql = "select * "; - String fromsql = "from auth_license t where 1=1 "; - List paraList = new ArrayList<>(); + String selectsql = "select * "; + String fromsql = "from auth_license t where 1=1 "; + List paraList = new ArrayList<>(); - if(StrKit.notBlank(truck_license)){ + if (StrKit.notBlank(truck_license)) { fromsql += " and truck_license like ? \n"; paraList.add("%" + truck_license.trim() + "%"); } - if(StrKit.notBlank(stm)){ + if (StrKit.notBlank(stm)) { fromsql += " and create_time >= ? \n"; paraList.add(stm); } - if(StrKit.notBlank(etm)){ + if (StrKit.notBlank(etm)) { fromsql += " and create_time <= ? \n"; paraList.add(etm); } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && AuthLicense.dao.hasColunm(pp.getSort_field())) { @@ -53,7 +53,7 @@ public class AuthLicenseService extends BaseService { } else { findSql += " " + Const.ORDER_BY_DESC; } - }else{ + } else { findSql += " order by t.create_time desc"; } @@ -62,10 +62,11 @@ public class AuthLicenseService extends BaseService { /** * 判断车牌是否是系统中授权可用的 + * * @param truck_license * @return 已授权，返回 true， 未授权，返回 false */ - public boolean isAuthLicense(String truck_license){ + public boolean isAuthLicense(String truck_license) { return AuthLicense.dao.findById(truck_license) != null; } } 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 7bd5aac..8b7bb94 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 @@ -9,6 +9,7 @@ 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.util.ArrayList; import java.util.List; @@ -29,13 +30,13 @@ public class BlacklistService extends BaseService { " where 1=1 "; List paraList = new ArrayList<>(); - if(StrKit.notBlank(truck_license)){ + if (StrKit.notBlank(truck_license)) { fromsql += " and t.truck_license like ? \n"; paraList.add("%" + truck_license.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && Blacklist.dao.hasColunm(pp.getSort_field())) { @@ -58,11 +59,12 @@ public class BlacklistService extends BaseService { /** * 使用完整的车牌查询 * 车辆被加入黑名单，并且没有移出黑名单 + * * @param license * @return */ - public Blacklist truckInBlacklist(String license){ - if(StrKit.isBlank(license)){ + public Blacklist truckInBlacklist(String license) { + if (StrKit.isBlank(license)) { return null; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java index bb8531b..38a711e 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/blacklist/BlacklistValidator.java @@ -20,12 +20,12 @@ public class BlacklistValidator extends CrudParamValidator { validateRequired("id", "id", "id 必填"); validateString("id", 1, 32, "id", "id 长度 1~32"); } - + validateString("truck_license", 1, 10, "truck_license", "truck_license 长度 1~10"); validateString("driver_name", 0, 8, "driver_name", "driver_name 长度 0~8"); validateString("driver_phone", 0, 11, "driver_phone", "driver_phone 长度 0~11"); validateString("order_sn", 0, 16, "order_sn", "order_sn 长度 0~16"); - + validateInteger("reason_type", 1, 2147483647, "reason_type", "reason_type 范围 1~2147483647"); validateString("reason_detail", 0, 255, "reason_detail", "reason_detail 长度 0~255"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvController.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvController.java index c0f94dd..0ff974d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvController.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvController.java @@ -15,7 +15,7 @@ import com.jfinal.kit.HttpKit; * PrimaryKey: unit_id,unit_type */ public class CctvController extends Controller { - public void get(){ + public void get() { renderJson(CctvService.me.get()); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvService.java index a3f4e28..005d55d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/cctv/CctvService.java @@ -10,6 +10,7 @@ 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.util.ArrayList; import java.util.List; @@ -22,19 +23,19 @@ import java.util.List; public class CctvService extends BaseService { public static final CctvService me = new CctvService(); - public Result get(){ + public Result get() { List supCctv = Db.find("select t.* from cctv t"); - if(supCctv == null || supCctv.isEmpty()){ + if (supCctv == null || supCctv.isEmpty()) { return Result.failed("未找到砂站配置信息"); } List list = CctvChannels.dao.find("select id, name, default_select, unit_id from cctv_channels"); - for(Record out : supCctv){ + for (Record out : supCctv) { List outlist = new ArrayList<>(); - for(CctvChannels ch : list){ - if(ch.getUnitId().equals(out.getStr("unit_id"))){ + for (CctvChannels ch : list) { + if (ch.getUnitId().equals(out.getStr("unit_id"))) { outlist.add(ch); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java index 9503b65..590db76 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerValidator.java @@ -21,7 +21,7 @@ public class CustomerValidator extends CrudParamValidator { validateRequired("id", "id", "id 必填"); validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); } - + validateString("name", 0, 128, "name", "name 长度 1~128"); validateString("address", 0, 256, "address", "address 长度 0~256"); validateString("phone", 0, 20, "phone", "phone 长度 0~20"); @@ -34,7 +34,7 @@ public class CustomerValidator extends CrudParamValidator { if (StrKit.notBlank(c.get("invoice_type"))) { validateInteger("invoice_type", 1, 2, "invoice_type", "invoice_type 范围 1~2"); - if(c.getInt("invoice_type") == 2){ + if (c.getInt("invoice_type") == 2) { validateString("texpayer_num", 1, 20, "texpayer_num", "开具专票必须录入有效纳税人识别号"); validateString("bank_name", 1, 128, "bank_name", "开具专票必须录入有效开户行信息"); validateString("bank_account", 1, 20, "bank_account", "开具专票必须录入有效开户行账号"); 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 de41671..3fe6c28 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 @@ -64,12 +64,12 @@ public class CustomerContactService extends BaseService { } public List list(Integer customer_id) { - String sql = "select t.*, c.name customer_name from customer_contact t \n" + + String sql = "select t.*, c.name customer_name from customer_contact t \n" + " left join customer c on c.id = t.customer_id \n" + " where 1=1 \n"; - List paraList = new ArrayList<>(); + List paraList = new ArrayList<>(); - if(customer_id != null){ + if (customer_id != null) { sql += " and t.customer_id = ? \n"; paraList.add(customer_id); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java index 7b417d1..b183215 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/contact/CustomerContactValidator.java @@ -21,7 +21,7 @@ public class CustomerContactValidator extends CrudParamValidator { validateRequired("id", "id", "id 必填"); validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); } - + validateInteger("customer_id", 1, 2147483647, "customer_id", "customer_id 范围 1~2147483647"); validateString("name", 1, 100, "name", "name 长度 1~100"); validateRegex("phone", StrUtil.regphone, "phone", "phone 必须为手机号格式"); 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 3375675..1028c32 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 @@ -8,6 +8,7 @@ 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.util.ArrayList; import java.util.List; @@ -27,18 +28,18 @@ public class CustomerPactService extends BaseService { " where 1=1 "; List paraList = new ArrayList<>(); - if(customer_id != null){ + if (customer_id != null) { fromsql += " and t.customer_id = ? \n"; paraList.add(customer_id); } - if(StrKit.notBlank(customer_name)){ + if (StrKit.notBlank(customer_name)) { fromsql += " and c.name like ? \n"; paraList.add("%" + customer_name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && CustomerPact.dao.hasColunm(pp.getSort_field())) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java index f7fac69..90fa049 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/pact/CustomerPactValidator.java @@ -21,29 +21,29 @@ public class CustomerPactValidator extends CrudParamValidator { validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); } - + validateInteger("customer_id", 1, 2147483647, "customer_id", "customer_id 范围 1~2147483647"); - - + + validateString("sign_time", 1, 10, "sign_time", "sign_time 长度 1~10"); - + validateDate("sign_time", "yyyy-MM-dd HH:mm:ss", false, "sign_time", "sign_time 格式 yyyy-MM-dd HH:mm:ss"); // 默认时间时间字符串格式，生成后根据情况调整 if (StrKit.notBlank(c.get("sing_total_price"))) { // 可为空字段，当传入值时，才做验证 - validateBigDecimal("sing_total_price", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "sing_total_price", "sing_total_price 范围 -9.9999999999E10~9.9999999999E10"); - } + validateBigDecimal("sing_total_price", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "sing_total_price", "sing_total_price 范围 -9.9999999999E10~9.9999999999E10"); + } if (StrKit.notBlank(c.get("sing_total_weight"))) { // 可为空字段，当传入值时，才做验证 - validateBigDecimal("sing_total_weight", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "sing_total_weight", "sing_total_weight 范围 -9.9999999999E10~9.9999999999E10"); - } - + validateBigDecimal("sing_total_weight", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "sing_total_weight", "sing_total_weight 范围 -9.9999999999E10~9.9999999999E10"); + } + validateString("sign_user_name", 0, 255, "sign_user_name", "sign_user_name 长度 0~255"); - - + + validateString("cutoff_time", 1, 10, "cutoff_time", "cutoff_time 长度 1~10"); - + validateDate("cutoff_time", "yyyy-MM-dd HH:mm:ss", false, "cutoff_time", "cutoff_time 格式 yyyy-MM-dd HH:mm:ss"); // 默认时间时间字符串格式，生成后根据情况调整 - + validateInteger("del", -2147483647, 2147483647, "del", "del 范围 -2147483647~2147483647"); - + // 使用 model 更新时，model 不能只有主键有值 // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 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 f012be0..2b49327 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 @@ -8,6 +8,7 @@ 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.util.ArrayList; import java.util.List; @@ -26,9 +27,9 @@ public class CustomerReceiverService extends BaseService { " left join customer c on c.id = t.customer_id \n"; List paraList = new ArrayList<>(); - if(supermarket_id == null){ + if (supermarket_id == null) { fromsql += " where 1 = 1 \n"; - }else{ + } else { selectsql += " , s.name supermarket_name, sr.distance \n"; fromsql += " left join supermarket_receiver_distance sr on sr.customer_receiver_id = t.id and sr.supermarket_id = ? \n" + " left join supermarket s on s.id = sr.supermarket_id and s.id = ?"; @@ -53,7 +54,7 @@ public class CustomerReceiverService extends BaseService { } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && CustomerReceiver.dao.hasColunm(pp.getSort_field())) { @@ -75,9 +76,9 @@ public class CustomerReceiverService extends BaseService { " left join customer c on c.id = t.customer_id \n"; List paraList = new ArrayList<>(); - if(supermarket_id == null){ + if (supermarket_id == null) { fromsql += " where 1 = 1 \n"; - }else{ + } else { selectsql += " , s.name supermarket_name, sr.distance \n"; fromsql += " left join supermarket_receiver_distance sr on sr.customer_receiver_id = t.id and sr.supermarket_id = ? \n" + " left join supermarket s on s.id = sr.supermarket_id and s.id = ?" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java index cd29ba2..eb0acfc 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/receiver/CustomerReceiverValidator.java @@ -21,7 +21,7 @@ public class CustomerReceiverValidator extends CrudParamValidator { validateRequired("id", "id", "id 必填"); validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); } - + validateInteger("customer_id", 1, 2147483647, "customer_id", "customer_id 范围 1~2147483647"); validateString("name", 1, 128, "name", "name 长度 1~128"); validateRegex("phone", StrUtil.regphone, "phone", "phone 必须为手机号格式"); 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 ae9b463..6d97a5c 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 @@ -8,6 +8,7 @@ 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.util.ArrayList; import java.util.List; @@ -21,21 +22,21 @@ public class DriverService extends BaseService { public static final DriverService me = new DriverService(); public Page find(PageParam pp, String name, String phone, Integer trans_co_id, Integer del) { - String selectsql = "select * "; - String fromsql = "from driver t where 1=1 "; - List paraList = new ArrayList<>(); + String selectsql = "select * "; + String fromsql = "from driver t where 1=1 "; + List paraList = new ArrayList<>(); - if(StrKit.notBlank(name)){ + if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; paraList.add("%" + name + "%"); } - if(StrKit.notBlank(phone)){ + if (StrKit.notBlank(phone)) { fromsql += " and t.phone like ? \n"; paraList.add("%" + phone.trim() + "%"); } - if(trans_co_id != null){ + if (trans_co_id != null) { fromsql += " and t.trans_co_id = ? \n"; paraList.add(trans_co_id); } @@ -46,7 +47,7 @@ public class DriverService extends BaseService { } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && Driver.dao.hasColunm(pp.getSort_field())) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java index f2c0e6f..670ff6d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/driver/DriverValidator.java @@ -21,7 +21,7 @@ public class DriverValidator extends CrudParamValidator { validateRequired("id", "id", "id 必填"); validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); } - + validateInteger("trans_co_id", 1, 2147483647, "trans_co_id", "trans_co_id 范围 1~2147483647"); validateString("name", 1, 8, "name", "name 长度 1~8"); validateRegex("phone", StrUtil.regphone, "phone", "phone 必须为手机号格式"); 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 f2c63ae..4a289c3 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 @@ -26,7 +26,7 @@ import java.util.List; public class InvoiceLogService extends BaseService { public static final InvoiceLogService me = new InvoiceLogService(); - public InvoiceLog checkInvalidInvoiceLog(String invoice_number, String invoice_code){ + public InvoiceLog checkInvalidInvoiceLog(String invoice_number, String invoice_code) { return InvoiceLog.dao.findFirst( "select * from invoice_log t where t.state = ? and t.invoice_number = ? and t.code = ?", OrderStateEnum.INVALID.getStateid(), @@ -117,8 +117,8 @@ public class InvoiceLogService extends BaseService { " case when t.type = 1 then o.create_time when t.type = 3 then p.create_time end order_create_time, \n" + " case when t.type = 1 then o.settlement_user_name when t.type = 3 then p.settlement_user_name end settlement_user_name, \n" + " case when t.type = 1 then o.truck_license when t.type = 3 then p.truck_license end truck_license, \n" + - " case when t.type = 1 then o.customer_texpayer_name when t.type = 3 then p.customer_texpayer_name end customer_texpayer_name, \n"+ - " case when t.type = 1 then o.customer_texpayer_num when t.type = 3 then p.customer_texpayer_num end customer_texpayer_num, \n"+ + " case when t.type = 1 then o.customer_texpayer_name when t.type = 3 then p.customer_texpayer_name end customer_texpayer_name, \n" + + " case when t.type = 1 then o.customer_texpayer_num when t.type = 3 then p.customer_texpayer_num end customer_texpayer_num, \n" + " case when t.type = 1 then o.customer_name when t.type = 3 then p.customer_name end customer_name "; String fromsql = "from invoice_log t \n" + " left join invoice_receive r on r.id = t.invoice_receive_id \n" + @@ -169,9 +169,9 @@ public class InvoiceLogService extends BaseService { paraList.add(invoice_type); } - String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql + " order by t.create_time desc"; - List list = Db.find(findSql, paraList.toArray()); + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql + " order by t.create_time desc"; + List list = Db.find(findSql, paraList.toArray()); Workbook wb = new XSSFWorkbook(); Sheet sheet = wb.createSheet("发票使用日志"); @@ -217,17 +217,19 @@ public class InvoiceLogService extends BaseService { 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){ + if (order.get("invalid_time") != null) { row.createCell(a++).setCellValue(DateTimeUtil.sdfhms.get().format(order.getDate("invalid_time"))); - }else{ + } else { row.createCell(a++).setCellValue(""); } row.createCell(a++).setCellValue(order.getStr("invalid_user_name")); switch (order.getInt("state")) { case 5: - row.createCell(a++).setCellValue("已使用"); break; + row.createCell(a++).setCellValue("已使用"); + break; case 9: - row.createCell(a++).setCellValue("已作废"); break; + row.createCell(a++).setCellValue("已作废"); + break; default: row.createCell(a++).setCellValue(""); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java index cbd6943..e402095 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogValidator.java @@ -21,50 +21,50 @@ public class InvoiceLogValidator extends CrudParamValidator { validateString("id", 1, 32, "id", "id 长度 1~32"); } - + validateInteger("invoice_receive_id", 1, 2147483647, "invoice_receive_id", "invoice_receive_id 范围 1~2147483647"); - - + + validateString("code", 1, 20, "code", "code 长度 1~20"); - - + + validateString("create_time", 0, 19, "create_time", "create_time 长度 0~19"); - - + + validateString("change_time", 0, 19, "change_time", "change_time 长度 0~19"); - - + + validateInteger("state", -999999, 999999, "state", "state 范围 -999999~999999"); - - + + validateString("settlement_time", 0, 19, "settlement_time", "settlement_time 长度 0~19"); - + validateDate("settlement_time", "yyyy-MM-dd HH:mm:ss", false, "settlement_time", "settlement_time 格式 yyyy-MM-dd HH:mm:ss"); // 默认时间时间字符串格式，生成后根据情况调整 if (StrKit.notBlank(c.get("settlement_user_id"))) { // 可为空字段，当传入值时，才做验证 - validateInteger("settlement_user_id", 1, 2147483647, "settlement_user_id", "settlement_user_id 范围 1~2147483647"); - } - + validateInteger("settlement_user_id", 1, 2147483647, "settlement_user_id", "settlement_user_id 范围 1~2147483647"); + } + validateString("settlement_user_name", 0, 255, "settlement_user_name", "settlement_user_name 长度 0~255"); - - + + validateString("invalid_time", 0, 19, "invalid_time", "invalid_time 长度 0~19"); - + validateDate("invalid_time", "yyyy-MM-dd HH:mm:ss", false, "invalid_time", "invalid_time 格式 yyyy-MM-dd HH:mm:ss"); // 默认时间时间字符串格式，生成后根据情况调整 if (StrKit.notBlank(c.get("invalid_user_id"))) { // 可为空字段，当传入值时，才做验证 - validateInteger("invalid_user_id", 1, 2147483647, "invalid_user_id", "invalid_user_id 范围 1~2147483647"); - } - + validateInteger("invalid_user_id", 1, 2147483647, "invalid_user_id", "invalid_user_id 范围 1~2147483647"); + } + validateString("invalid_user_name", 0, 255, "invalid_user_name", "invalid_user_name 长度 0~255"); - - + + validateString("invalid_memo", 0, 255, "invalid_memo", "invalid_memo 长度 0~255"); - - + + validateString("order_sn", 0, 16, "order_sn", "order_sn 长度 0~16"); - + if (StrKit.notBlank(c.get("type"))) { // 可为空字段，当传入值时，才做验证 - validateInteger("type", -999999, 999999, "type", "type 范围 -999999~999999"); - } + validateInteger("type", -999999, 999999, "type", "type 范围 -999999~999999"); + } // 使用 model 更新时，model 不能只有主键有值 // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 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 6c11147..89394de 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 @@ -99,10 +99,10 @@ public class InvoiceReceiveService extends BaseService { return next_invoice_code; } - private String getValidInvoiceCode(String invoice_number, String next_invoice_code, Map map){ - if(map.containsKey(invoice_number + "_" + next_invoice_code)){ // 说明下一个发票号码已经作废，需要继续顺延 + private String getValidInvoiceCode(String invoice_number, String next_invoice_code, Map map) { + if (map.containsKey(invoice_number + "_" + next_invoice_code)) { // 说明下一个发票号码已经作废，需要继续顺延 return getValidInvoiceCode(invoice_number, String.format("%0" + next_invoice_code.length() + "d", Integer.parseInt(next_invoice_code) + 1), map); - }else{ + } else { return next_invoice_code; } } @@ -126,7 +126,7 @@ public class InvoiceReceiveService extends BaseService { return new ArrayList<>(); } - List out = new ArrayList<>(); + List out = new ArrayList<>(); List params = new ArrayList<>(); List sqlparams = new ArrayList<>(); @@ -141,7 +141,7 @@ public class InvoiceReceiveService extends BaseService { Map map = new HashMap<>(); - for(InvoiceLog l : logs){ + for (InvoiceLog l : logs) { map.put(l.getInvoiceNumber() + "_" + l.getCode(), l); } @@ -151,7 +151,7 @@ public class InvoiceReceiveService extends BaseService { String next_invoice_code = receive.getCurrentCode() == null ? receive.getStartCode() : receive.getCurrentCode(); next_invoice_code = getValidInvoiceCode(receive.getInvoiceNumber(), next_invoice_code, map); - if(Long.parseLong(next_invoice_code) > Long.parseLong(receive.getEndCode())){ + if (Long.parseLong(next_invoice_code) > Long.parseLong(receive.getEndCode())) { log.debug("顺延后的 next_invoice_code 超过了 end_code %s %s", receive.getId(), next_invoice_code); continue; } @@ -163,7 +163,6 @@ public class InvoiceReceiveService extends BaseService { } - return out; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java index dd530eb..0b61f00 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/receive/InvoiceReceiveValidator.java @@ -27,8 +27,8 @@ public class InvoiceReceiveValidator extends CrudParamValidator { validateInteger("receive_user_id", 1, 2147483647, "receive_user_id", "receive_user_id 范围 1~2147483647"); validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); - if(StrKit.notBlank(c.get("start_code"), c.get("end_code"))){ - if(c.getInt("end_code") - c.getInt("start_code") < 0){ + if (StrKit.notBlank(c.get("start_code"), c.get("end_code"))) { + if (c.getInt("end_code") - c.getInt("start_code") < 0) { addError("end_code", "end_code 必须大于等于 start_code"); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java index d8f25f8..90d3705 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java @@ -18,7 +18,7 @@ public class ModifyLogController extends Controller { /** * 分页查找 modify_log 配置相关表修改日志记录 */ - public void find(){ + public void find() { PageParam pp = getBean(PageParam.class, "", true); renderJson(Result.object(ModifyLogService.me.find(pp))); } @@ -27,7 +27,7 @@ public class ModifyLogController extends Controller { * 按主键查找单个对象 modify_log 配置相关表修改日志记录 */ @Before(ModifyLogPKValidator.class) - public void get(){ + public void get() { ModifyLog model = getModel(ModifyLog.class, "", true); // 忽略不在model中的字段 renderJson(ModifyLogService.me.get(model)); } @@ -35,7 +35,7 @@ public class ModifyLogController extends Controller { /** * 返回所有 modify_log 配置相关表修改日志记录 */ - public void list(){ + public void list() { renderJson(Result.object(ModifyLogService.me.list())); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderService.java index b4c77b4..98a9b5f 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/OrderService.java @@ -7,6 +7,7 @@ import com.jfinal.kit.StrKit; public class OrderService { public static OrderService me = new OrderService(); + /** * 按 sn 查询订单相关信息 * diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java index f977737..ae25d7f 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterValidator.java @@ -34,7 +34,7 @@ public class OrderclusterValidator extends CrudParamValidator { validateString("cutoff_time", 1, 19, "cutoff_time", "cutoff_time 长度 1~19"); validateDate("cutoff_time", "yyyy-MM-dd HH:mm:ss", false, "cutoff_time", "cutoff_time 格式 yyyy-MM-dd HH:mm:ss"); // 默认时间时间字符串格式，生成后根据情况调整 - if(StrKit.notBlank(c.get("cutoff_time")) && DateTimeUtil.isEarlyToday(c.get("cutoff_time"))){ + if (StrKit.notBlank(c.get("cutoff_time")) && DateTimeUtil.isEarlyToday(c.get("cutoff_time"))) { addError("cutoff_time", "截止时间不能早于今天"); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java index 821d308..4c4045d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java @@ -83,6 +83,7 @@ public class OrderclusterTruckService extends BaseService { /** * 用超市id、车牌号查询当天关联的集团订单信息 + * * @param supermarket_id * @param truck_license * @return 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 d58e09c..1805abb 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 @@ -24,6 +24,7 @@ public class OrderPurchaseService extends BaseService { /** * 按 sn 查询单个订单信息 + * * @param sn * @return */ @@ -51,7 +52,7 @@ public class OrderPurchaseService extends BaseService { Integer state, Integer product_id ) { - String selectsql = "select t.* " + + String selectsql = "select t.* " + ", p.order_sn \n" + ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" + ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" + 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 100e3d5..3bbe937 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 @@ -24,6 +24,7 @@ public class OrderSaleService extends BaseService { /** * 按 sn 查询单个订单信息 + * * @param sn * @return */ 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 63b6457..c4433de 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 @@ -316,13 +316,17 @@ public class OrderTempService extends BaseService { switch (order.getInt("state")) { case 1: - row.createCell(a++).setCellValue("新建"); break; + row.createCell(a++).setCellValue("新建"); + break; case 4: - row.createCell(a++).setCellValue("待付款"); break; + row.createCell(a++).setCellValue("待付款"); + break; case 5: - row.createCell(a++).setCellValue("已完成"); break; + row.createCell(a++).setCellValue("已完成"); + break; case 9: - row.createCell(a++).setCellValue("已取消"); break; + row.createCell(a++).setCellValue("已取消"); + break; default: row.createCell(a++).setCellValue(""); } @@ -330,7 +334,7 @@ public class OrderTempService extends BaseService { } // 通用单元格格式 - Font font = wb.createFont(); + Font font = wb.createFont(); CellStyle cellStyle = wb.createCellStyle(); font.setFontHeight((short) (10 * 20)); font.setFontName("宋体"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java index c4c934f..ec2dbb3 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertrash/OrderTrashPKValidator.java @@ -10,7 +10,7 @@ import com.jfinal.core.Controller; * Generated by COWR Fri Apr 17 16:59:39 CST 2020 * TableName: order_trash * Remarks: 订单相关 - 废料运出单 - + *

* PrimaryKey: sn */ public class OrderTrashPKValidator extends CrudParamValidator { 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 1fa7830..7a9f3e9 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 @@ -9,6 +9,7 @@ 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.util.ArrayList; import java.util.List; @@ -16,7 +17,7 @@ import java.util.List; * Generated by COWR Fri Apr 17 16:59:39 CST 2020 * TableName: order_trash * Remarks: 订单相关 - 废料运出单 - + *

* PrimaryKey: sn */ public class OrderTrashService extends BaseService { @@ -24,11 +25,12 @@ public class OrderTrashService extends BaseService { /** * 按 sn 查询单个订单信息 + * * @param sn * @return */ public Record get(String sn) { - return Db.findFirst("select t.* " + + return Db.findFirst("select t.* " + ", p.order_sn \n" + ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" + ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" + @@ -49,7 +51,7 @@ public class OrderTrashService extends BaseService { Integer state, Integer product_id ) { - String selectsql = "select t.* " + + String selectsql = "select t.* " + ", p.order_sn \n" + ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" + ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" + @@ -97,7 +99,7 @@ public class OrderTrashService extends BaseService { } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && OrderTrash.dao.hasColunm(pp.getSort_field())) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java index 4e9b611..6b79f16 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java @@ -270,9 +270,9 @@ group by date "and t.state < ? \n" + "group by t.supermarket_id", nowdaytm + "%", OrderStateEnum.RECEIVED.getStateid()); - for(Record record : by_supermarket_list){ - for(Record r : suppeie){ - if(r.getInt("supermarket_id") != null && r.getInt("supermarket_id").equals(record.getInt("supermarket_id"))){ + for (Record record : by_supermarket_list) { + for (Record r : suppeie) { + if (r.getInt("supermarket_id") != null && r.getInt("supermarket_id").equals(record.getInt("supermarket_id"))) { record.set("day_quota_total_price", r.get("total_weight")); } } @@ -289,6 +289,7 @@ group by date /** * 近 31 日总销售列表 + * * @return */ public List lastStat() { @@ -313,6 +314,7 @@ group by date /** * 近 31 日砂站总销售列表 + * * @return */ public List lastSupermarketStat(int supermarket_id) { @@ -339,6 +341,7 @@ group by date /** * 近 31 日客户总销售列表 + * * @return */ public List lastCustomerStat(int customer_id) { @@ -365,6 +368,7 @@ group by date /** * 近 31 日散户总销售列表 + * * @return */ public List lastTempStat() { 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 0119620..c3d3775 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 @@ -106,7 +106,7 @@ public class PrepayService { } public Record prepayInfo(Ordercluster ordercluster, Transport transport) { - if(ordercluster == null || transport == null) { + if (ordercluster == null || transport == null) { return null; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java index dacc6a4..1717a77 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaycustomer/PrepayCustomerService.java @@ -5,11 +5,11 @@ import com.cowr.model.PrepayCustomer; public class PrepayCustomerService { public static PrepayCustomerService me = new PrepayCustomerService(); - public PrepayCustomer getPrepayCustomer(int customer_id, int supermarket_id){ + public PrepayCustomer getPrepayCustomer(int customer_id, int supermarket_id) { return PrepayCustomer.dao.findFirst("select * from prepay_customer where customer_id = ? and supermarket_id = ? ", customer_id, supermarket_id); } - public PrepayCustomer getPrepayCustomer(int customer_id){ + public PrepayCustomer getPrepayCustomer(int customer_id) { return PrepayCustomer.dao.findFirst("select * from prepay_customer where customer_id = ? limit 1", customer_id); } } 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 82d4d8a..ee914b8 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 @@ -41,14 +41,14 @@ public class PrepayDetailService extends BaseService { } }; - public Record get(String id){ + public Record get(String id) { PrepayDetail pd = PrepayDetail.dao.findById(id); - if(pd == null){ + if (pd == null) { return null; } - Record out = pd.toRecord(); + Record out = pd.toRecord(); Customer customer = Customer.dao.findById(pd.getCustomerId()); out.set("customer_name", customer.getName()); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java index 435d03c..99a250b 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailValidator.java @@ -19,7 +19,7 @@ public class PrepayDetailValidator extends CrudParamValidator { if (!"save".equals(getActionMethodName())) { validateString("id", 32, 32, "id", "id 长度 32，必填"); } - + validateInteger("customer_id", 1, 2147483647, "customer_id", "customer_id 范围 1~2147483647"); // validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); validateBigDecimal("amount", new java.math.BigDecimal(0), new java.math.BigDecimal(9.9999999999E10), "amount", "amount 范围 0~9.9999999999E10"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java index f323450..bb3c618 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java @@ -15,10 +15,11 @@ import java.util.List; * PrimaryKey: id */ public class PrepayDetailVerifyValidator extends CrudParamValidator { - private static List chkstate = new ArrayList(){{ + private static List chkstate = new ArrayList() {{ add(2); add(9); }}; + @Override protected void validate(Controller c) { validateString("id", 32, 32, "id", "id 长度 32，必填"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java index 178f3c1..9514ec8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/DayValidator.java @@ -11,8 +11,8 @@ import com.jfinal.kit.StrKit; public class DayValidator extends CrudParamValidator { @Override protected void validate(Controller c) { - if(StrKit.notBlank(c.get("valid_date"))){ - validateDate("valid_date", "yyyy-MM-dd","valid_date","valid_date 格式必须为 yyyy-MM-dd"); + if (StrKit.notBlank(c.get("valid_date"))) { + validateDate("valid_date", "yyyy-MM-dd", "valid_date", "valid_date 格式必须为 yyyy-MM-dd"); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java index bf3896c..94c67ff 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/prepaytruck/PrepayTruckValidator.java @@ -25,7 +25,7 @@ public class PrepayTruckValidator extends CrudParamValidator { validateRequired("trucks", "trucks", "trucks 必填"); validateInteger("customer_id", 1, 2147483647, "customer_id", "customer_id 范围 1~2147483647"); validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); - validateDate("valid_date", "yyyy-MM-dd","valid_date","valid_date 格式必须为 yyyy-MM-dd"); + validateDate("valid_date", "yyyy-MM-dd", "valid_date", "valid_date 格式必须为 yyyy-MM-dd"); // 使用 model 更新时，model 不能只有主键有值 // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java index 7797452..e60db12 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java @@ -15,10 +15,11 @@ import java.util.List; * PrimaryKey: id */ public class RefundDetailConfirmValidator extends CrudParamValidator { - private static List chkstate = new ArrayList(){{ + private static List chkstate = new ArrayList() {{ add(2); add(9); }}; + @Override protected void validate(Controller c) { validateString("id", 32, 32, "id", "id 长度 32，必填"); 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 c6709e8..f3a3964 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 @@ -25,10 +25,10 @@ public class RefundDetailService extends BaseService { private static Log log = Log.getLog(RefundDetailService.class); public static final RefundDetailService me = new RefundDetailService(); - public Record get(String id){ + public Record get(String id) { RefundDetail rd = RefundDetail.dao.findById(id); - if(rd == null){ + if (rd == null) { return null; } @@ -68,7 +68,7 @@ public class RefundDetailService extends BaseService { } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && RefundDetail.dao.hasColunm(pp.getSort_field())) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java index 538affe..ec50f74 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailValidator.java @@ -19,7 +19,7 @@ public class RefundDetailValidator extends CrudParamValidator { if (!"save".equals(getActionMethodName())) { validateString("id", 32, 32, "id", "id 长度 32，必填"); } - + validateInteger("customer_id", 1, 2147483647, "customer_id", "customer_id 范围 1~2147483647"); // validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); validateBigDecimal("amount", new java.math.BigDecimal(0), new java.math.BigDecimal(9.9999999999E10), "amount", "amount 范围 -9.9999999999E10~9.9999999999E10"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java index f97227c..297bc67 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java @@ -15,10 +15,11 @@ import java.util.List; * PrimaryKey: id */ public class RefundDetailVerifyValidator extends CrudParamValidator { - private static List chkstate = new ArrayList(){{ + private static List chkstate = new ArrayList() {{ add(2); add(9); }}; + @Override protected void validate(Controller c) { validateString("id", 32, 32, "id", "id 长度 32，必填"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductValidator.java index 3bb93d2..910a2bf 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/product/ProductValidator.java @@ -19,7 +19,7 @@ public class ProductValidator extends CrudParamValidator { validateRequired("id", "id", "id 必填"); validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); } - + validateString("name", 1, 255, "name", "name 长度 1~255"); // 使用 model 更新时，model 不能只有主键有值 diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java index 9fd1812..5e1b765 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/purchase/PurchaseValidator.java @@ -20,7 +20,7 @@ public class PurchaseValidator extends CrudParamValidator { validateRequired("id", "id", "id 必填"); validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); } - + validateString("name", 1, 255, "name", "name 长度 1~255"); validateBigDecimal("lgtd", new java.math.BigDecimal(74), new java.math.BigDecimal(135), "lgtd", "lgtd 范围 74~135"); validateBigDecimal("lttd", new java.math.BigDecimal(3.75), new java.math.BigDecimal(53.7), "lttd", "lttd 范围 3.75~53.7"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java index cb67f26..adb3bfc 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/sandfarm/SandfarmValidator.java @@ -20,7 +20,7 @@ public class SandfarmValidator extends CrudParamValidator { validateRequired("id", "id", "id 必填"); validateInteger("id", 1, 2147483647, "id", "id 范围 1~2147483647"); } - + validateString("name", 1, 255, "name", "name 长度 1~255"); validateBigDecimal("lgtd", new java.math.BigDecimal(74), new java.math.BigDecimal(135), "lgtd", "lgtd 范围 74~135"); validateBigDecimal("lttd", new java.math.BigDecimal(3.75), new java.math.BigDecimal(53.7), "lttd", "lttd 范围 3.75~53.7"); 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 ce97bf0..ce5434f 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 @@ -206,7 +206,7 @@ public class OrderPurchaseStatService { // 合计 start row = sheet.createRow(datalen + 3); - a = 0; + a = 0; row.createCell(a++).setCellValue("合计"); row.createCell(a++).setCellValue(""); row.createCell(a++).setCellValue(""); 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 d7148a1..12223b9 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 @@ -420,13 +420,13 @@ public class OrderStatService { List dblist = Db.find(sql, paraList.toArray()); Map spkeys = new HashMap<>(); // supermarket_id <-> supermarket_name - Map cumaps = new HashMap<>(); // customer_id <-> out record + Map cumaps = new HashMap<>(); // customer_id <-> out record for (Record record : dblist) { String supermarket_id_str = record.getStr("supermarket_id"); int sql_supermarket_id = record.getInt("supermarket_id"); String supermarket_name = record.getStr("supermarket_name"); - String sql_customer_id; + String sql_customer_id; if (record.get("customer_id") == null) { sql_customer_id = "0"; @@ -1270,7 +1270,7 @@ public class OrderStatService { for (int i = 0; i < cids.length; i++) { String cid = cids[i]; - if(i > 0){ + if (i > 0) { sale_sql += ", "; temp_sql += ", "; } @@ -1336,7 +1336,7 @@ public class OrderStatService { " ) a\n" + " left join customer c on c.id = a.customer_id \n" + " group by a.customer_name, a.product_id "; - }else{ + } else { sql = "select ifnull(a.customer_name, '民用') customer_name, max(a.customer_id), sum(a.weight) weight, sum(a.total_price) total_price, count(a.sn) orderCount \n" + " from( \n" + sale_sql + 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 975552e..74205af 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 @@ -12,6 +12,7 @@ import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; + import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -198,7 +199,7 @@ public class OrderTransferStatService { // 合计 start row = sheet.createRow(datalen + 3); - a = 0; + a = 0; row.createCell(a++).setCellValue("合计"); row.createCell(a++).setCellValue(""); row.createCell(a++).setCellValue(""); 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 097c638..31ff117 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 @@ -29,18 +29,19 @@ public class SupermarketService extends BaseService { /** * 获取所有砂站和商品的配置 * 数据量不多，都加载进来 + * * @return */ - private Map> getSupProduct(){ + 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"); Map> map = new HashMap<>(); - for(Record record : list){ + for (Record record : list) { int supermarket_id = record.getInt("supermarket_id"); - if(!map.containsKey(supermarket_id)){ + if (!map.containsKey(supermarket_id)) { map.put(supermarket_id, new ArrayList<>()); } @@ -80,14 +81,14 @@ public class SupermarketService extends BaseService { } Map> productmap = getSupProduct(); - Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); - List list = page.getList(); + Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + List list = page.getList(); - for(Record record : list){ + for (Record record : list) { int supermarket_id = record.getInt("id"); - if(productmap.containsKey(supermarket_id)){ - record.set("products", productmap.get(supermarket_id)); + if (productmap.containsKey(supermarket_id)) { + record.set("products", productmap.get(supermarket_id)); } } @@ -95,13 +96,13 @@ public class SupermarketService extends BaseService { } public List list() { - List list = Db.find("select * from supermarket t where t.del = 0"); + List list = Db.find("select * from supermarket t where t.del = 0"); Map> productmap = getSupProduct(); - for(Record record : list){ + for (Record record : list) { int supermarket_id = record.getInt("id"); - if(productmap.containsKey(supermarket_id)){ + if (productmap.containsKey(supermarket_id)) { record.set("products", productmap.get(supermarket_id)); } } @@ -109,10 +110,10 @@ public class SupermarketService extends BaseService { return list; } - public Result get(int id){ + public Result get(int id) { Supermarket supermarket = Supermarket.dao.findById(id); - if(supermarket == null){ + if (supermarket == null) { return Result.failed("未找到砂站记录"); } Record out = supermarket.toRecord(); 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 b9d02d9..5e33bd7 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 @@ -21,7 +21,7 @@ import java.util.List; * PrimaryKey: supermarket_id,customer_id */ public class SupermarketCustomerDistanceService extends BaseService { - public static final SupermarketCustomerDistanceService me = new SupermarketCustomerDistanceService(); + public static final SupermarketCustomerDistanceService me = new SupermarketCustomerDistanceService(); private static Log log = Log.getLog(SupermarketCustomerDistanceService.class); public BigDecimal getDistance(Integer supermarket_id, Integer customer_id) { @@ -41,7 +41,7 @@ public class SupermarketCustomerDistanceService extends BaseService { } } - public List customerDistance(Integer customer_id){ + public List customerDistance(Integer customer_id) { return Db.find("select t.id, t.name, t.name2, cr.distance, cr.customer_id, c.name customer_name from supermarket t\n" + " left join supermarket_customer_distance cr on cr.supermarket_id = t.id and cr.customer_id = ? \n" + " left join customer c on c.id = cr.customer_id ", customer_id); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java index 27162c6..4adedee 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistancePKValidator.java @@ -9,7 +9,7 @@ import com.jfinal.core.Controller; * Generated by COWR Mon Apr 06 09:50:28 CST 2020 * TableName: supermarket_sandfarm_distance * Remarks: 生产点到销售点的距离配置 - + *

* PrimaryKey: supermarket_id,sandfarm_id */ public class SupermarketSandfarmDistancePKValidator extends CrudParamValidator { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java index a5c7f0c..d2c976d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockService.java @@ -9,6 +9,7 @@ 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.util.ArrayList; import java.util.List; @@ -29,18 +30,18 @@ public class StockService extends BaseService { " where 1=1 "; List paraList = new ArrayList<>(); - if(supermarket_id != null){ + if (supermarket_id != null) { fromsql += " and t.supermarket_id = ? \n"; paraList.add(supermarket_id); } - if(product_id != null){ + if (product_id != null) { fromsql += " and t.product_id = ? \n"; paraList.add(product_id); } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && Stock.dao.hasColunm(pp.getSort_field())) { @@ -51,7 +52,7 @@ public class StockService extends BaseService { } else { findSql += " " + Const.ORDER_BY_DESC; } - }else{ + } else { findSql += " order by t.supermarket_id, t.product_id "; } @@ -74,18 +75,18 @@ public class StockService extends BaseService { " where 1=1 "; List paraList = new ArrayList<>(); - if(supermarket_id != null){ + if (supermarket_id != null) { fromsql += " and t.supermarket_id = ? \n"; paraList.add(supermarket_id); } - if(product_id != null){ + if (product_id != null) { fromsql += " and t.product_id = ? \n"; paraList.add(product_id); } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && StockModifyLog.dao.hasColunm(pp.getSort_field())) { @@ -96,7 +97,7 @@ public class StockService extends BaseService { } else { findSql += " " + Const.ORDER_BY_DESC; } - }else{ + } else { findSql += " order by t.supermarket_id, t.product_id "; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java index 222e39e..a75a833 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/stock/StockValidator.java @@ -20,12 +20,12 @@ public class StockValidator extends CrudParamValidator { validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); } - + validateBigDecimal("stock_weight", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "stock_weight", "stock_weight 范围 -9.9999999999E10~9.9999999999E10"); - - + + validateString("change_time", 0, 19, "change_time", "change_time 长度 0~19"); - + // 使用 model 更新时，model 不能只有主键有值 // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java index d5b158d..5d52071 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/PostWeightValidator.java @@ -10,7 +10,7 @@ public class PostWeightValidator extends CrudParamValidator { protected void validate(Controller c) { validateRequired("truck_license", "truck_license", "truck_license 必填"); validateBigDecimal("weight", new java.math.BigDecimal(0), new java.math.BigDecimal(9.999999999999E10), "weight", "weight 范围 0~9.999999999999E10"); - validateRequired("which", "which" ,"which 必填"); + validateRequired("which", "which", "which 必填"); } protected void handleError(Controller c) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java index 583cff9..98370bb 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transport/TransportIdValidator.java @@ -7,7 +7,7 @@ import com.jfinal.core.Controller; public class TransportIdValidator extends CrudParamValidator { @Override protected void validate(Controller c) { - validateRequired("transport_id", "transport_id" ,"transport_id 必填"); + validateRequired("transport_id", "transport_id", "transport_id 必填"); } protected void handleError(Controller c) { 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 93d7651..19ab7fc 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 @@ -113,7 +113,7 @@ public class TransportService extends BaseService { } else { findSql += " " + Const.ORDER_BY_DESC; } - }else{ + } else { findSql += " order by t.in_time is null, t.in_time desc "; } 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 2908f3a..5b1a4df 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 @@ -10,6 +10,7 @@ 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.HashMap; import java.util.List; @@ -21,43 +22,43 @@ import java.util.List; * PrimaryKey: id */ public class TransportCompanyService extends BaseService { - public static final TransportCompanyService me = new TransportCompanyService(); - private static Log log = Log.getLog(TransportCompanyService.class); + public static final TransportCompanyService me = new TransportCompanyService(); + private static Log log = Log.getLog(TransportCompanyService.class); /** * 初始化 TRANS_CO_PRICE_MODULUS 配置 */ - public void initTransCoPriceModulus(){ + public void initTransCoPriceModulus() { CacheData.TRANS_CO_PRICE_MODULUS = new HashMap<>(); List list = TransportCompany.dao.find("select id, price_modulus from transport_company"); - if(list == null || list.isEmpty()){ + if (list == null || list.isEmpty()) { return; } - for(TransportCompany tp : list){ + for (TransportCompany tp : list) { CacheData.TRANS_CO_PRICE_MODULUS.put(tp.getId(), tp.getPriceModulus()); } } public Page find(PageParam pp, String name, Integer del) { - String selectsql = "select * "; - String fromsql = "from transport_company t where 1=1 "; - List paraList = new ArrayList<>(); + String selectsql = "select * "; + String fromsql = "from transport_company 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)){ + if (StrKit.notBlank(name)) { fromsql += " and t.name like ? \n"; paraList.add("%" + name.trim() + "%"); } String totalRowSql = "select count(*) " + fromsql; - String findSql = selectsql + fromsql; + String findSql = selectsql + fromsql; // 前端传了排序字段，并且排序字段存在相关表中 if (StrKit.notBlank(pp.getSort_field()) && TransportCompany.dao.hasColunm(pp.getSort_field())) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java index 61e1d6f..1a3971c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceController.java @@ -8,15 +8,15 @@ public class TransPriceController extends BaseController { * 销售或者转运运费计算 */ public void caleTransPrice() { - int type = getInt("type", 1); - Integer trans_co_id = getInt("trans_co_id"); - Integer sandfarm_id = getInt("sandfarm_id"); - double weight = getParaToDouble("weight", 0.0); - double trans_distance = getParaToDouble("trans_distance", 0.0); + int type = getInt("type", 1); + Integer trans_co_id = getInt("trans_co_id"); + Integer sandfarm_id = getInt("sandfarm_id"); + double weight = getParaToDouble("weight", 0.0); + double trans_distance = getParaToDouble("trans_distance", 0.0); - if(type == 1){ + if (type == 1) { renderJson(Result.success(TransPriceService.me.caleOrderTransPrice(trans_co_id, weight, trans_distance))); - }else{ + } else { renderJson(Result.success(TransPriceService.me.caleTransferTransPrice(sandfarm_id, weight, trans_distance))); } } @@ -25,9 +25,9 @@ public class TransPriceController extends BaseController { * 销售订单运费计算 */ public void caleOrderTransPrice() { - Integer trans_co_id = getInt("trans_co_id"); - double weight = getParaToDouble("weight", 0.0); - double trans_distance = getParaToDouble("trans_distance", 0.0); + Integer trans_co_id = getInt("trans_co_id"); + double weight = getParaToDouble("weight", 0.0); + double trans_distance = getParaToDouble("trans_distance", 0.0); renderJson(Result.success(TransPriceService.me.caleOrderTransPrice(trans_co_id, weight, trans_distance))); } @@ -36,9 +36,9 @@ public class TransPriceController extends BaseController { * 转运订单运费计算 */ public void caleTransfTransPrice() { - Integer sandfarm_id = getInt("sandfarm_id"); - double weight = getParaToDouble("weight", 0.0); - double trans_distance = getParaToDouble("trans_distance", 0.0); + Integer sandfarm_id = getInt("sandfarm_id"); + 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))); } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java index 7860f73..6100540 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceModel.java @@ -6,66 +6,66 @@ import com.jfinal.plugin.activerecord.Record; /** * { - * min: 5, 重量范围下限 - * max: 5, 重量范围上限 - * start: 46.5, 重量范围内，起步运距内的起步单价 - * unit_price: 0.47 重量范围内，每公里每吨运费 + * min: 5, 重量范围下限 + * max: 5, 重量范围上限 + * start: 46.5, 重量范围内，起步运距内的起步单价 + * unit_price: 0.47 重量范围内，每公里每吨运费 * } */ public class TransPriceModel { private static Log log = Log.getLog(TransPriceModel.class); private double min; - private double max; - private double start; - private double unit_price; + private double max; + private double start; + private double unit_price; - public TransPriceModel(Record model){ - try{ - this.min = model.getBigDecimal("min").doubleValue(); - this.max = model.getBigDecimal("max").doubleValue(); - this.start = model.getBigDecimal("start").doubleValue(); + public TransPriceModel(Record model) { + try { + this.min = model.getBigDecimal("min").doubleValue(); + this.max = model.getBigDecimal("max").doubleValue(); + this.start = model.getBigDecimal("start").doubleValue(); this.unit_price = model.getBigDecimal("unit_price").doubleValue(); - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage(), e); } } - @JSONField(name="min") + @JSONField(name = "min") public double getMin() { return min; } - @JSONField(name="min") + @JSONField(name = "min") public void setMin(double min) { this.min = min; } - @JSONField(name="max") + @JSONField(name = "max") public double getMax() { return max; } - @JSONField(name="max") + @JSONField(name = "max") public void setMax(double max) { this.max = max; } - @JSONField(name="start") + @JSONField(name = "start") public double getStart() { return start; } - @JSONField(name="start") + @JSONField(name = "start") public void setStart(double start) { this.start = start; } - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public double getUnitPrice() { return unit_price; } - @JSONField(name="unit_price") + @JSONField(name = "unit_price") public void setUnitPrice(double unit_price) { this.unit_price = unit_price; } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java index 87ceeae..1a7f70f 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/transprice/TransPriceService.java @@ -20,16 +20,16 @@ public class TransPriceService { /** * 初始化销售订单运输价格配置 */ - public void initTransPriceConfigSale(){ + public void initTransPriceConfigSale() { CacheData.TRANS_PRICE_CONFIG_SALE = new ArrayList<>(); // 默认 order by id ，数据库中配置的值，必须是固定的，都不能动 List list = TransPriceConfigSale.dao.find("select * from trans_price_config_sale order by id"); - if(list == null || list.isEmpty()){ + if (list == null || list.isEmpty()) { return; } - for(TransPriceConfigSale tc : list){ + for (TransPriceConfigSale tc : list) { CacheData.TRANS_PRICE_CONFIG_SALE.add(new TransPriceModel(tc.toRecord())); } } @@ -37,16 +37,16 @@ public class TransPriceService { /** * 初始化转运订单运输价格配置 */ - public void initTransPriceConfigTransfer(){ + public void initTransPriceConfigTransfer() { CacheData.TRANS_PRICE_CONFIG_TRANSFER = new ArrayList<>(); // 默认 order by id ，数据库中配置的值，必须是固定的，都不能动 List list = TransPriceConfigTransfer.dao.find("select * from trans_price_config_transfer order by id"); - if(list == null || list.isEmpty()){ + if (list == null || list.isEmpty()) { return; } - for(TransPriceConfigTransfer tc : list){ + for (TransPriceConfigTransfer tc : list) { CacheData.TRANS_PRICE_CONFIG_TRANSFER.add(new TransPriceModel(tc.toRecord())); } } @@ -54,28 +54,29 @@ public class TransPriceService { /** * 初始化废料订单运输价格配置 */ - public void initTransPriceConfigTrash(){ + public void initTransPriceConfigTrash() { CacheData.TRANS_PRICE_CONFIG_TRASH = new ArrayList<>(); // 默认 order by id ，数据库中配置的值，必须是固定的，都不能动 List list = TransPriceConfigTrash.dao.find("select * from trans_price_config_trash order by id"); - if(list == null || list.isEmpty()){ + if (list == null || list.isEmpty()) { return; } - for(TransPriceConfigTrash tc : list){ + for (TransPriceConfigTrash tc : list) { CacheData.TRANS_PRICE_CONFIG_TRASH.add(new TransPriceModel(tc.toRecord())); } } /** * 计算总价，三舍四入 保留 0 位小数 - * @param up 单价 + * + * @param up 单价 * @param net_weight 净重 * @return Double */ - public Double caleTotalPriceDouble(BigDecimal up, BigDecimal net_weight){ - if(up == null || net_weight == null){ + public Double caleTotalPriceDouble(BigDecimal up, BigDecimal net_weight) { + if (up == null || net_weight == null) { return null; } @@ -86,12 +87,13 @@ public class TransPriceService { /** * 计算总价 + * * @param up * @param net_weight * @return BigDecimal */ - public BigDecimal caleTotalPrice(BigDecimal up, BigDecimal net_weight){ - if(up == null || net_weight == null){ + public BigDecimal caleTotalPrice(BigDecimal up, BigDecimal net_weight) { + if (up == null || net_weight == null) { return null; } @@ -100,24 +102,26 @@ public class TransPriceService { /** * 计算销售订单运输总价 - * @param trans_co_id 物流公司id - * @param net_weight 净重 + * + * @param trans_co_id 物流公司id + * @param net_weight 净重 * @param trans_distance 运输距离 * @return */ - public double caleOrderTransPrice(Integer trans_co_id, double net_weight, double trans_distance){ + public double caleOrderTransPrice(Integer trans_co_id, double net_weight, double trans_distance) { return caleTransPrice(CacheData.TRANS_PRICE_CONFIG_SALE, trans_co_id, net_weight, trans_distance); } /** * 计算转运订单运输总价 * 2019-08-31 转运运费改为以距离为基础，分段计价 - * @param sandfarm_id 砂场id - * @param net_weight 净重 + * + * @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(Integer sandfarm_id, double net_weight, double trans_distance) { if (CacheData.TRANS_PRICE_CONFIG_TRANSFER == null || CacheData.TRANS_PRICE_CONFIG_TRANSFER.isEmpty()) { log.error("读取运费配置错误"); return 0.0; @@ -126,7 +130,7 @@ public class TransPriceService { // 2019-09-01 砂场信息是用户可能会添加的，为了方便，还是每次从数据取 Sandfarm sandfarm = Sandfarm.dao.findById(sandfarm_id); - if(sandfarm == null){ + if (sandfarm == null) { log.error("获取砂场信息错误"); return 0.0; } @@ -203,13 +207,13 @@ public class TransPriceService { trans_distance = CacheData.start_trans_distance; // 起步运距 } - TransPriceModel first = tps.get(0); - double temp_trans_distance = trans_distance - CacheData.start_trans_distance; - double out = 0.0; + TransPriceModel first = tps.get(0); + double temp_trans_distance = trans_distance - CacheData.start_trans_distance; + double out = 0.0; if (net_weight < first.getMin()) { net_weight = first.getMin(); // 起步重量 - out = first.getStart() + first.getUnitPrice() * temp_trans_distance * net_weight; + out = first.getStart() + first.getUnitPrice() * temp_trans_distance * net_weight; } else { for (TransPriceModel model : tps) { if (model.getMin() != model.getMax()) { @@ -225,24 +229,26 @@ public class TransPriceService { // 20190-08-06 四舍五入，保留 0 位小数 // 20190-08-09 三舍四入，保留 0 位小数 - return MathUtil.round4(out * price_modulus.doubleValue() ); + return MathUtil.round4(out * price_modulus.doubleValue()); } /** * 销售订单起步价 + * * @param trans_co_id * @param weight * @return */ - public double getOrderStartTransPrice(Integer trans_co_id, double weight){ + public double getOrderStartTransPrice(Integer trans_co_id, double weight) { return getStartTransPrice(CacheData.TRANS_PRICE_CONFIG_SALE, trans_co_id, weight); } /** * 转运订单单价 + * * @return */ - public double getTransferStartTransPrice(double trans_distance){ + public double getTransferStartTransPrice(double trans_distance) { if (CacheData.TRANS_PRICE_CONFIG_TRANSFER == null || CacheData.TRANS_PRICE_CONFIG_TRANSFER.isEmpty()) { log.error("读取运费配置错误"); return 0.0; 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 6800989..3891d88 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 @@ -89,6 +89,7 @@ public class TruckService extends BaseService { * 判定车辆目前的订单类型 * 如果有销售订单，则先称重。如果车辆入场重量大大超过皮重（>=10%），则认为是转运车辆 * 如果车辆入场重量在皮重左右（<10%），则认为是执行销售订单 + * * @param tare * @return 皮重 * （ 1 + 浮动参数 ） */ diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java index 461f156..d0c1c76 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/TruckValidator.java @@ -20,22 +20,22 @@ public class TruckValidator extends CrudParamValidator { validateRequired("license", "license", "license 必填"); validateString("license", 1, 10, "license", "license 长度 1~10"); } - + 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"); 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"); validateString("model", 0, 32, "model", "model 长度 0~32"); - + if (StrKit.notBlank(c.get("number"))) { // 可为空字段，当传入值时，才做验证 validateString("number", 0, 4, "number", "number 范围 0~9999"); - } - + } + validateString("owner_name", 0, 8, "owner_name", "owner_name 长度 0~8"); validateString("owner_phone", 0, 11, "owner_phone", "owner_phone 长度 0~11"); validateString("gps", 0, 32, "gps", "gps 长度 0~32"); validateString("sim", 0, 32, "sim", "sim 长度 0~32"); - + // 使用 model 更新时，model 不能只有主键有值 // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 diff --git a/ssjygl-xsx-common/src/main/java/generator/BaseModelGenerator.java b/ssjygl-xsx-common/src/main/java/generator/BaseModelGenerator.java index 9e125b2..b2aaf1c 100644 --- a/ssjygl-xsx-common/src/main/java/generator/BaseModelGenerator.java +++ b/ssjygl-xsx-common/src/main/java/generator/BaseModelGenerator.java @@ -1,12 +1,12 @@ /** * Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com). - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,133 +34,132 @@ import java.util.Map; * Base model 生成器 */ public class BaseModelGenerator { - - protected Engine engine; - protected String template = "/generator/base_model_template.jf"; - - protected String baseModelPackageName; - protected String baseModelOutputDir; - protected boolean generateChainSetter = false; - - protected JavaKeyword javaKeyword = JavaKeyword.me; - - /** - * 针对 Model 中七种可以自动转换类型的 getter 方法，调用其具有确定类型返回值的 getter 方法 - * 享用自动类型转换的便利性，例如 getInt(String)、getStr(String) - * 其它方法使用泛型返回值方法： get(String) - * 注意：jfinal 3.2 及以上版本 Model 中的六种 getter 方法才具有类型转换功能 - */ - @SuppressWarnings("serial") - protected Map getterTypeMap = new HashMap() {{ - put("java.lang.String", "getStr"); - put("java.lang.Integer", "getInt"); - put("java.lang.Long", "getLong"); - put("java.lang.Double", "getDouble"); - put("java.lang.Float", "getFloat"); - put("java.lang.Short", "getShort"); - put("java.lang.Byte", "getByte"); - }}; - - public BaseModelGenerator(String baseModelPackageName, String baseModelOutputDir) { - if (StrKit.isBlank(baseModelPackageName)) { - throw new IllegalArgumentException("baseModelPackageName can not be blank."); - } - if (baseModelPackageName.contains("/") || baseModelPackageName.contains("\\")) { - throw new IllegalArgumentException("baseModelPackageName error : " + baseModelPackageName); - } - if (StrKit.isBlank(baseModelOutputDir)) { - throw new IllegalArgumentException("baseModelOutputDir can not be blank."); - } - - this.baseModelPackageName = baseModelPackageName; - this.baseModelOutputDir = baseModelOutputDir; - - initEngine(); - } - - protected void initEngine() { - engine = new Engine(); - engine.setToClassPathSourceFactory(); // 从 class path 内读模板文件 - engine.addSharedMethod(new StrKit()); - engine.addSharedObject("getterTypeMap", getterTypeMap); - engine.addSharedObject("javaKeyword", javaKeyword); - } - - /** - * 使用自定义模板生成 base model - */ - public void setTemplate(String template) { - this.template = template; - } - - public void setGenerateChainSetter(boolean generateChainSetter) { - this.generateChainSetter = generateChainSetter; - } - - public void generate(List tableMetas) { - System.out.println("Generate base model ..."); - System.out.println("Base Model Output Dir: " + baseModelOutputDir); - - for (TableMeta tableMeta : tableMetas) { - genBaseModelContent(tableMeta); - } - writeToFile(tableMetas); - } - - protected void genBaseModelContent(TableMeta tableMeta) { - Kv data = Kv.by("baseModelPackageName", baseModelPackageName); - data.set("generateChainSetter", generateChainSetter); - data.set("tableMeta", tableMeta); - data.set("nowtime", new Date()); - tableMeta.baseModelContent = engine.getTemplate(template).renderToString(data); - } - - protected void writeToFile(List tableMetas) { - try { - for (TableMeta tableMeta : tableMetas) { - writeToFile(tableMeta); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * base model 不覆盖 - */ - protected void writeToFile(TableMeta tableMeta) throws IOException { - File dir = new File(baseModelOutputDir); - if (!dir.exists()) { - dir.mkdirs(); - } - - String target = baseModelOutputDir + File.separator + tableMeta.baseModelName + ".java"; + protected Engine engine; + protected String template = "/generator/base_model_template.jf"; - File file = new File(target); - if (file.exists()) { - return ; // 若存在，不覆盖 - } + protected String baseModelPackageName; + protected String baseModelOutputDir; + protected boolean generateChainSetter = false; - OutputStreamWriter osw = null; - try { - osw = new OutputStreamWriter(new FileOutputStream(target), "UTF-8"); - osw.write(tableMeta.baseModelContent); - } - finally { - if (osw != null) { - osw.close(); - } - } - } - - public String getBaseModelPackageName() { - return baseModelPackageName; - } - - public String getBaseModelOutputDir() { - return baseModelOutputDir; - } + protected JavaKeyword javaKeyword = JavaKeyword.me; + + /** + * 针对 Model 中七种可以自动转换类型的 getter 方法，调用其具有确定类型返回值的 getter 方法 + * 享用自动类型转换的便利性，例如 getInt(String)、getStr(String) + * 其它方法使用泛型返回值方法： get(String) + * 注意：jfinal 3.2 及以上版本 Model 中的六种 getter 方法才具有类型转换功能 + */ + @SuppressWarnings("serial") + protected Map getterTypeMap = new HashMap() {{ + put("java.lang.String", "getStr"); + put("java.lang.Integer", "getInt"); + put("java.lang.Long", "getLong"); + put("java.lang.Double", "getDouble"); + put("java.lang.Float", "getFloat"); + put("java.lang.Short", "getShort"); + put("java.lang.Byte", "getByte"); + }}; + + public BaseModelGenerator(String baseModelPackageName, String baseModelOutputDir) { + if (StrKit.isBlank(baseModelPackageName)) { + throw new IllegalArgumentException("baseModelPackageName can not be blank."); + } + if (baseModelPackageName.contains("/") || baseModelPackageName.contains("\\")) { + throw new IllegalArgumentException("baseModelPackageName error : " + baseModelPackageName); + } + if (StrKit.isBlank(baseModelOutputDir)) { + throw new IllegalArgumentException("baseModelOutputDir can not be blank."); + } + + this.baseModelPackageName = baseModelPackageName; + this.baseModelOutputDir = baseModelOutputDir; + + initEngine(); + } + + protected void initEngine() { + engine = new Engine(); + engine.setToClassPathSourceFactory(); // 从 class path 内读模板文件 + engine.addSharedMethod(new StrKit()); + engine.addSharedObject("getterTypeMap", getterTypeMap); + engine.addSharedObject("javaKeyword", javaKeyword); + } + + /** + * 使用自定义模板生成 base model + */ + public void setTemplate(String template) { + this.template = template; + } + + public void setGenerateChainSetter(boolean generateChainSetter) { + this.generateChainSetter = generateChainSetter; + } + + public void generate(List tableMetas) { + System.out.println("Generate base model ..."); + System.out.println("Base Model Output Dir: " + baseModelOutputDir); + + for (TableMeta tableMeta : tableMetas) { + genBaseModelContent(tableMeta); + } + writeToFile(tableMetas); + } + + protected void genBaseModelContent(TableMeta tableMeta) { + Kv data = Kv.by("baseModelPackageName", baseModelPackageName); + data.set("generateChainSetter", generateChainSetter); + data.set("tableMeta", tableMeta); + data.set("nowtime", new Date()); + + tableMeta.baseModelContent = engine.getTemplate(template).renderToString(data); + } + + protected void writeToFile(List tableMetas) { + try { + for (TableMeta tableMeta : tableMetas) { + writeToFile(tableMeta); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * base model 不覆盖 + */ + protected void writeToFile(TableMeta tableMeta) throws IOException { + File dir = new File(baseModelOutputDir); + if (!dir.exists()) { + dir.mkdirs(); + } + + String target = baseModelOutputDir + File.separator + tableMeta.baseModelName + ".java"; + + File file = new File(target); + if (file.exists()) { + return; // 若存在，不覆盖 + } + + OutputStreamWriter osw = null; + try { + osw = new OutputStreamWriter(new FileOutputStream(target), "UTF-8"); + osw.write(tableMeta.baseModelContent); + } finally { + if (osw != null) { + osw.close(); + } + } + } + + public String getBaseModelPackageName() { + return baseModelPackageName; + } + + public String getBaseModelOutputDir() { + return baseModelOutputDir; + } } diff --git a/ssjygl-xsx-common/src/main/java/generator/ColumnMeta.java b/ssjygl-xsx-common/src/main/java/generator/ColumnMeta.java index 2ac62dc..429a513 100644 --- a/ssjygl-xsx-common/src/main/java/generator/ColumnMeta.java +++ b/ssjygl-xsx-common/src/main/java/generator/ColumnMeta.java @@ -1,12 +1,12 @@ /** * Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com). - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,32 +23,32 @@ import java.io.Serializable; */ @SuppressWarnings("serial") public class ColumnMeta implements Serializable { - - public String name; // 字段名 - public String javaType; // 字段对应的 java 类型 - public String shortJavaType; // 字段对应的 java 类型 - public String attrName; // 字段对应的属性名 - // --------- - - /* - -----------+---------+------+-----+---------+---------------- - Field | Type | Null | Key | Default | Remarks - -----------+---------+------+-----+---------+---------------- - id | int(11) | NO | PRI | NULL | remarks here - */ - public String type; // 字段类型(附带字段长度与小数点)，例如：decimal(11,2) - public String isNullable; // 是否允许空值 - public String isPrimaryKey; // 是否主键 - public String defaultValue; // 默认值 - public String remarks; // 字段备注 + public String name; // 字段名 + public String javaType; // 字段对应的 java 类型 + public String shortJavaType; // 字段对应的 java 类型 + public String attrName; // 字段对应的属性名 - public long columnSize; // 字段总长度 - public int decimalDigits; // 字段小数位长度 - public Object min; // 最小值 // 最小长度 - public Object max; // 最大值 // 最大长度 - public String descstr; // 描述字符串 + // --------- - public String validate; // 验证字符串 + /* + -----------+---------+------+-----+---------+---------------- + Field | Type | Null | Key | Default | Remarks + -----------+---------+------+-----+---------+---------------- + id | int(11) | NO | PRI | NULL | remarks here + */ + public String type; // 字段类型(附带字段长度与小数点)，例如：decimal(11,2) + public String isNullable; // 是否允许空值 + public String isPrimaryKey; // 是否主键 + public String defaultValue; // 默认值 + public String remarks; // 字段备注 + + public long columnSize; // 字段总长度 + public int decimalDigits; // 字段小数位长度 + public Object min; // 最小值 // 最小长度 + public Object max; // 最大值 // 最大长度 + public String descstr; // 描述字符串 + + public String validate; // 验证字符串 } diff --git a/ssjygl-xsx-common/src/main/java/generator/CrudGenerator.java b/ssjygl-xsx-common/src/main/java/generator/CrudGenerator.java index 99ad1aa..b79af4f 100644 --- a/ssjygl-xsx-common/src/main/java/generator/CrudGenerator.java +++ b/ssjygl-xsx-common/src/main/java/generator/CrudGenerator.java @@ -38,9 +38,9 @@ public class CrudGenerator { } this.modelPackageName = modelPackageName; - this.outputDir = outputDir; - this.packageName = packageName; - this.suffix = suffix; + this.outputDir = outputDir; + this.packageName = packageName; + this.suffix = suffix; this.template = "/generator/" + this.suffix.toLowerCase() + "_template.jf"; @@ -52,6 +52,7 @@ public class CrudGenerator { engine.setToClassPathSourceFactory(); engine.addSharedMethod(new StrKit()); } + /** * 使用自定义模板生成 model */ @@ -71,7 +72,6 @@ public class CrudGenerator { } - protected void genModelContent(TableMeta tableMeta) { Kv data = Kv.by("modelPackageName", modelPackageName); data.set("packageName", packageName); @@ -107,19 +107,18 @@ public class CrudGenerator { dir.mkdirs(); } - String target = outputDir + File.separator + tableMeta.modelName.toLowerCase() + File.separator + tableMeta.modelName + this.suffix + ".java"; + String target = outputDir + File.separator + tableMeta.modelName.toLowerCase() + File.separator + tableMeta.modelName + this.suffix + ".java"; File file = new File(target); if (file.exists()) { - return ; // 若存在，不覆盖 + return; // 若存在，不覆盖 } OutputStreamWriter osw = null; try { osw = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); osw.write(tableMeta.modelContent); - } - finally { + } finally { if (osw != null) { osw.close(); } diff --git a/ssjygl-xsx-common/src/main/java/generator/DataDictionaryGenerator.java b/ssjygl-xsx-common/src/main/java/generator/DataDictionaryGenerator.java index 5a20252..e69f4a4 100644 --- a/ssjygl-xsx-common/src/main/java/generator/DataDictionaryGenerator.java +++ b/ssjygl-xsx-common/src/main/java/generator/DataDictionaryGenerator.java @@ -1,12 +1,12 @@ /** * Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com). - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,98 +32,98 @@ import java.util.List; */ public class DataDictionaryGenerator { - protected String dataDictionaryOutputDir; - protected String dataDictionaryFileName = "DataDictionary.docx"; + protected String dataDictionaryOutputDir; + protected String dataDictionaryFileName = "DataDictionary.docx"; - public DataDictionaryGenerator(String dataDictionaryOutputDir) { - this.dataDictionaryOutputDir = dataDictionaryOutputDir; - } - - public void setDataDictionaryOutputDir(String dataDictionaryOutputDir) { - if (StrKit.notBlank(dataDictionaryOutputDir)) { - this.dataDictionaryOutputDir = dataDictionaryOutputDir; - } - } - - public String getDataDictionaryOutputDir() { - return dataDictionaryOutputDir; - } - - public void setDataDictionaryFileName(String dataDictionaryFileName) { - if (StrKit.notBlank(dataDictionaryFileName)) { - this.dataDictionaryFileName = dataDictionaryFileName; - } - } - - public String getDataDictionaryFileName() { - return dataDictionaryFileName; - } - - public void generate(List tableMetas) { - System.out.println("Generate DataDictionary file ..."); - System.out.println("Data Dictionary Output Dir: " + dataDictionaryOutputDir); + public DataDictionaryGenerator(String dataDictionaryOutputDir) { + this.dataDictionaryOutputDir = dataDictionaryOutputDir; + } - XWPFDocument doc = new XWPFDocument(); - addCustomHeadingStyle(doc, "标题 1", 1); + public void setDataDictionaryOutputDir(String dataDictionaryOutputDir) { + if (StrKit.notBlank(dataDictionaryOutputDir)) { + this.dataDictionaryOutputDir = dataDictionaryOutputDir; + } + } - for(int i=0; i tableMetas) { + System.out.println("Generate DataDictionary file ..."); + System.out.println("Data Dictionary Output Dir: " + dataDictionaryOutputDir); + + XWPFDocument doc = new XWPFDocument(); + addCustomHeadingStyle(doc, "标题 1", 1); + + for (int i = 0; i < tableMetas.size(); i++) { + TableMeta tableMeta = tableMetas.get(i); + XWPFParagraph paragraph = doc.createParagraph(); + paragraph.setStyle("标题 1"); + XWPFRun run = paragraph.createRun(); + run.setText((i + 1) + "." + tableMeta.remarks); + + paragraph = doc.createParagraph(); + run = paragraph.createRun(); + run.setText("表名：" + tableMeta.name); + + genTableHead(doc, tableMeta.columnMetas); + } + + writeToFile(doc); + } - /** - * 增加自定义标题样式。这里用的是stackoverflow的源码 - * - * @param docxDocument 目标文档 - * @param strStyleId 样式名称 - * @param headingLevel 样式级别 - */ - private static void addCustomHeadingStyle(XWPFDocument docxDocument, String strStyleId, int headingLevel) { - CTStyle ctStyle = CTStyle.Factory.newInstance(); - ctStyle.setStyleId(strStyleId); + /** + * 增加自定义标题样式。这里用的是stackoverflow的源码 + * + * @param docxDocument 目标文档 + * @param strStyleId 样式名称 + * @param headingLevel 样式级别 + */ + private static void addCustomHeadingStyle(XWPFDocument docxDocument, String strStyleId, int headingLevel) { + CTStyle ctStyle = CTStyle.Factory.newInstance(); + ctStyle.setStyleId(strStyleId); - CTString styleName = CTString.Factory.newInstance(); - styleName.setVal(strStyleId); - ctStyle.setName(styleName); + CTString styleName = CTString.Factory.newInstance(); + styleName.setVal(strStyleId); + ctStyle.setName(styleName); - CTDecimalNumber indentNumber = CTDecimalNumber.Factory.newInstance(); - indentNumber.setVal(BigInteger.valueOf(headingLevel)); + CTDecimalNumber indentNumber = CTDecimalNumber.Factory.newInstance(); + indentNumber.setVal(BigInteger.valueOf(headingLevel)); - // lower number > style is more prominent in the formats bar - ctStyle.setUiPriority(indentNumber); + // lower number > style is more prominent in the formats bar + ctStyle.setUiPriority(indentNumber); - CTOnOff onoffnull = CTOnOff.Factory.newInstance(); - ctStyle.setUnhideWhenUsed(onoffnull); + CTOnOff onoffnull = CTOnOff.Factory.newInstance(); + ctStyle.setUnhideWhenUsed(onoffnull); - // style shows up in the formats bar - ctStyle.setQFormat(onoffnull); + // style shows up in the formats bar + ctStyle.setQFormat(onoffnull); - // style defines a heading of the given level - CTPPr ppr = CTPPr.Factory.newInstance(); - ppr.setOutlineLvl(indentNumber); - ctStyle.setPPr(ppr); + // style defines a heading of the given level + CTPPr ppr = CTPPr.Factory.newInstance(); + ppr.setOutlineLvl(indentNumber); + ctStyle.setPPr(ppr); - XWPFStyle style = new XWPFStyle(ctStyle); + XWPFStyle style = new XWPFStyle(ctStyle); - // is a null op if already defined - XWPFStyles styles = docxDocument.createStyles(); + // is a null op if already defined + XWPFStyles styles = docxDocument.createStyles(); - style.setType(STStyleType.PARAGRAPH); - styles.addStyle(style); - } + style.setType(STStyleType.PARAGRAPH); + styles.addStyle(style); + } /* @@ -133,70 +133,71 @@ public class DataDictionaryGenerator { id | int(11) | NO | PRI | NULL | remarks here */ - protected void genTableHead(XWPFDocument doc, List cms){ - XWPFTable table = doc.createTable(cms.size() + 1, 6); + protected void genTableHead(XWPFDocument doc, List cms) { + XWPFTable table = doc.createTable(cms.size() + 1, 6); - // 表头 - XWPFTableRow row = table.getRow(0); - setCell(row, 0, "字段"); - setCell(row, 1, "类型"); - setCell(row, 2, "是否可为空"); - setCell(row, 3, "是否主键"); - setCell(row, 4, "默认值"); - setCell(row, 5, "描述"); + // 表头 + XWPFTableRow row = table.getRow(0); + setCell(row, 0, "字段"); + setCell(row, 1, "类型"); + setCell(row, 2, "是否可为空"); + setCell(row, 3, "是否主键"); + setCell(row, 4, "默认值"); + setCell(row, 5, "描述"); - for(int i=0; i * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -33,257 +33,257 @@ import java.util.List; * 6：生成模板文字属性全部为 protected 可见性，方便自定义 Generator 生成符合。。。。 */ public class Generator { - - protected Dialect dialect = null; - protected MetaBuilder metaBuilder; - protected BaseModelGenerator baseModelGenerator; - protected ModelGenerator modelGenerator; - protected MappingKitGenerator mappingKitGenerator; - protected DataDictionaryGenerator dataDictionaryGenerator; - protected boolean generateDataDictionary = false; - /** - * 构造 Generator，生成 BaseModel、Model、MappingKit 三类文件，其中 MappingKit 输出目录与包名与 Model相同 - * @param dataSource 数据源 - * @param baseModelPackageName base model 包名 - * @param baseModelOutputDir base mode 输出目录 - * @param modelPackageName model 包名 - * @param modelOutputDir model 输出目录 - */ - public Generator(DataSource dataSource, String baseModelPackageName, String baseModelOutputDir, String modelPackageName, String modelOutputDir) { - this(dataSource, new BaseModelGenerator(baseModelPackageName, baseModelOutputDir), new ModelGenerator(modelPackageName, baseModelPackageName, modelOutputDir)); - } + protected Dialect dialect = null; + protected MetaBuilder metaBuilder; + protected BaseModelGenerator baseModelGenerator; + protected ModelGenerator modelGenerator; + protected MappingKitGenerator mappingKitGenerator; + protected DataDictionaryGenerator dataDictionaryGenerator; + protected boolean generateDataDictionary = false; - /** - * 构造 Generator，只生成 baseModel - * @param dataSource 数据源 - * @param baseModelPackageName base model 包名 - * @param baseModelOutputDir base mode 输出目录 - */ - public Generator(DataSource dataSource, String baseModelPackageName, String baseModelOutputDir) { - this(dataSource, new BaseModelGenerator(baseModelPackageName, baseModelOutputDir)); - } + /** + * 构造 Generator，生成 BaseModel、Model、MappingKit 三类文件，其中 MappingKit 输出目录与包名与 Model相同 + * @param dataSource 数据源 + * @param baseModelPackageName base model 包名 + * @param baseModelOutputDir base mode 输出目录 + * @param modelPackageName model 包名 + * @param modelOutputDir model 输出目录 + */ + public Generator(DataSource dataSource, String baseModelPackageName, String baseModelOutputDir, String modelPackageName, String modelOutputDir) { + this(dataSource, new BaseModelGenerator(baseModelPackageName, baseModelOutputDir), new ModelGenerator(modelPackageName, baseModelPackageName, modelOutputDir)); + } - public Generator(DataSource dataSource, BaseModelGenerator baseModelGenerator) { - if (dataSource == null) { - throw new IllegalArgumentException("dataSource can not be null."); - } - if (baseModelGenerator == null) { - throw new IllegalArgumentException("baseModelGenerator can not be null."); - } + /** + * 构造 Generator，只生成 baseModel + * @param dataSource 数据源 + * @param baseModelPackageName base model 包名 + * @param baseModelOutputDir base mode 输出目录 + */ + public Generator(DataSource dataSource, String baseModelPackageName, String baseModelOutputDir) { + this(dataSource, new BaseModelGenerator(baseModelPackageName, baseModelOutputDir)); + } - this.metaBuilder = new MetaBuilder(dataSource); - this.baseModelGenerator = baseModelGenerator; - this.modelGenerator = null; - this.mappingKitGenerator = null; - this.dataDictionaryGenerator = null; - } + public Generator(DataSource dataSource, BaseModelGenerator baseModelGenerator) { + if (dataSource == null) { + throw new IllegalArgumentException("dataSource can not be null."); + } + if (baseModelGenerator == null) { + throw new IllegalArgumentException("baseModelGenerator can not be null."); + } - /** - * 使用指定 BaseModelGenerator、ModelGenerator 构造 Generator - * 生成 BaseModel、Model、MappingKit 三类文件，其中 MappingKit 输出目录与包名与 Model相同 - */ - public Generator(DataSource dataSource, BaseModelGenerator baseModelGenerator, ModelGenerator modelGenerator) { - if (dataSource == null) { - throw new IllegalArgumentException("dataSource can not be null."); - } - if (baseModelGenerator == null) { - throw new IllegalArgumentException("baseModelGenerator can not be null."); - } - if (modelGenerator == null) { - throw new IllegalArgumentException("modelGenerator can not be null."); - } + this.metaBuilder = new MetaBuilder(dataSource); + this.baseModelGenerator = baseModelGenerator; + this.modelGenerator = null; + this.mappingKitGenerator = null; + this.dataDictionaryGenerator = null; + } - this.metaBuilder = new MetaBuilder(dataSource); - this.baseModelGenerator = baseModelGenerator; - this.modelGenerator = modelGenerator; - this.mappingKitGenerator = new MappingKitGenerator(modelGenerator.modelPackageName, modelGenerator.modelOutputDir); - this.dataDictionaryGenerator = new DataDictionaryGenerator(modelGenerator.modelOutputDir); - } - - /** - * 设置 MetaBuilder，便于扩展自定义 MetaBuilder - */ - public void setMetaBuilder(MetaBuilder metaBuilder) { - if (metaBuilder != null) { - this.metaBuilder = metaBuilder; - } - } - - public void setTypeMapping(TypeMapping typeMapping) { - this.metaBuilder.setTypeMapping(typeMapping); - } - - /** - * 设置 MappingKitGenerator，便于扩展自定义 MappingKitGenerator - */ - public void setMappingKitGenerator(MappingKitGenerator mappingKitGenerator) { - if (mappingKitGenerator != null) { - this.mappingKitGenerator = mappingKitGenerator; - } - } - - /** - * 设置 DataDictionaryGenerator，便于扩展自定义 DataDictionaryGenerator - */ - public void setDataDictionaryGenerator(DataDictionaryGenerator dataDictionaryGenerator) { - if (dataDictionaryGenerator != null) { - this.dataDictionaryGenerator = dataDictionaryGenerator; - } - } - - /** - * 设置数据库方言，默认为 MysqlDialect - */ - public void setDialect(Dialect dialect) { - this.dialect = dialect; - } - - /** - * 设置用于生成 BaseModel 的模板文件，模板引擎将在 class path 与 jar 包内寻找模板文件 - * - * 默认模板为："/com/jfinal/oss/activerecord/generator/base_model_template.jf" - */ - public void setBaseModelTemplate(String baseModelTemplate) { - baseModelGenerator.setTemplate(baseModelTemplate); - } - - /** - * 设置 BaseModel 是否生成链式 setter 方法 - */ - public void setGenerateChainSetter(boolean generateChainSetter) { - baseModelGenerator.setGenerateChainSetter(generateChainSetter); - } - - /** - * 设置需要被移除的表名前缀，仅用于生成 modelName 与 baseModelName - * 例如表名 "osc_account"，移除前缀 "osc_" 后变为 "account" - */ - public void setRemovedTableNamePrefixes(String... removedTableNamePrefixes) { - metaBuilder.setRemovedTableNamePrefixes(removedTableNamePrefixes); - } - - /** - * 添加不需要处理的数据表 - */ - public void addExcludedTable(String... excludedTables) { - metaBuilder.addExcludedTable(excludedTables); - } - - /** - * 设置用于生成 Model 的模板文件，模板引擎将在 class path 与 jar 包内寻找模板文件 - * - * 默认模板为："/com/jfinal/oss/activerecord/generator/model_template.jf" - */ - public void setModelTemplate(String modelTemplate) { - if (modelGenerator != null) { - modelGenerator.setTemplate(modelTemplate); - } - } - - /** - * 设置是否在 Model 中生成 dao 对象，默认生成 - */ - public void setGenerateDaoInModel(boolean generateDaoInModel) { - if (modelGenerator != null) { - modelGenerator.setGenerateDaoInModel(generateDaoInModel); - } - } - - /** - * 设置是否生成数据字典 Dictionary 文件，默认不生成 - */ - public void setGenerateDataDictionary(boolean generateDataDictionary) { - this.generateDataDictionary = generateDataDictionary; - } - - /** - * 设置用于生成 MappingKit 的模板文件，模板引擎将在 class path 与 jar 包内寻找模板文件 - * - * 默认模板为："/com/jfinal/oss/activerecord/generator/mapping_kit_template.jf" - */ - public void setMappingKitTemplate(String mappingKitTemplate) { - if (this.mappingKitGenerator != null) { - this.mappingKitGenerator.setTemplate(mappingKitTemplate); - } - } - - /** - * 设置 MappingKit 文件输出目录，默认与 modelOutputDir 相同， - * 在设置此变量的同时需要设置 mappingKitPackageName - */ - public void setMappingKitOutputDir(String mappingKitOutputDir) { - if (this.mappingKitGenerator != null) { - this.mappingKitGenerator.setMappingKitOutputDir(mappingKitOutputDir); - } - } - - /** - * 设置 MappingKit 文件包名，默认与 modelPackageName 相同， - * 在设置此变的同时需要设置 mappingKitOutputDir - */ - public void setMappingKitPackageName(String mappingKitPackageName) { - if (this.mappingKitGenerator != null) { - this.mappingKitGenerator.setMappingKitPackageName(mappingKitPackageName); - } - } - - /** - * 设置 MappingKit 类名，默认值为: "_MappingKit" - */ - public void setMappingKitClassName(String mappingKitClassName) { - if (this.mappingKitGenerator != null) { - this.mappingKitGenerator.setMappingKitClassName(mappingKitClassName); - } - } - - /** - * 设置数据字典 DataDictionary 文件输出目录，默认与 modelOutputDir 相同 - */ - public void setDataDictionaryOutputDir(String dataDictionaryOutputDir) { - if (this.dataDictionaryGenerator != null) { - this.dataDictionaryGenerator.setDataDictionaryOutputDir(dataDictionaryOutputDir); - } - } - - /** - * 设置数据字典 DataDictionary 文件输出目录，默认值为 "_DataDictionary.txt" - */ - public void setDataDictionaryFileName(String dataDictionaryFileName) { - if (dataDictionaryGenerator != null) { - dataDictionaryGenerator.setDataDictionaryFileName(dataDictionaryFileName); - } - } - - public void generate() { - if (dialect != null) { - metaBuilder.setDialect(dialect); - } - - long start = System.currentTimeMillis(); - List tableMetas = metaBuilder.build(); - if (tableMetas.size() == 0) { - System.out.println("TableMeta 数量为 0，不生成任何文件"); - return ; - } - - baseModelGenerator.generate(tableMetas); - - if (modelGenerator != null) { - modelGenerator.generate(tableMetas); - } - - if (mappingKitGenerator != null) { - mappingKitGenerator.generate(tableMetas); - } - - if (dataDictionaryGenerator != null && generateDataDictionary) { - dataDictionaryGenerator.generate(tableMetas); - } - - long usedTime = (System.currentTimeMillis() - start) / 1000; - System.out.println("Generate complete in " + usedTime + " seconds."); - } + /** + * 使用指定 BaseModelGenerator、ModelGenerator 构造 Generator + * 生成 BaseModel、Model、MappingKit 三类文件，其中 MappingKit 输出目录与包名与 Model相同 + */ + public Generator(DataSource dataSource, BaseModelGenerator baseModelGenerator, ModelGenerator modelGenerator) { + if (dataSource == null) { + throw new IllegalArgumentException("dataSource can not be null."); + } + if (baseModelGenerator == null) { + throw new IllegalArgumentException("baseModelGenerator can not be null."); + } + if (modelGenerator == null) { + throw new IllegalArgumentException("modelGenerator can not be null."); + } + + this.metaBuilder = new MetaBuilder(dataSource); + this.baseModelGenerator = baseModelGenerator; + this.modelGenerator = modelGenerator; + this.mappingKitGenerator = new MappingKitGenerator(modelGenerator.modelPackageName, modelGenerator.modelOutputDir); + this.dataDictionaryGenerator = new DataDictionaryGenerator(modelGenerator.modelOutputDir); + } + + /** + * 设置 MetaBuilder，便于扩展自定义 MetaBuilder + */ + public void setMetaBuilder(MetaBuilder metaBuilder) { + if (metaBuilder != null) { + this.metaBuilder = metaBuilder; + } + } + + public void setTypeMapping(TypeMapping typeMapping) { + this.metaBuilder.setTypeMapping(typeMapping); + } + + /** + * 设置 MappingKitGenerator，便于扩展自定义 MappingKitGenerator + */ + public void setMappingKitGenerator(MappingKitGenerator mappingKitGenerator) { + if (mappingKitGenerator != null) { + this.mappingKitGenerator = mappingKitGenerator; + } + } + + /** + * 设置 DataDictionaryGenerator，便于扩展自定义 DataDictionaryGenerator + */ + public void setDataDictionaryGenerator(DataDictionaryGenerator dataDictionaryGenerator) { + if (dataDictionaryGenerator != null) { + this.dataDictionaryGenerator = dataDictionaryGenerator; + } + } + + /** + * 设置数据库方言，默认为 MysqlDialect + */ + public void setDialect(Dialect dialect) { + this.dialect = dialect; + } + + /** + * 设置用于生成 BaseModel 的模板文件，模板引擎将在 class path 与 jar 包内寻找模板文件 + * + * 默认模板为："/com/jfinal/oss/activerecord/generator/base_model_template.jf" + */ + public void setBaseModelTemplate(String baseModelTemplate) { + baseModelGenerator.setTemplate(baseModelTemplate); + } + + /** + * 设置 BaseModel 是否生成链式 setter 方法 + */ + public void setGenerateChainSetter(boolean generateChainSetter) { + baseModelGenerator.setGenerateChainSetter(generateChainSetter); + } + + /** + * 设置需要被移除的表名前缀，仅用于生成 modelName 与 baseModelName + * 例如表名 "osc_account"，移除前缀 "osc_" 后变为 "account" + */ + public void setRemovedTableNamePrefixes(String... removedTableNamePrefixes) { + metaBuilder.setRemovedTableNamePrefixes(removedTableNamePrefixes); + } + + /** + * 添加不需要处理的数据表 + */ + public void addExcludedTable(String... excludedTables) { + metaBuilder.addExcludedTable(excludedTables); + } + + /** + * 设置用于生成 Model 的模板文件，模板引擎将在 class path 与 jar 包内寻找模板文件 + * + * 默认模板为："/com/jfinal/oss/activerecord/generator/model_template.jf" + */ + public void setModelTemplate(String modelTemplate) { + if (modelGenerator != null) { + modelGenerator.setTemplate(modelTemplate); + } + } + + /** + * 设置是否在 Model 中生成 dao 对象，默认生成 + */ + public void setGenerateDaoInModel(boolean generateDaoInModel) { + if (modelGenerator != null) { + modelGenerator.setGenerateDaoInModel(generateDaoInModel); + } + } + + /** + * 设置是否生成数据字典 Dictionary 文件，默认不生成 + */ + public void setGenerateDataDictionary(boolean generateDataDictionary) { + this.generateDataDictionary = generateDataDictionary; + } + + /** + * 设置用于生成 MappingKit 的模板文件，模板引擎将在 class path 与 jar 包内寻找模板文件 + * + * 默认模板为："/com/jfinal/oss/activerecord/generator/mapping_kit_template.jf" + */ + public void setMappingKitTemplate(String mappingKitTemplate) { + if (this.mappingKitGenerator != null) { + this.mappingKitGenerator.setTemplate(mappingKitTemplate); + } + } + + /** + * 设置 MappingKit 文件输出目录，默认与 modelOutputDir 相同， + * 在设置此变量的同时需要设置 mappingKitPackageName + */ + public void setMappingKitOutputDir(String mappingKitOutputDir) { + if (this.mappingKitGenerator != null) { + this.mappingKitGenerator.setMappingKitOutputDir(mappingKitOutputDir); + } + } + + /** + * 设置 MappingKit 文件包名，默认与 modelPackageName 相同， + * 在设置此变的同时需要设置 mappingKitOutputDir + */ + public void setMappingKitPackageName(String mappingKitPackageName) { + if (this.mappingKitGenerator != null) { + this.mappingKitGenerator.setMappingKitPackageName(mappingKitPackageName); + } + } + + /** + * 设置 MappingKit 类名，默认值为: "_MappingKit" + */ + public void setMappingKitClassName(String mappingKitClassName) { + if (this.mappingKitGenerator != null) { + this.mappingKitGenerator.setMappingKitClassName(mappingKitClassName); + } + } + + /** + * 设置数据字典 DataDictionary 文件输出目录，默认与 modelOutputDir 相同 + */ + public void setDataDictionaryOutputDir(String dataDictionaryOutputDir) { + if (this.dataDictionaryGenerator != null) { + this.dataDictionaryGenerator.setDataDictionaryOutputDir(dataDictionaryOutputDir); + } + } + + /** + * 设置数据字典 DataDictionary 文件输出目录，默认值为 "_DataDictionary.txt" + */ + public void setDataDictionaryFileName(String dataDictionaryFileName) { + if (dataDictionaryGenerator != null) { + dataDictionaryGenerator.setDataDictionaryFileName(dataDictionaryFileName); + } + } + + public void generate() { + if (dialect != null) { + metaBuilder.setDialect(dialect); + } + + long start = System.currentTimeMillis(); + List tableMetas = metaBuilder.build(); + if (tableMetas.size() == 0) { + System.out.println("TableMeta 数量为 0，不生成任何文件"); + return; + } + + baseModelGenerator.generate(tableMetas); + + if (modelGenerator != null) { + modelGenerator.generate(tableMetas); + } + + if (mappingKitGenerator != null) { + mappingKitGenerator.generate(tableMetas); + } + + if (dataDictionaryGenerator != null && generateDataDictionary) { + dataDictionaryGenerator.generate(tableMetas); + } + + long usedTime = (System.currentTimeMillis() - start) / 1000; + System.out.println("Generate complete in " + usedTime + " seconds."); + } } diff --git a/ssjygl-xsx-common/src/main/java/generator/MappingKitGenerator.java b/ssjygl-xsx-common/src/main/java/generator/MappingKitGenerator.java index 84ee302..004fb81 100644 --- a/ssjygl-xsx-common/src/main/java/generator/MappingKitGenerator.java +++ b/ssjygl-xsx-common/src/main/java/generator/MappingKitGenerator.java @@ -1,12 +1,12 @@ /** * Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com). - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,102 +32,103 @@ import java.util.List; * MappingKit 文件生成器 */ public class MappingKitGenerator { - - protected Engine engine; - protected String template = "/generator/mapping_kit_template.jf"; - - protected String mappingKitPackageName; - protected String mappingKitOutputDir; - protected String mappingKitClassName = "_MappingKit"; - - public MappingKitGenerator(String mappingKitPackageName, String mappingKitOutputDir) { - this.mappingKitPackageName = mappingKitPackageName; - this.mappingKitOutputDir = mappingKitOutputDir; - - initEngine(); - } - - protected void initEngine() { - engine = new Engine(); - engine.setToClassPathSourceFactory(); - engine.addSharedMethod(new StrKit()); - } - - /** - * 使用自定义模板生成 MappingKit - */ - public void setTemplate(String template) { - this.template = template; - } - - public void setMappingKitOutputDir(String mappingKitOutputDir) { - if (StrKit.notBlank(mappingKitOutputDir)) { - this.mappingKitOutputDir = mappingKitOutputDir; - } - } - - public String getMappingKitOutputDir() { - return mappingKitOutputDir; - } - - public void setMappingKitPackageName(String mappingKitPackageName) { - if (StrKit.notBlank(mappingKitPackageName)) { - this.mappingKitPackageName = mappingKitPackageName; - } - } - - public String getMappingKitPackageName() { - return mappingKitPackageName; - } - - public void setMappingKitClassName(String mappingKitClassName) { - if (StrKit.notBlank(mappingKitClassName)) { - this.mappingKitClassName = StrKit.firstCharToUpperCase(mappingKitClassName); - } - } - - public String getMappingKitClassName() { - return mappingKitClassName; - } - - public void generate(List tableMetas) { - System.out.println("Generate MappingKit file ..."); - System.out.println("MappingKit Output Dir: " + mappingKitOutputDir); - - Kv data = Kv.by("mappingKitPackageName", mappingKitPackageName); - data.set("mappingKitClassName", mappingKitClassName); - data.set("tableMetas", tableMetas); - data.set("nowtime", new Date()); - - String ret = engine.getTemplate(template).renderToString(data); - writeToFile(ret); - } - - /** - * _MappingKit.java 覆盖写入 - */ - protected void writeToFile(String ret) { - File dir = new File(mappingKitOutputDir); - if (!dir.exists()) { - dir.mkdirs(); - } - - String target = mappingKitOutputDir + File.separator + mappingKitClassName + ".java"; - OutputStreamWriter osw = null; - try { - osw = new OutputStreamWriter(new FileOutputStream(target), "UTF-8"); - osw.write(ret); - } - catch (IOException e) { - throw new RuntimeException(e); - } - finally { - if (osw != null) { - try {osw.close();} catch (IOException e) { - LogKit.error(e.getMessage(), e);} - } - } - } + + protected Engine engine; + protected String template = "/generator/mapping_kit_template.jf"; + + protected String mappingKitPackageName; + protected String mappingKitOutputDir; + protected String mappingKitClassName = "_MappingKit"; + + public MappingKitGenerator(String mappingKitPackageName, String mappingKitOutputDir) { + this.mappingKitPackageName = mappingKitPackageName; + this.mappingKitOutputDir = mappingKitOutputDir; + + initEngine(); + } + + protected void initEngine() { + engine = new Engine(); + engine.setToClassPathSourceFactory(); + engine.addSharedMethod(new StrKit()); + } + + /** + * 使用自定义模板生成 MappingKit + */ + public void setTemplate(String template) { + this.template = template; + } + + public void setMappingKitOutputDir(String mappingKitOutputDir) { + if (StrKit.notBlank(mappingKitOutputDir)) { + this.mappingKitOutputDir = mappingKitOutputDir; + } + } + + public String getMappingKitOutputDir() { + return mappingKitOutputDir; + } + + public void setMappingKitPackageName(String mappingKitPackageName) { + if (StrKit.notBlank(mappingKitPackageName)) { + this.mappingKitPackageName = mappingKitPackageName; + } + } + + public String getMappingKitPackageName() { + return mappingKitPackageName; + } + + public void setMappingKitClassName(String mappingKitClassName) { + if (StrKit.notBlank(mappingKitClassName)) { + this.mappingKitClassName = StrKit.firstCharToUpperCase(mappingKitClassName); + } + } + + public String getMappingKitClassName() { + return mappingKitClassName; + } + + public void generate(List tableMetas) { + System.out.println("Generate MappingKit file ..."); + System.out.println("MappingKit Output Dir: " + mappingKitOutputDir); + + Kv data = Kv.by("mappingKitPackageName", mappingKitPackageName); + data.set("mappingKitClassName", mappingKitClassName); + data.set("tableMetas", tableMetas); + data.set("nowtime", new Date()); + + String ret = engine.getTemplate(template).renderToString(data); + writeToFile(ret); + } + + /** + * _MappingKit.java 覆盖写入 + */ + protected void writeToFile(String ret) { + File dir = new File(mappingKitOutputDir); + if (!dir.exists()) { + dir.mkdirs(); + } + + String target = mappingKitOutputDir + File.separator + mappingKitClassName + ".java"; + OutputStreamWriter osw = null; + try { + osw = new OutputStreamWriter(new FileOutputStream(target), "UTF-8"); + osw.write(ret); + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + if (osw != null) { + try { + osw.close(); + } catch (IOException e) { + LogKit.error(e.getMessage(), e); + } + } + } + } } diff --git a/ssjygl-xsx-common/src/main/java/generator/MetaBuilder.java b/ssjygl-xsx-common/src/main/java/generator/MetaBuilder.java index b78b3c6..2c1e8c3 100644 --- a/ssjygl-xsx-common/src/main/java/generator/MetaBuilder.java +++ b/ssjygl-xsx-common/src/main/java/generator/MetaBuilder.java @@ -92,7 +92,7 @@ public class MetaBuilder { public List build() { System.out.println("Build TableMeta ..."); try { - conn = dataSource.getConnection(); + conn = dataSource.getConnection(); dbMeta = conn.getMetaData(); List ret = new ArrayList(); @@ -206,10 +206,10 @@ public class MetaBuilder { } TableMeta tableMeta = new TableMeta(); - tableMeta.name = tableName; + tableMeta.name = tableName; tableMeta.remarks = rs.getString("REMARKS"); - tableMeta.modelName = buildModelName(tableName); + tableMeta.modelName = buildModelName(tableName); tableMeta.baseModelName = buildBaseModelName(tableMeta.modelName); ret.add(tableMeta); } @@ -299,7 +299,7 @@ public class MetaBuilder { if (decimalDigits > 0) { columnMeta.type = columnMeta.type + "," + decimalDigits; } - columnMeta.type = columnMeta.type + ")"; + columnMeta.type = columnMeta.type + ")"; columnMeta.decimalDigits = decimalDigits; } @@ -385,24 +385,24 @@ public class MetaBuilder { columnMeta.shortJavaType = shortJavaType; if ("BigDecimal".equals(shortJavaType)) { - columnMeta.min = -Math.pow(10.0, columnSize + 1.0 - columnMeta.decimalDigits) + 1; - columnMeta.max = Math.pow(10.0, columnSize + 1.0 - columnMeta.decimalDigits) - 1; + columnMeta.min = -Math.pow(10.0, columnSize + 1.0 - columnMeta.decimalDigits) + 1; + columnMeta.max = Math.pow(10.0, columnSize + 1.0 - columnMeta.decimalDigits) - 1; columnMeta.descstr = "范围"; } else if ("Double".equals(shortJavaType)) { - columnMeta.min = -Math.pow(10.0, columnSize + 1.0 - columnMeta.decimalDigits) + 1.0; - columnMeta.max = Math.pow(10.0, columnSize + 1.0 - columnMeta.decimalDigits) - 1.0; + columnMeta.min = -Math.pow(10.0, columnSize + 1.0 - columnMeta.decimalDigits) + 1.0; + columnMeta.max = Math.pow(10.0, columnSize + 1.0 - columnMeta.decimalDigits) - 1.0; columnMeta.descstr = "范围"; } else if ("Long".equals(shortJavaType)) { - columnMeta.min = -Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).longValue(); - columnMeta.max = Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).longValue(); + columnMeta.min = -Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).longValue(); + columnMeta.max = Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).longValue(); columnMeta.descstr = "范围"; } else if ("Integer".equals(shortJavaType)) { - columnMeta.min = -Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).intValue(); - columnMeta.max = Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).intValue(); + columnMeta.min = -Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).intValue(); + columnMeta.max = Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).intValue(); columnMeta.descstr = "范围"; } else if ("Short".equals(shortJavaType)) { - columnMeta.min = -Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).shortValue(); - columnMeta.max = Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).shortValue(); + columnMeta.min = -Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).shortValue(); + columnMeta.max = Double.valueOf(Math.pow(10.0, columnSize + 1.0) - 1).shortValue(); columnMeta.descstr = "范围"; } else { columnMeta.shortJavaType = "String"; @@ -416,7 +416,7 @@ public class MetaBuilder { // mysql 4.0版本以下，varchar(50), 指的是50字节，如果存放utf8汉字时，只能存放16个（每个汉字3字节） // mysql 5.0版本以上，varchar(50), 指的是50字符，无论存放的是数字、字母还是UTF8汉字（每个汉字3字节），都可以存放50个。 - columnMeta.max = columnSize; + columnMeta.max = columnSize; columnMeta.descstr = "长度"; } diff --git a/ssjygl-xsx-common/src/main/java/generator/ModelGenerator.java b/ssjygl-xsx-common/src/main/java/generator/ModelGenerator.java index b2057ec..bdfbd32 100644 --- a/ssjygl-xsx-common/src/main/java/generator/ModelGenerator.java +++ b/ssjygl-xsx-common/src/main/java/generator/ModelGenerator.java @@ -1,12 +1,12 @@ /** * Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com). - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,126 +31,125 @@ import java.util.List; * Model 生成器 */ public class ModelGenerator { - - protected Engine engine; - protected String template = "/generator/model_template.jf"; - - protected String modelPackageName; - protected String baseModelPackageName; - protected String modelOutputDir; - protected boolean generateDaoInModel = false; - - public ModelGenerator(String modelPackageName, String baseModelPackageName, String modelOutputDir) { - if (StrKit.isBlank(modelPackageName)) { - throw new IllegalArgumentException("modelPackageName can not be blank."); - } - if (modelPackageName.contains("/") || modelPackageName.contains("\\")) { - throw new IllegalArgumentException("modelPackageName error : " + modelPackageName); - } - if (StrKit.isBlank(baseModelPackageName)) { - throw new IllegalArgumentException("baseModelPackageName can not be blank."); - } - if (baseModelPackageName.contains("/") || baseModelPackageName.contains("\\")) { - throw new IllegalArgumentException("baseModelPackageName error : " + baseModelPackageName); - } - if (StrKit.isBlank(modelOutputDir)) { - throw new IllegalArgumentException("modelOutputDir can not be blank."); - } - - this.modelPackageName = modelPackageName; - this.baseModelPackageName = baseModelPackageName; - this.modelOutputDir = modelOutputDir; - - initEngine(); - } - - protected void initEngine() { - engine = new Engine(); - engine.setToClassPathSourceFactory(); - engine.addSharedMethod(new StrKit()); - } - - /** - * 使用自定义模板生成 model - */ - public void setTemplate(String template) { - this.template = template; - } - - public void setGenerateDaoInModel(boolean generateDaoInModel) { - this.generateDaoInModel = generateDaoInModel; - } - - public void generate(List tableMetas) { - System.out.println("Generate model ..."); - System.out.println("Model Output Dir: " + modelOutputDir); - - for (TableMeta tableMeta : tableMetas) { - genModelContent(tableMeta); - } - writeToFile(tableMetas); - } - - protected void genModelContent(TableMeta tableMeta) { - Kv data = Kv.by("modelPackageName", modelPackageName); - data.set("baseModelPackageName", baseModelPackageName); - data.set("generateDaoInModel", generateDaoInModel); - data.set("tableMeta", tableMeta); - data.set("nowtime", new Date()); - - String ret = engine.getTemplate(template).renderToString(data); - tableMeta.modelContent = ret; - } - - protected void writeToFile(List tableMetas) { - try { - for (TableMeta tableMeta : tableMetas) { - writeToFile(tableMeta); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - /** - * 若 model 文件存在，则不生成，以免覆盖用户手写的代码 - */ - protected void writeToFile(TableMeta tableMeta) throws IOException { - File dir = new File(modelOutputDir); - if (!dir.exists()) { - dir.mkdirs(); - } - - String target = modelOutputDir + File.separator + tableMeta.modelName + ".java"; - - File file = new File(target); - if (file.exists()) { - return ; // 若 Model 存在，不覆盖 - } - - OutputStreamWriter osw = null; - try { - osw = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); - osw.write(tableMeta.modelContent); - } - finally { - if (osw != null) { - osw.close(); - } - } - } - - public String getModelPackageName() { - return modelPackageName; - } - - public String getBaseModelPackageName() { - return baseModelPackageName; - } - - public String getModelOutputDir() { - return modelOutputDir; - } + + protected Engine engine; + protected String template = "/generator/model_template.jf"; + + protected String modelPackageName; + protected String baseModelPackageName; + protected String modelOutputDir; + protected boolean generateDaoInModel = false; + + public ModelGenerator(String modelPackageName, String baseModelPackageName, String modelOutputDir) { + if (StrKit.isBlank(modelPackageName)) { + throw new IllegalArgumentException("modelPackageName can not be blank."); + } + if (modelPackageName.contains("/") || modelPackageName.contains("\\")) { + throw new IllegalArgumentException("modelPackageName error : " + modelPackageName); + } + if (StrKit.isBlank(baseModelPackageName)) { + throw new IllegalArgumentException("baseModelPackageName can not be blank."); + } + if (baseModelPackageName.contains("/") || baseModelPackageName.contains("\\")) { + throw new IllegalArgumentException("baseModelPackageName error : " + baseModelPackageName); + } + if (StrKit.isBlank(modelOutputDir)) { + throw new IllegalArgumentException("modelOutputDir can not be blank."); + } + + this.modelPackageName = modelPackageName; + this.baseModelPackageName = baseModelPackageName; + this.modelOutputDir = modelOutputDir; + + initEngine(); + } + + protected void initEngine() { + engine = new Engine(); + engine.setToClassPathSourceFactory(); + engine.addSharedMethod(new StrKit()); + } + + /** + * 使用自定义模板生成 model + */ + public void setTemplate(String template) { + this.template = template; + } + + public void setGenerateDaoInModel(boolean generateDaoInModel) { + this.generateDaoInModel = generateDaoInModel; + } + + public void generate(List tableMetas) { + System.out.println("Generate model ..."); + System.out.println("Model Output Dir: " + modelOutputDir); + + for (TableMeta tableMeta : tableMetas) { + genModelContent(tableMeta); + } + writeToFile(tableMetas); + } + + protected void genModelContent(TableMeta tableMeta) { + Kv data = Kv.by("modelPackageName", modelPackageName); + data.set("baseModelPackageName", baseModelPackageName); + data.set("generateDaoInModel", generateDaoInModel); + data.set("tableMeta", tableMeta); + data.set("nowtime", new Date()); + + String ret = engine.getTemplate(template).renderToString(data); + tableMeta.modelContent = ret; + } + + protected void writeToFile(List tableMetas) { + try { + for (TableMeta tableMeta : tableMetas) { + writeToFile(tableMeta); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 若 model 文件存在，则不生成，以免覆盖用户手写的代码 + */ + protected void writeToFile(TableMeta tableMeta) throws IOException { + File dir = new File(modelOutputDir); + if (!dir.exists()) { + dir.mkdirs(); + } + + String target = modelOutputDir + File.separator + tableMeta.modelName + ".java"; + + File file = new File(target); + if (file.exists()) { + return; // 若 Model 存在，不覆盖 + } + + OutputStreamWriter osw = null; + try { + osw = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); + osw.write(tableMeta.modelContent); + } finally { + if (osw != null) { + osw.close(); + } + } + } + + public String getModelPackageName() { + return modelPackageName; + } + + public String getBaseModelPackageName() { + return baseModelPackageName; + } + + public String getModelOutputDir() { + return modelOutputDir; + } } diff --git a/ssjygl-xsx-common/src/main/java/generator/TableMeta.java b/ssjygl-xsx-common/src/main/java/generator/TableMeta.java index 85369a2..23f1213 100644 --- a/ssjygl-xsx-common/src/main/java/generator/TableMeta.java +++ b/ssjygl-xsx-common/src/main/java/generator/TableMeta.java @@ -1,12 +1,12 @@ /** * Copyright (c) 2011-2019, James Zhan 詹波 (jfinal@126.com). - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,25 +25,25 @@ import java.util.List; */ @SuppressWarnings("serial") public class TableMeta implements Serializable { - - public String name; // 表名 - public String remarks; // 表备注 - public String primaryKey; // 主键，复合主键以逗号分隔 - public List columnMetas = new ArrayList(); // 字段 meta - - // --------- - - public String baseModelName; // 生成的 base model 名 - public String baseModelContent; // 生成的 base model 内容 - - public String modelName; // 生成的 model 名 - public String modelContent; // 生成的 model 内容 - - // --------- - - public int colNameMaxLen = "Field".length(); // 字段名最大宽度，用于辅助生成字典文件样式 - public int colTypeMaxLen = "Type".length(); // 字段类型最大宽度，用于辅助生成字典文件样式 - public int colDefaultValueMaxLen = "Default".length(); // 字段默认值最大宽度，用于辅助生成字典文件样式 + + public String name; // 表名 + public String remarks; // 表备注 + public String primaryKey; // 主键，复合主键以逗号分隔 + public List columnMetas = new ArrayList(); // 字段 meta + + // --------- + + public String baseModelName; // 生成的 base model 名 + public String baseModelContent; // 生成的 base model 内容 + + public String modelName; // 生成的 model 名 + public String modelContent; // 生成的 model 内容 + + // --------- + + public int colNameMaxLen = "Field".length(); // 字段名最大宽度，用于辅助生成字典文件样式 + public int colTypeMaxLen = "Type".length(); // 字段类型最大宽度，用于辅助生成字典文件样式 + public int colDefaultValueMaxLen = "Default".length(); // 字段默认值最大宽度，用于辅助生成字典文件样式 } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/authlicense/AuthLicenseSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/authlicense/AuthLicenseSyncService.java index 23b2965..f8ec1ac 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/authlicense/AuthLicenseSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/authlicense/AuthLicenseSyncService.java @@ -41,8 +41,8 @@ public class AuthLicenseSyncService extends BaseService { * 2.系统运行时，定时任务每天凌晨执行一次 */ public void update() { - List inserts = new ArrayList<>(); - SyncTask synctask = new SyncTask(); + List inserts = new ArrayList<>(); + SyncTask synctask = new SyncTask(); // 检查物流公司车辆 List vls = AuthLicense.dao.find("select t.license truck_license from truck t \n" + @@ -69,7 +69,7 @@ public class AuthLicenseSyncService extends BaseService { } if (!inserts.isEmpty()) { - for(AuthLicense authlic : inserts){ + for (AuthLicense authlic : inserts) { synctask.addSaveData(authlic); } @@ -112,8 +112,8 @@ public class AuthLicenseSyncService extends BaseService { public boolean run() { try { SyncTask synctask = new SyncTask(); - int size = 500; - int page = Math.round(cnt.floatValue() / size); + int size = 500; + int page = Math.round(cnt.floatValue() / size); for (int p = 0; p < page; p++) { int start = size * p; int end = p + 1; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java index 302f0a7..d773ca1 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistController.java @@ -26,7 +26,7 @@ public class BlacklistController extends BaseController { * 不存在 data = false */ @Before(BlacklistPKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { Blacklist model = getModel(Blacklist.class, "", true); // 忽略不在model中的字段 renderJson(BlacklistService.me.checkExistsByPk(model)); } @@ -35,7 +35,7 @@ public class BlacklistController extends BaseController { * 新增 blacklist 基础配置 - 车辆黑名单 */ @Before(BlacklistValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -50,9 +50,9 @@ public class BlacklistController extends BaseController { /** * 分页查找 blacklist 基础配置 - 车辆黑名单 */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - String truck_license = getUpperCaseVal("truck_license"); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + String truck_license = getUpperCaseVal("truck_license"); renderJson(Result.object(BlacklistService.me.find(pp, truck_license))); } @@ -60,7 +60,7 @@ public class BlacklistController extends BaseController { * 按主键查找单个对象 blacklist 基础配置 - 车辆黑名单 */ @Before(BlacklistPKValidator.class) - public void findByPk(){ + public void findByPk() { Blacklist model = getModel(Blacklist.class, "", true); // 忽略不在model中的字段 renderJson(BlacklistSyncService.me.findByPk(model)); } @@ -69,7 +69,7 @@ public class BlacklistController extends BaseController { * 按主键查找单个对象 blacklist 基础配置 - 车辆黑名单 */ @Before(BlacklistPKValidator.class) - public void get(){ + public void get() { Blacklist model = getModel(Blacklist.class, "", true); // 忽略不在model中的字段 renderJson(BlacklistSyncService.me.findByPk(model)); } @@ -77,13 +77,13 @@ public class BlacklistController extends BaseController { /** * 返回所有 blacklist 基础配置 - 车辆黑名单 */ - public void list(){ + public void list() { renderJson(Result.object(BlacklistService.me.list())); } @Before(BlacklistPKValidator.class) - public void remove(){ + public void remove() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java index 13de340..934ff2b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java @@ -23,7 +23,7 @@ public class BlacklistSyncService extends BaseSyncService { " where t.remove_user_id is null \n" + " and t.truck_license = ? ", model.getTruckLicense()); - if(oldmodel != null){ + if (oldmodel != null) { return Result.failed("【" + model.getTruckLicense() + "】还在黑名单中，未移除"); } @@ -83,6 +83,7 @@ public class BlacklistSyncService extends BaseSyncService { /** * 从黑名单中移除 * 标记为移除，记录不删除 + * * @param id * @param sysuser * @return diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/cache/CacheController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/cache/CacheController.java index df9d20b..a58d026 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/cache/CacheController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/cache/CacheController.java @@ -36,7 +36,7 @@ public class CacheController extends Controller { Record map = new Record(); for (Map.Entry entry : SvrCacheData.SUP_HEARTBEAT.entrySet()) { - Record c = entry.getValue(); + Record c = entry.getValue(); Record out = new Record(); out.set("version", c.get("version")); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java index 4d4a354..5d08478 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java @@ -139,7 +139,7 @@ public class CustomerSyncService extends BaseSyncService { // 将修改后的对象返回 String[] keys = model._getAttrNames(); for (String key : keys) { - if(model.get(key) != null){ + if (model.get(key) != null) { oldobj.set(key, model.get(key)); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java index 5bb67ec..d252367 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactController.java @@ -26,7 +26,7 @@ public class CustomerContactController extends Controller { * 不存在 data = false */ @Before(CustomerContactPKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { CustomerContact model = getModel(CustomerContact.class, "", true); // 忽略不在model中的字段 renderJson(CustomerContactService.me.checkExistsByPk(model)); } @@ -35,7 +35,7 @@ public class CustomerContactController extends Controller { * 新增 customer_contact 客户相关 - 客户联系人 */ @Before(CustomerContactValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -51,7 +51,7 @@ public class CustomerContactController extends Controller { * 删除 customer_contact 客户相关 - 客户联系人 */ @Before(CustomerContactPKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -67,7 +67,7 @@ public class CustomerContactController extends Controller { * 恢复 customer_contact 客户相关 - 客户联系人 */ @Before(CustomerContactPKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -83,7 +83,7 @@ public class CustomerContactController extends Controller { * 修改 customer_contact 客户相关 - 客户联系人 */ @Before(CustomerContactValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -98,12 +98,12 @@ public class CustomerContactController extends Controller { /** * 分页查找 customer_contact 客户相关 - 客户联系人 */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - Integer customer_id = getInt("customer_id"); - Integer del = getInt("del"); - String name = get("name"); - String phone = get("phone"); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + Integer customer_id = getInt("customer_id"); + Integer del = getInt("del"); + String name = get("name"); + String phone = get("phone"); renderJson(Result.object(CustomerContactService.me.find(pp, customer_id, name, phone, del))); } @@ -111,7 +111,7 @@ public class CustomerContactController extends Controller { * 按主键查找单个对象 customer_contact 客户相关 - 客户联系人 */ @Before(CustomerContactPKValidator.class) - public void findByPk(){ + public void findByPk() { CustomerContact model = getModel(CustomerContact.class, "", true); // 忽略不在model中的字段 renderJson(CustomerContactService.me.findByPk(model)); } @@ -120,7 +120,7 @@ public class CustomerContactController extends Controller { * 按主键查找单个对象 customer_contact 客户相关 - 客户联系人 */ @Before(CustomerContactPKValidator.class) - public void get(){ + public void get() { CustomerContact model = getModel(CustomerContact.class, "", true); // 忽略不在model中的字段 renderJson(CustomerContactService.me.findByPk(model)); } @@ -128,7 +128,7 @@ public class CustomerContactController extends Controller { /** * 返回所有 customer_contact 客户相关 - 客户联系人 */ - public void list(){ + public void list() { Integer customer_id = getInt("customer_id"); renderJson(Result.object(CustomerContactService.me.list(customer_id))); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactSyncService.java index e777460..95cdaab 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/contact/CustomerContactSyncService.java @@ -12,7 +12,7 @@ public class CustomerContactSyncService extends BaseSyncService { public Result save(CustomerContact model, Sysuser sysuser) { Customer customer = Customer.dao.findById(model.getCustomerId()); - if(customer == null){ + if (customer == null) { return Result.failed("未找到对应的客户信息"); } @@ -22,7 +22,7 @@ public class CustomerContactSyncService extends BaseSyncService { public Result update(CustomerContact model, Sysuser sysuser) { Customer customer = Customer.dao.findById(model.getCustomerId()); - if(customer == null){ + if (customer == null) { return Result.failed("未找到对应的客户信息"); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java index f99148e..4b1fefb 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverController.java @@ -129,10 +129,10 @@ public class CustomerReceiverController extends Controller { * 返回所有 customer_receiver 客户相关 - 客户收获地址 */ public void list() { - Integer customer_id = getInt("customer_id"); - String name = get("name"); - Integer supermarket_id = getInt("supermarket_id"); - String phone = get("phone"); + Integer customer_id = getInt("customer_id"); + String name = get("name"); + Integer supermarket_id = getInt("supermarket_id"); + String phone = get("phone"); renderJson(Result.object(CustomerReceiverService.me.list(customer_id, name, phone, supermarket_id))); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverSyncService.java index bfdc51c..dc60db4 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/receiver/CustomerReceiverSyncService.java @@ -12,7 +12,7 @@ public class CustomerReceiverSyncService extends BaseSyncService { public Result save(CustomerReceiver model, Sysuser sysuser) { Customer customer = Customer.dao.findById(model.getCustomerId()); - if(customer == null){ + if (customer == null) { return Result.failed("未找到对应的客户信息"); } @@ -22,7 +22,7 @@ public class CustomerReceiverSyncService extends BaseSyncService { public Result update(CustomerReceiver model, Sysuser sysuser) { Customer customer = Customer.dao.findById(model.getCustomerId()); - if(customer == null){ + if (customer == null) { return Result.failed("未找到对应的客户信息"); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterController.java index 257a9ef..e2508c3 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterController.java @@ -16,7 +16,7 @@ import com.jfinal.core.Controller; public class CustomerRegisterController extends Controller { @Before(CustomerRegisterVerifyValidator.class) - public void verify(){ + public void verify() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -24,8 +24,8 @@ public class CustomerRegisterController extends Controller { return; } - long id = getLong("id"); - int state = getInt("state"); + long id = getLong("id"); + int state = getInt("state"); String verify_memo = get("verify_memo"); renderJson(CustomerRegisterService.me.verify(id, state, verify_memo, tokenuser)); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterVerifyValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterVerifyValidator.java index 25f08d4..69b28a3 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterVerifyValidator.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterVerifyValidator.java @@ -15,10 +15,11 @@ import java.util.List; * PrimaryKey: id */ public class CustomerRegisterVerifyValidator extends CrudParamValidator { - private static List chkstate = new ArrayList(){{ + private static List chkstate = new ArrayList() {{ add(5); add(9); }}; + @Override protected void validate(Controller c) { validateRequired("id", "id", "id 必填"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java index be8f974..b954333 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverController.java @@ -26,7 +26,7 @@ public class DriverController extends Controller { * 不存在 data = false */ @Before(DriverPKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { Driver model = getModel(Driver.class, "", true); // 忽略不在model中的字段 renderJson(DriverService.me.checkExistsByPk(model)); } @@ -35,7 +35,7 @@ public class DriverController extends Controller { * 新增 driver 司机信息 */ @Before(DriverValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -51,7 +51,7 @@ public class DriverController extends Controller { * 删除 driver 司机信息 */ @Before(DriverPKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -67,7 +67,7 @@ public class DriverController extends Controller { * 恢复 driver 司机信息 */ @Before(DriverPKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -83,7 +83,7 @@ public class DriverController extends Controller { * 修改 driver 司机信息 */ @Before(DriverValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -98,8 +98,8 @@ public class DriverController extends Controller { /** * 分页查找 driver 司机信息 */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); String name = get("name"); String phone = get("name"); Integer trans_co_id = getInt("trans_co_id"); @@ -111,7 +111,7 @@ public class DriverController extends Controller { * 按主键查找单个对象 driver 司机信息 */ @Before(DriverPKValidator.class) - public void findByPk(){ + public void findByPk() { Driver model = getModel(Driver.class, "", true); // 忽略不在model中的字段 renderJson(DriverService.me.findByPk(model)); } @@ -120,7 +120,7 @@ public class DriverController extends Controller { * 按主键查找单个对象 driver 司机信息 */ @Before(DriverPKValidator.class) - public void get(){ + public void get() { Driver model = getModel(Driver.class, "", true); // 忽略不在model中的字段 renderJson(DriverService.me.findByPk(model)); } @@ -128,7 +128,7 @@ public class DriverController extends Controller { /** * 返回所有 driver 司机信息 */ - public void list(){ + public void list() { renderJson(Result.object(DriverService.me.list())); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverSyncService.java index ea99c58..ef4c080 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/driver/DriverSyncService.java @@ -13,7 +13,7 @@ public class DriverSyncService extends BaseSyncService { int trans_co_id = model.getTransCoId(); TransportCompany tco = TransportCompany.dao.findById(trans_co_id); - if(tco == null){ + if (tco == null) { return Result.failed("未找到对应物流公司信息"); } @@ -21,10 +21,10 @@ public class DriverSyncService extends BaseSyncService { } public Result update(Driver model, Sysuser sysuser) { - int trans_co_id = model.getTransCoId(); - TransportCompany tco = TransportCompany.dao.findById(trans_co_id); + int trans_co_id = model.getTransCoId(); + TransportCompany tco = TransportCompany.dao.findById(trans_co_id); - if(tco == null){ + if (tco == null) { return Result.failed("未找到对应物流公司信息"); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/BatchSaveValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/BatchSaveValidator.java index 8ba6f24..54cf460 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/BatchSaveValidator.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/BatchSaveValidator.java @@ -4,7 +4,7 @@ import com.cowr.common.validator.CrudParamValidator; import com.cowr.common.view.Result; import com.jfinal.core.Controller; -public class BatchSaveValidator extends CrudParamValidator { +public class BatchSaveValidator extends CrudParamValidator { @Override protected void validate(Controller c) { validateRequired("invoice_number", "invoice_number", "invoice_number 必填"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java index bdeb04e..17b4686 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java @@ -66,8 +66,8 @@ public class CheckUndonOrderclusterJob implements Job { } // 各个超市分开同步 - for(Map.Entry entry : syncmap.entrySet()){ - if(!SyncTaskService.me.save(entry.getValue(), entry.getKey())){ + for (Map.Entry entry : syncmap.entrySet()) { + if (!SyncTaskService.me.save(entry.getValue(), entry.getKey())) { return false; } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/SyncJob.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/SyncJob.java index c5e1825..deb36c4 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/SyncJob.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/SyncJob.java @@ -9,17 +9,18 @@ import org.quartz.JobExecutionException; public class SyncJob implements Job { private static Log log = Log.getLog(SyncJob.class); + @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { try { SyncTaskService.me.task(); - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage(), e); } try { SmsService.me.checkSendStatus(); - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage(), e); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java index 891af02..00bd121 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java @@ -253,7 +253,7 @@ public class Config extends JFinalConfig { // 让 druid 允许在 sql 中使用 union // https://github.com/alibaba/druid/wiki/%E9%85%8D%E7%BD%AE-wallfilter wallFilter.getConfig().setSelectUnionCheck(false); - if("dev".equals(ENV)){ + if ("dev".equals(ENV)) { me.add(new DruidStatViewHandler("/druid")); } me.add(new GlobalHandler()); @@ -286,7 +286,7 @@ public class Config extends JFinalConfig { } } - public static boolean isDev(){ + public static boolean isDev() { return "dev".equals(ENV); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java index 23fdfde..c2d9be7 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java @@ -91,7 +91,7 @@ public class OrderclusterTruckSyncService extends BaseSyncService { retts.add(bl.get("truck_license")); } - return Result.failedstr( "%s 已在[%s]分配", StrKit.join(retts, ","), DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime())); + return Result.failedstr("%s 已在[%s]分配", StrKit.join(retts, ","), DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime())); } // 查询已有的集团订单 @@ -99,16 +99,16 @@ public class OrderclusterTruckSyncService extends BaseSyncService { "select * from ordercluster_truck \n" + " where ordercluster_id = ? \n", ordercluster_id); - List dellist = new ArrayList<>(); - List chkold = new ArrayList<>(); - SyncTask synctask = new SyncTask(); + List dellist = new ArrayList<>(); + List chkold = new ArrayList<>(); + SyncTask synctask = new SyncTask(); // 数据库中，提交上的数据中没有的，要删掉 for (OrderclusterTruck ot : otlist) { - if(!chk.contains(ot.getTruckLicense())){ + if (!chk.contains(ot.getTruckLicense())) { dellist.add(ot.getTruckLicense()); synctask.addDeleteData(ot); - }else{ + } else { chkold.add(ot.getTruckLicense()); } } @@ -117,7 +117,7 @@ public class OrderclusterTruckSyncService extends BaseSyncService { for (String truck_license : truckarr) { // 已经在数据库中的，不再重复添加 - if(chkold.contains(truck_license)){ + if (chkold.contains(truck_license)) { continue; } @@ -130,7 +130,7 @@ public class OrderclusterTruckSyncService extends BaseSyncService { savelist.add(oct); } - if(savelist.isEmpty() && dellist.isEmpty()){ + if (savelist.isEmpty() && dellist.isEmpty()) { return Result.failed("trucks 参数错误"); } @@ -153,7 +153,7 @@ public class OrderclusterTruckSyncService extends BaseSyncService { log.debug("删除 ordercluster_truck %d", delret); } - if(!savelist.isEmpty()) { + if (!savelist.isEmpty()) { int[] ret = Db.batchSave(savelist, savelist.size()); for (int i : ret) { diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java index 94a1e40..436646d 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordersale/OrderSaleController.java @@ -12,7 +12,7 @@ import com.jfinal.aop.Before; public class OrderSaleController extends BaseController { @Before(OrderSalePKValidator.class) - public void get(){ + public void get() { renderJson(Result.object(OrderSaleService.me.get(get("sn")))); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java index a44602b..176baf4 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempController.java @@ -62,19 +62,19 @@ public class OrderTempController extends BaseController { @Before(StartAndEndIntervalValidator.class) public void export() { - String stm = get("stm"); - String etm = get("etm"); - String truck_license = getUpperCaseVal("truck_license"); - String customer_name = get("customer_name"); - String sn = get("sn"); - Integer state = getInt("state"); - Integer product_id = getInt("product_id"); - Integer supermarket_id = getInt("supermarket_id"); - Integer isprepaid = getInt("isprepaid"); - String invoice_code = get("invoice_code"); - Integer invoice_type = getInt("invoice_type"); - Integer customer_id = getInt("customer_id"); - Boolean invoice_code_is_null = getBoolean("invoice_code_is_null"); + String stm = get("stm"); + String etm = get("etm"); + String truck_license = getUpperCaseVal("truck_license"); + String customer_name = get("customer_name"); + String sn = get("sn"); + Integer state = getInt("state"); + Integer product_id = getInt("product_id"); + Integer supermarket_id = getInt("supermarket_id"); + Integer isprepaid = getInt("isprepaid"); + String invoice_code = get("invoice_code"); + Integer invoice_type = getInt("invoice_type"); + Integer customer_id = getInt("customer_id"); + Boolean invoice_code_is_null = getBoolean("invoice_code_is_null"); Workbook wb = OrderTempService.me.export(sn, truck_license, supermarket_id, customer_id, customer_name, stm, etm, isprepaid, state, invoice_code, invoice_type, product_id, invoice_code_is_null); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java index 92b6b0b..c71a70e 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertransfer/OrderTransferController.java @@ -12,7 +12,7 @@ public class OrderTransferController extends BaseController { private static Log log = Log.getLog(OrderTransferController.class); @Before(OrderTransferPKValidator.class) - public void get(){ + public void get() { renderJson(Result.object(OrderTransferService.me.get(get("sn")))); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java index b221125..0072f89 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertrash/OrderTrashController.java @@ -12,7 +12,7 @@ public class OrderTrashController extends BaseController { private static Log log = Log.getLog(OrderTrashController.class); @Before(OrderTrashPKValidator.class) - public void get(){ + public void get() { renderJson(Result.object(OrderTrashService.me.get(get("sn")))); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java index a0473e2..5597dcf 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java @@ -5,7 +5,7 @@ import com.cowr.ssjygl.overall.OverallService; import com.jfinal.core.Controller; public class OverallController extends Controller { - public void stat(){ + public void stat() { renderJson(Result.success(OverallService.me.stat(null))); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java index e6ea106..642b1ad 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailController.java @@ -31,7 +31,7 @@ public class PrepayDetailController extends Controller { * 不存在 data = false */ @Before(PrepayDetailPKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { PrepayDetail model = getModel(PrepayDetail.class, "", true); // 忽略不在model中的字段 renderJson(PrepayDetailService.me.checkExistsByPk(model)); } @@ -40,7 +40,7 @@ public class PrepayDetailController extends Controller { * 新增 prepay_detail 预付费客户付费详情 */ @Before(PrepayDetailValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -56,7 +56,7 @@ public class PrepayDetailController extends Controller { * 删除 prepay_detail 预付费客户付费详情 */ @Before(PrepayDetailPKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -72,7 +72,7 @@ public class PrepayDetailController extends Controller { * 恢复 prepay_detail 预付费客户付费详情 */ @Before(PrepayDetailPKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -88,7 +88,7 @@ public class PrepayDetailController extends Controller { * 修改 prepay_detail 预付费客户付费详情 */ @Before(PrepayDetailValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -103,9 +103,9 @@ public class PrepayDetailController extends Controller { /** * 分页查找 prepay_detail 预付费客户付费详情 */ - public void find(){ + public void find() { Integer customer_id = getInt("customer_id"); - Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); // 是客户账户 if (tokenuser == null) { @@ -115,9 +115,9 @@ public class PrepayDetailController extends Controller { customer_id = tokenuser.getEntityId(); } - String name = get("name"); - String stm = get("stm"); - String etm = get("etm"); + String name = get("name"); + String stm = get("stm"); + String etm = get("etm"); Integer state = getInt("state"); PageParam pp = getBean(PageParam.class, "", true); renderJson(Result.object(PrepayDetailService.me.find(pp, customer_id, name, stm, etm, state))); @@ -127,7 +127,7 @@ public class PrepayDetailController extends Controller { * 按主键查找单个对象 prepay_detail 预付费客户付费详情 */ @Before(PrepayDetailPKValidator.class) - public void findByPk(){ + public void findByPk() { PrepayDetail model = getModel(PrepayDetail.class, "", true); // 忽略不在model中的字段 renderJson(PrepayDetailService.me.findByPk(model)); } @@ -136,7 +136,7 @@ public class PrepayDetailController extends Controller { * 按主键查找单个对象 prepay_detail 预付费客户付费详情 */ @Before(PrepayDetailPKValidator.class) - public void get(){ + public void get() { renderJson(PrepayDetailService.me.get(get("id"))); } @@ -144,7 +144,7 @@ public class PrepayDetailController extends Controller { * 返回所有 prepay_detail 预付费客户付费详情 */ @Before({StartAndEndTimeValidator.class, CustomerIdValidator.class}) - public void list(){ + public void list() { int export = getInt("export", 0); // 是否导出为exce 0 不导出，1 导出 int customer_id = getInt("customer_id", 0); String stm = get("stm"); @@ -159,7 +159,7 @@ public class PrepayDetailController extends Controller { } @Before(PrepayDetailVerifyValidator.class) - public void verify(){ + public void verify() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -167,9 +167,9 @@ public class PrepayDetailController extends Controller { return; } - String id = get("id"); - int state = getInt("state", 0); - String memo = get("memo"); + String id = get("id"); + int state = getInt("state", 0); + String memo = get("memo"); renderJson(PrepayDetailSyncService.me.verify(id, state, memo, tokenuser)); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java index 3928bb1..1ce9b09 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailVerifyValidator.java @@ -15,10 +15,11 @@ import java.util.List; * PrimaryKey: id */ public class PrepayDetailVerifyValidator extends CrudParamValidator { - private static List chkstate = new ArrayList(){{ + private static List chkstate = new ArrayList() {{ add(2); add(9); }}; + @Override protected void validate(Controller c) { validateString("id", 32, 32, "id", "id 长度 32，必填"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/DayValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/DayValidator.java index 495b841..bb87c5c 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/DayValidator.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/DayValidator.java @@ -11,8 +11,8 @@ import com.jfinal.kit.StrKit; public class DayValidator extends CrudParamValidator { @Override protected void validate(Controller c) { - if(StrKit.notBlank(c.get("valid_date"))){ - validateDate("valid_date", "yyyy-MM-dd","valid_date","valid_date 格式必须为 yyyy-MM-dd"); + if (StrKit.notBlank(c.get("valid_date"))) { + validateDate("valid_date", "yyyy-MM-dd", "valid_date", "valid_date 格式必须为 yyyy-MM-dd"); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckController.java index 97ac53f..1579500 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckController.java @@ -43,7 +43,7 @@ public class PrepayTruckController extends BaseController { */ @Before(PrepayTruckValidator.class) public void save() { - Integer customer_id = getInt("customer_id"); + Integer customer_id = getInt("customer_id"); Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); @@ -83,7 +83,7 @@ public class PrepayTruckController extends BaseController { */ @Before(DayValidator.class) public void find() { - Integer customer_id = getInt("customer_id"); + Integer customer_id = getInt("customer_id"); Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); @@ -125,7 +125,7 @@ public class PrepayTruckController extends BaseController { * 返回所有 prepay_truck 每日砂站指定预付费车辆 */ public void list() { - Integer customer_id = getInt("customer_id"); + Integer customer_id = getInt("customer_id"); Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java index ce35605..41d73a0 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailConfirmValidator.java @@ -15,10 +15,11 @@ import java.util.List; * PrimaryKey: id */ public class RefundDetailConfirmValidator extends CrudParamValidator { - private static List chkstate = new ArrayList(){{ + private static List chkstate = new ArrayList() {{ add(2); add(9); }}; + @Override protected void validate(Controller c) { validateString("id", 32, 32, "id", "id 长度 32，必填"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java index 5e53628..fb0a6dd 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailController.java @@ -26,7 +26,7 @@ public class RefundDetailController extends BaseController { * 不存在 data = false */ @Before(RefundDetailPKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { RefundDetail model = getModel(RefundDetail.class, "", true); // 忽略不在model中的字段 renderJson(RefundDetailService.me.checkExistsByPk(model)); } @@ -35,7 +35,7 @@ public class RefundDetailController extends BaseController { * 新增 refund_detail 预付费客户退费详情 */ @Before(RefundDetailValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -51,7 +51,7 @@ public class RefundDetailController extends BaseController { * 删除 refund_detail 预付费客户退费详情 */ @Before(RefundDetailPKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -67,7 +67,7 @@ public class RefundDetailController extends BaseController { * 恢复 refund_detail 预付费客户退费详情 */ @Before(RefundDetailPKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -83,7 +83,7 @@ public class RefundDetailController extends BaseController { * 修改 refund_detail 预付费客户退费详情 */ @Before(RefundDetailValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -98,10 +98,10 @@ public class RefundDetailController extends BaseController { /** * 分页查找 refund_detail 预付费客户退费详情 */ - public void find(){ - String name = get("name"); - String stm = get("stm"); - String etm = get("etm"); + public void find() { + String name = get("name"); + String stm = get("stm"); + String etm = get("etm"); Integer state = getInt("state"); PageParam pp = getBean(PageParam.class, "", true); renderJson(Result.object(RefundDetailService.me.find(pp, name, stm, etm, state))); @@ -111,7 +111,7 @@ public class RefundDetailController extends BaseController { * 按主键查找单个对象 refund_detail 预付费客户退费详情 */ @Before(RefundDetailPKValidator.class) - public void findByPk(){ + public void findByPk() { RefundDetail model = getModel(RefundDetail.class, "", true); // 忽略不在model中的字段 renderJson(RefundDetailService.me.findByPk(model)); } @@ -120,20 +120,20 @@ public class RefundDetailController extends BaseController { * 按主键查找单个对象 refund_detail 预付费客户退费详情 */ @Before(RefundDetailPKValidator.class) - public void get(){ + public void get() { renderJson(RefundDetailService.me.get(get("id"))); } /** * 返回所有 refund_detail 预付费客户退费详情 */ - public void list(){ + public void list() { renderJson(Result.object(RefundDetailService.me.list())); } @Before(RefundDetailVerifyValidator.class) - public void verify(){ + public void verify() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -141,14 +141,15 @@ public class RefundDetailController extends BaseController { return; } - String id = get("id"); - int state = getInt("state", 0); - String memo = get("memo"); + String id = get("id"); + int state = getInt("state", 0); + String memo = get("memo"); renderJson(RefundDetailSyncService.me.verify(id, state, memo, tokenuser)); } + @Before(RefundDetailConfirmValidator.class) - public void confirm(){ + public void confirm() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -156,9 +157,9 @@ public class RefundDetailController extends BaseController { return; } - String id = get("id"); - BigDecimal amount = new BigDecimal(getParaToDouble("amount", 0d)); - String serialnum = get("serialnum", ""); + String id = get("id"); + BigDecimal amount = new BigDecimal(getParaToDouble("amount", 0d)); + String serialnum = get("serialnum", ""); renderJson(RefundDetailSyncService.me.confirm(id, amount, serialnum, tokenuser)); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java index f6f3f72..75a04ac 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailVerifyValidator.java @@ -15,10 +15,11 @@ import java.util.List; * PrimaryKey: id */ public class RefundDetailVerifyValidator extends CrudParamValidator { - private static List chkstate = new ArrayList(){{ + private static List chkstate = new ArrayList() {{ add(2); add(9); }}; + @Override protected void validate(Controller c) { validateString("id", 32, 32, "id", "id 长度 32，必填"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/product/ProductController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/product/ProductController.java index 7ad8dad..8b27802 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/product/ProductController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/product/ProductController.java @@ -26,7 +26,7 @@ public class ProductController extends Controller { * 不存在 data = false */ @Before(ProductPKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { Product model = getModel(Product.class, "", true); // 忽略不在model中的字段 renderJson(ProductService.me.checkExistsByPk(model)); } @@ -35,7 +35,7 @@ public class ProductController extends Controller { * 新增 product 商品信息 */ @Before(ProductValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -51,7 +51,7 @@ public class ProductController extends Controller { * 删除 product 商品信息 */ @Before(ProductPKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -67,7 +67,7 @@ public class ProductController extends Controller { * 恢复 product 商品信息 */ @Before(ProductPKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -83,7 +83,7 @@ public class ProductController extends Controller { * 修改 product 商品信息 */ @Before(ProductValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -98,10 +98,10 @@ public class ProductController extends Controller { /** * 分页查找 product 商品信息 */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - String name = get("name"); - Integer del = getInt("del"); + 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))); } @@ -109,7 +109,7 @@ public class ProductController extends Controller { * 按主键查找单个对象 product 商品信息 */ @Before(ProductPKValidator.class) - public void findByPk(){ + public void findByPk() { Product model = getModel(Product.class, "", true); // 忽略不在model中的字段 renderJson(ProductService.me.findByPk(model)); } @@ -118,7 +118,7 @@ public class ProductController extends Controller { * 按主键查找单个对象 product 商品信息 */ @Before(ProductPKValidator.class) - public void get(){ + public void get() { Product model = getModel(Product.class, "", true); // 忽略不在model中的字段 renderJson(ProductService.me.findByPk(model)); } @@ -126,7 +126,7 @@ public class ProductController extends Controller { /** * 返回所有 product 商品信息 */ - public void list(){ + public void list() { renderJson(Result.object(ProductService.me.list())); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java index 98108a0..09b34e9 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/purchase/PurchaseController.java @@ -26,7 +26,7 @@ public class PurchaseController extends Controller { * 不存在 data = false */ @Before(PurchasePKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { Purchase model = getModel(Purchase.class, "", true); // 忽略不在model中的字段 renderJson(PurchaseService.me.checkExistsByPk(model)); } @@ -35,7 +35,7 @@ public class PurchaseController extends Controller { * 新增 purchase 采购点（采砂场） */ @Before(PurchaseValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -51,7 +51,7 @@ public class PurchaseController extends Controller { * 删除 purchase 采购点（采砂场） */ @Before(PurchasePKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -67,7 +67,7 @@ public class PurchaseController extends Controller { * 恢复 purchase 采购点（采砂场） */ @Before(PurchasePKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -83,7 +83,7 @@ public class PurchaseController extends Controller { * 修改 purchase 采购点（采砂场） */ @Before(PurchaseValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -98,18 +98,18 @@ public class PurchaseController extends Controller { /** * 分页查找 purchase 采购点（采砂场） */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - String name = get("name"); - Integer del = getInt("del"); - renderJson(Result.object(PurchaseService.me.find(pp, name,del))); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + String name = get("name"); + Integer del = getInt("del"); + renderJson(Result.object(PurchaseService.me.find(pp, name, del))); } /** * 按主键查找单个对象 purchase 采购点（采砂场） */ @Before(PurchasePKValidator.class) - public void findByPk(){ + public void findByPk() { Purchase model = getModel(Purchase.class, "", true); // 忽略不在model中的字段 renderJson(PurchaseService.me.findByPk(model)); } @@ -118,7 +118,7 @@ public class PurchaseController extends Controller { * 按主键查找单个对象 purchase 采购点（采砂场） */ @Before(PurchasePKValidator.class) - public void get(){ + public void get() { Purchase model = getModel(Purchase.class, "", true); // 忽略不在model中的字段 renderJson(PurchaseService.me.findByPk(model)); } @@ -126,7 +126,7 @@ public class PurchaseController extends Controller { /** * 返回所有 purchase 采购点（采砂场） */ - public void list(){ + public void list() { renderJson(Result.object(PurchaseService.me.list())); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java index d16aa9e..1bcff4c 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmController.java @@ -26,7 +26,7 @@ public class SandfarmController extends Controller { * 不存在 data = false */ @Before(SandfarmPKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { Sandfarm model = getModel(Sandfarm.class, "", true); // 忽略不在model中的字段 renderJson(SandfarmService.me.checkExistsByPk(model)); } @@ -35,7 +35,7 @@ public class SandfarmController extends Controller { * 新增 sandfarm 生产点（采砂场） */ @Before(SandfarmValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -44,14 +44,14 @@ public class SandfarmController extends Controller { } Sandfarm model = getModel(Sandfarm.class, "", true); // 忽略不在model中的字段 - renderJson(SandfarmSyncService.me.save(model, tokenuser,"name")); + renderJson(SandfarmSyncService.me.save(model, tokenuser, "name")); } /** * 删除 sandfarm 生产点（采砂场） */ @Before(SandfarmPKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -67,7 +67,7 @@ public class SandfarmController extends Controller { * 恢复 sandfarm 生产点（采砂场） */ @Before(SandfarmPKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -83,7 +83,7 @@ public class SandfarmController extends Controller { * 修改 sandfarm 生产点（采砂场） */ @Before(SandfarmValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -98,10 +98,10 @@ public class SandfarmController extends Controller { /** * 分页查找 sandfarm 生产点（采砂场） */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - String name = get("name"); - Integer del = getInt("del"); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + String name = get("name"); + Integer del = getInt("del"); renderJson(Result.object(SandfarmService.me.find(pp, name, del))); } @@ -109,7 +109,7 @@ public class SandfarmController extends Controller { * 按主键查找单个对象 sandfarm 生产点（采砂场） */ @Before(SandfarmPKValidator.class) - public void findByPk(){ + public void findByPk() { Sandfarm model = getModel(Sandfarm.class, "", true); // 忽略不在model中的字段 renderJson(SandfarmService.me.findByPk(model)); } @@ -118,7 +118,7 @@ public class SandfarmController extends Controller { * 按主键查找单个对象 sandfarm 生产点（采砂场） */ @Before(SandfarmPKValidator.class) - public void get(){ + public void get() { Sandfarm model = getModel(Sandfarm.class, "", true); // 忽略不在model中的字段 renderJson(SandfarmService.me.findByPk(model)); } @@ -126,7 +126,7 @@ public class SandfarmController extends Controller { /** * 返回所有 sandfarm 生产点（采砂场） */ - public void list(){ + public void list() { renderJson(Result.object(SandfarmService.me.list())); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmSyncService.java index 1aec23b..b39eaee 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/sandfarm/SandfarmSyncService.java @@ -6,7 +6,7 @@ import com.cowr.service.ssjygl.base.BaseSyncService; /** * 带 Sync 处理需要同步的数据 * 不带 Sync 的为原来通用的 service - * + *

* Generated by COWR Sat Apr 04 17:23:04 CST 2020 * TableName: sandfarm * Remarks: 生产点（采砂场） diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsService.java index b0ff011..d870e79 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsService.java @@ -99,7 +99,7 @@ public class SmsService { try { String phone = sysuser.getPhone(); - if(Config.isDev()){ + if (Config.isDev()) { phone = "13627293906"; } @@ -147,7 +147,7 @@ public class SmsService { public void checkSendStatus() { List logs = SmsLog.dao.find("select * from sms_log t where t.code = 'OK' and t.sendstatus < 2 limit 500"); - if(logs.isEmpty()){ + if (logs.isEmpty()) { return; } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java index 965937b..e9fe5ee 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java @@ -259,7 +259,7 @@ public class OrderStatController extends BaseController { renderJson(Result.noauth()); return; } else if (tokenuser.getType() == UserTypeEnum.CUSTOMER.getTypeid()) { - customer_id = tokenuser.getEntityId(); + customer_id = tokenuser.getEntityId(); customer_ids = null; } @@ -293,7 +293,7 @@ public class OrderStatController extends BaseController { renderJson(Result.noauth()); return; } else if (tokenuser.getType() == UserTypeEnum.CUSTOMER.getTypeid()) { - customer_id = tokenuser.getEntityId(); + customer_id = tokenuser.getEntityId(); customer_ids = null; } @@ -325,7 +325,7 @@ public class OrderStatController extends BaseController { renderJson(Result.noauth()); return; } else if (tokenuser.getType() == UserTypeEnum.CUSTOMER.getTypeid()) { - customer_id = tokenuser.getEntityId(); + customer_id = tokenuser.getEntityId(); customer_ids = null; } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java index 10a98ba..215ecb8 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketController.java @@ -23,7 +23,7 @@ public class SupermarketController extends BaseController { * 修改 supermarket 销售点（砂站） */ @Before(SupermarketValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -40,10 +40,10 @@ public class SupermarketController extends BaseController { /** * 分页查找 supermarket 销售点（砂站） */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - String name = get("name"); - Integer del = getInt("del"); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + String name = get("name"); + Integer del = getInt("del"); renderJson(Result.object(SupermarketService.me.find(pp, name, del))); } @@ -51,19 +51,19 @@ public class SupermarketController extends BaseController { * 按主键查找单个对象 supermarket 销售点（砂站） */ @Before(SupermarketPKValidator.class) - public void get(){ + public void get() { renderJson(SupermarketService.me.get(getInt("id"))); } /** * 返回所有 supermarket 销售点（砂站） */ - public void list(){ + public void list() { renderJson(Result.object(SupermarketService.me.list())); } @Before(SupAddProductValidator.class) - public void addProduct(){ + public void addProduct() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -71,15 +71,15 @@ public class SupermarketController extends BaseController { return; } - int supermarket_id = getInt("supermarket_id"); - int product_id = getInt("product_id"); - double unit_price = getParaToDouble("unit_price"); + int supermarket_id = getInt("supermarket_id"); + int product_id = getInt("product_id"); + double unit_price = getParaToDouble("unit_price"); renderJson(SupermarketSyncService.me.addProduct(supermarket_id, product_id, unit_price, tokenuser)); } @Before(SupRemoveProductValidator.class) - public void removeProduct(){ + public void removeProduct() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -88,7 +88,7 @@ public class SupermarketController extends BaseController { } int supermarket_id = getInt("supermarket_id"); - int product_id = getInt("product_id"); + int product_id = getInt("product_id"); renderJson(SupermarketSyncService.me.removeProduct(supermarket_id, product_id, tokenuser)); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java index 39e92c3..3aaa14a 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java @@ -56,7 +56,7 @@ public class SupermarketSyncService extends BaseSyncService { @Override public boolean run() { try { - boolean ret = false; + boolean ret = false; SyncTask synctask = new SyncTask(); SupermarketProduct sp = new SupermarketProduct(); @@ -66,7 +66,7 @@ public class SupermarketSyncService extends BaseSyncService { ret = sp.save(); - if(!ret){ + if (!ret) { return false; } @@ -74,7 +74,7 @@ public class SupermarketSyncService extends BaseSyncService { // 库存初始化 Stock stock = Stock.dao.findByIds(supermarket_id, product_id); - if(stock == null){ + if (stock == null) { stock = new Stock(); stock.setSupermarketId(supermarket_id); stock.setProductId(product_id); @@ -83,7 +83,7 @@ public class SupermarketSyncService extends BaseSyncService { ret = stock.save(); synctask.addSaveData(stock); - }else{ + } else { stock.setStockWeight(new BigDecimal(0)); ret = stock.update(); @@ -123,13 +123,13 @@ public class SupermarketSyncService extends BaseSyncService { @Override public boolean run() { try { - boolean ret = true; + boolean ret = true; SyncTask synctask = new SyncTask(); synctask.addDeleteData(sp); Stock stock = Stock.dao.findByIds(supermarket_id, product_id); - if(stock != null){ + if (stock != null) { stock.setStockWeight(new BigDecimal(0)); synctask.addUpdateData(stock); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java index b33dd79..df11fe1 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceController.java @@ -10,14 +10,14 @@ import com.cowr.ssjygl.supermarket.customerdistance.SupermarketCustomerDistanceV import com.jfinal.aop.Before; public class SupermarketCustomerDistanceController extends BaseController { - public void get(){ - Integer customer_id = getInt("customer_id"); - Integer supermarket_id = getInt("supermarket_id"); + public void get() { + Integer customer_id = getInt("customer_id"); + Integer supermarket_id = getInt("supermarket_id"); renderJson(Result.success(SupermarketCustomerDistanceService.me.getDistance(supermarket_id, customer_id))); } - public void customerDistance(){ - Integer customer_id = getInt("customer_id"); + public void customerDistance() { + Integer customer_id = getInt("customer_id"); renderJson(Result.success(SupermarketCustomerDistanceService.me.customerDistance(customer_id))); } @@ -33,7 +33,7 @@ public class SupermarketCustomerDistanceController extends BaseController { * 新增 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ @Before(SupermarketCustomerDistanceValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -41,20 +41,19 @@ public class SupermarketCustomerDistanceController extends BaseController { return; } - int customer_id = getInt("customer_id"); - int supermarket_id = getInt("supermarket_id"); - double distance = getParaToDouble("distance"); + int customer_id = getInt("customer_id"); + int supermarket_id = getInt("supermarket_id"); + double distance = getParaToDouble("distance"); renderJson(SupermarketCustomerDistanceSyncService.me.save(customer_id, supermarket_id, distance, tokenuser)); } - /** * 修改 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ @Before(SupermarketCustomerDistanceValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -62,9 +61,9 @@ public class SupermarketCustomerDistanceController extends BaseController { return; } - int customer_id = getInt("customer_id"); - int supermarket_id = getInt("supermarket_id"); - double distance = getParaToDouble("distance"); + int customer_id = getInt("customer_id"); + int supermarket_id = getInt("supermarket_id"); + double distance = getParaToDouble("distance"); renderJson(SupermarketCustomerDistanceSyncService.me.update(customer_id, supermarket_id, distance, tokenuser)); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceSyncService.java index b54be2b..95df422 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/customerdistance/SupermarketCustomerDistanceSyncService.java @@ -10,16 +10,16 @@ import java.math.BigDecimal; public class SupermarketCustomerDistanceSyncService extends BaseSyncService { public static SupermarketCustomerDistanceSyncService me = new SupermarketCustomerDistanceSyncService(); - public Result save(int customer_id, int supermarket_id, double distance, Sysuser sysuser){ + public Result save(int customer_id, int supermarket_id, double distance, Sysuser sysuser) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id); - if(supermarket == null){ + if (supermarket == null) { return Result.failed("未找到对应砂站信息"); } Customer customer = Customer.dao.findById(customer_id); - if(customer == null){ + if (customer == null) { return Result.failed("未找到对应的客户信息"); } @@ -31,16 +31,16 @@ public class SupermarketCustomerDistanceSyncService extends BaseSyncService { return super.save(model, sysuser); } - public Result update(int customer_id, int supermarket_id, double distance, Sysuser sysuser){ + public Result update(int customer_id, int supermarket_id, double distance, Sysuser sysuser) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id); - if(supermarket == null){ + if (supermarket == null) { return Result.failed("未找到对应砂站信息"); } Customer customer = Customer.dao.findById(customer_id); - if(customer == null){ + if (customer == null) { return Result.failed("未找到对应的客户信息"); } @@ -48,15 +48,15 @@ public class SupermarketCustomerDistanceSyncService extends BaseSyncService { "select * from supermarket_customer_distance t \n" + " where t.customer_id = ? and t.supermarket_id = ? limit 1", customer_id, supermarket_id); - if(model == null){ + if (model == null) { model = new SupermarketCustomerDistance(); model.setCustomerId(customer_id); model.setSupermarketId(supermarket_id); model.setDistance(new BigDecimal(distance)); return super.save(model, sysuser); - }else{ - if(model.getDistance().compareTo(new BigDecimal(distance)) == 0){ + } else { + if (model.getDistance().compareTo(new BigDecimal(distance)) == 0) { return Result.success("距离没有变化，不更新"); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java index c92710b..18d3ec9 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java @@ -27,7 +27,7 @@ public class SupermarketReceiverDistanceController extends BaseController { * 不存在 data = false */ @Before(SupermarketReceiverDistancePKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { SupermarketReceiverDistance model = getModel(SupermarketReceiverDistance.class, "", true); // 忽略不在model中的字段 renderJson(SupermarketReceiverDistanceService.me.checkExistsByPk(model)); } @@ -36,7 +36,7 @@ public class SupermarketReceiverDistanceController extends BaseController { * 新增 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ @Before(SupermarketReceiverDistanceValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -44,15 +44,15 @@ public class SupermarketReceiverDistanceController extends BaseController { return; } - int customer_id = getInt("customer_id"); - int supermarket_id = getInt("supermarket_id"); - double distance = getParaToDouble("distance"); + int customer_id = getInt("customer_id"); + int supermarket_id = getInt("supermarket_id"); + double distance = getParaToDouble("distance"); renderJson(SupermarketReceiverDistanceSyncService.me.save(customer_id, supermarket_id, distance, tokenuser)); } @Before(SupermarketReceiverDistanceValidator.class) - public void saveOrupdate(){ + public void saveOrupdate() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -68,7 +68,7 @@ public class SupermarketReceiverDistanceController extends BaseController { * 删除 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ @Before(SupermarketReceiverDistancePKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -84,7 +84,7 @@ public class SupermarketReceiverDistanceController extends BaseController { * 恢复 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ @Before(SupermarketReceiverDistancePKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -100,7 +100,7 @@ public class SupermarketReceiverDistanceController extends BaseController { * 修改 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ @Before(SupermarketReceiverDistanceValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -108,9 +108,9 @@ public class SupermarketReceiverDistanceController extends BaseController { return; } - int customer_id = getInt("customer_id"); - int supermarket_id = getInt("supermarket_id"); - double distance = getParaToDouble("distance"); + int customer_id = getInt("customer_id"); + int supermarket_id = getInt("supermarket_id"); + double distance = getParaToDouble("distance"); renderJson(SupermarketReceiverDistanceSyncService.me.update(customer_id, supermarket_id, distance, tokenuser)); } @@ -118,11 +118,11 @@ public class SupermarketReceiverDistanceController extends BaseController { /** * 分页查找 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - Integer supermarket_id = getInt("supermarket_id"); - Integer customer_receiver_id = getInt("customer_receiver_id"); - Integer customer_id = getInt("customer_id"); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + Integer supermarket_id = getInt("supermarket_id"); + Integer customer_receiver_id = getInt("customer_receiver_id"); + Integer customer_id = getInt("customer_id"); renderJson(Result.object(SupermarketReceiverDistanceService.me.find(pp, supermarket_id, customer_receiver_id, customer_id))); } @@ -130,7 +130,7 @@ public class SupermarketReceiverDistanceController extends BaseController { * 按主键查找单个对象 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ @Before(SupermarketReceiverDistancePKValidator.class) - public void findByPk(){ + public void findByPk() { SupermarketReceiverDistance model = getModel(SupermarketReceiverDistance.class, "", true); // 忽略不在model中的字段 renderJson(SupermarketReceiverDistanceService.me.findByPk(model)); } @@ -138,27 +138,27 @@ public class SupermarketReceiverDistanceController extends BaseController { /** * 按主键查找单个对象 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ - public void get(){ + public void get() { Integer supermarket_id = getInt("supermarket_id"); - Integer customer_id = getInt("customer_id"); + Integer customer_id = getInt("customer_id"); renderJson(Result.success(SupermarketReceiverDistanceService.me.getDistanceByCustomer(supermarket_id, customer_id))); } /** * 返回所有 supermarket_receiver_distance 客户收获地址到每个砂站的距离 */ - public void list(){ - Integer supermarket_id = getInt("supermarket_id"); + public void list() { + Integer supermarket_id = getInt("supermarket_id"); Integer customer_receiver_id = getInt("customer_receiver_id"); - Integer customer_id = getInt("customer_id"); + Integer customer_id = getInt("customer_id"); renderJson(Result.object(SupermarketReceiverDistanceService.me.list(supermarket_id, customer_receiver_id, customer_id))); } - public void findAllSupermarket(){ - PageParam pp = getBean(PageParam.class, "", true); - Integer customer_receiver_id = getInt("customer_receiver_id"); - Integer customer_id = getInt("customer_id"); - String customer_name = get("customer_name"); + public void findAllSupermarket() { + PageParam pp = getBean(PageParam.class, "", true); + Integer customer_receiver_id = getInt("customer_receiver_id"); + Integer customer_id = getInt("customer_id"); + String customer_name = get("customer_name"); renderJson(Result.object(SupermarketReceiverDistanceService.me.findAllSupermarket(pp, customer_receiver_id, customer_id, customer_name))); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java index 8c68951..2af5e2c 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java @@ -10,22 +10,22 @@ import java.math.BigDecimal; public class SupermarketReceiverDistanceSyncService extends BaseSyncService { public static SupermarketReceiverDistanceSyncService me = new SupermarketReceiverDistanceSyncService(); - public Result save(int customer_id, int supermarket_id, double distance, Sysuser sysuser){ + public Result save(int customer_id, int supermarket_id, double distance, Sysuser sysuser) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id); - if(supermarket == null){ + if (supermarket == null) { return Result.failed("未找到对应砂站信息"); } Customer customer = Customer.dao.findById(customer_id); - if(customer == null){ + if (customer == null) { return Result.failed("未找到对应的客户信息"); } CustomerReceiver cr = CustomerReceiver.dao.findFirst("select * from customer_receiver t where t.customer_id = ? limit 1 ", customer_id); - if(cr == null){ + if (cr == null) { return Result.failed("客户信息不完整"); } @@ -37,37 +37,37 @@ public class SupermarketReceiverDistanceSyncService extends BaseSyncService { return super.save(model, sysuser); } - public Result update(int customer_id, int supermarket_id, double distance, Sysuser sysuser){ + public Result update(int customer_id, int supermarket_id, double distance, Sysuser sysuser) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id); - if(supermarket == null){ + if (supermarket == null) { return Result.failed("未找到对应砂站信息"); } Customer customer = Customer.dao.findById(customer_id); - if(customer == null){ + if (customer == null) { return Result.failed("未找到对应的客户信息"); } CustomerReceiver cr = CustomerReceiver.dao.findFirst("select * from customer_receiver t where t.customer_id = ? limit 1 ", customer_id); - if(cr == null){ + if (cr == null) { return Result.failed("客户信息不完整"); } SupermarketReceiverDistance model = SupermarketReceiverDistance.dao.findFirst( "select * from supermarket_receiver_distance t where t.customer_receiver_id = ? and t.supermarket_id = ? limit 1", cr.getId(), supermarket_id); - if(model == null){ + if (model == null) { model = new SupermarketReceiverDistance(); model.setCustomerReceiverId(cr.getId()); model.setSupermarketId(supermarket_id); model.setDistance(new BigDecimal(distance)); return super.save(model, sysuser); - }else{ - if(model.getDistance().compareTo(new BigDecimal(distance)) == 0){ + } else { + if (model.getDistance().compareTo(new BigDecimal(distance)) == 0) { return Result.success("距离没有变化，不更新"); } @@ -76,16 +76,16 @@ public class SupermarketReceiverDistanceSyncService extends BaseSyncService { } } - public Result save(SupermarketReceiverDistance model, Sysuser sysuser){ + public Result save(SupermarketReceiverDistance model, Sysuser sysuser) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(model.getSupermarketId()); - if(supermarket == null){ + if (supermarket == null) { return Result.failed("未找到对应砂站信息"); } CustomerReceiver cr = CustomerReceiver.dao.findById(model.getCustomerReceiverId()); - if(cr == null){ + if (cr == null) { return Result.failed("未找到对应的收获地址信息"); } @@ -94,28 +94,29 @@ public class SupermarketReceiverDistanceSyncService extends BaseSyncService { /** * 新增或者更新 + * * @param model * @param sysuser * @return */ - public Result saveOrupdate(SupermarketReceiverDistance model, Sysuser sysuser){ + public Result saveOrupdate(SupermarketReceiverDistance model, Sysuser sysuser) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(model.getSupermarketId()); - if(supermarket == null){ + if (supermarket == null) { return Result.failed("未找到对应砂站信息"); } CustomerReceiver cr = CustomerReceiver.dao.findById(model.getCustomerReceiverId()); - if(cr == null){ + if (cr == null) { return Result.failed("未找到对应的收获地址信息"); } SupermarketReceiverDistance old = SupermarketReceiverDistance.dao.findByIds(model.getSupermarketId(), model.getCustomerReceiverId()); - if(old == null){ + if (old == null) { return super.save(model, sysuser); - }else{ + } else { return super.update(model, sysuser); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java index c046e82..82a794e 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java @@ -15,7 +15,7 @@ import com.jfinal.core.Controller; * Generated by COWR Mon Apr 06 09:50:28 CST 2020 * TableName: supermarket_sandfarm_distance * Remarks: 生产点到销售点的距离配置 - + *

* PrimaryKey: supermarket_id,sandfarm_id */ public class SupermarketSandfarmDistanceController extends Controller { @@ -27,7 +27,7 @@ public class SupermarketSandfarmDistanceController extends Controller { * 不存在 data = false */ @Before(SupermarketSandfarmDistancePKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { SupermarketSandfarmDistance model = getModel(SupermarketSandfarmDistance.class, "", true); // 忽略不在model中的字段 renderJson(SupermarketSandfarmDistanceService.me.checkExistsByPk(model)); } @@ -36,7 +36,7 @@ public class SupermarketSandfarmDistanceController extends Controller { * 新增 supermarket_sandfarm_distance 生产点到销售点的距离配置 */ @Before(SupermarketSandfarmDistanceValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -52,7 +52,7 @@ public class SupermarketSandfarmDistanceController extends Controller { * 删除 supermarket_sandfarm_distance 生产点到销售点的距离配置 */ @Before(SupermarketSandfarmDistancePKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -68,7 +68,7 @@ public class SupermarketSandfarmDistanceController extends Controller { * 恢复 supermarket_sandfarm_distance 生产点到销售点的距离配置 */ @Before(SupermarketSandfarmDistancePKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -82,10 +82,9 @@ public class SupermarketSandfarmDistanceController extends Controller { /** * 修改 supermarket_sandfarm_distance 生产点到销售点的距离配置 - */ @Before(SupermarketSandfarmDistanceValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -100,10 +99,10 @@ public class SupermarketSandfarmDistanceController extends Controller { /** * 分页查找 supermarket_sandfarm_distance 生产点到销售点的距离配置 */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - Integer supermarket_id = getInt("supermarket_id"); - Integer sandfarm_id = getInt("sandfarm_id"); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + Integer supermarket_id = getInt("supermarket_id"); + Integer sandfarm_id = getInt("sandfarm_id"); renderJson(Result.object(SupermarketSandfarmDistanceService.me.find(pp, supermarket_id, sandfarm_id))); } @@ -111,7 +110,7 @@ public class SupermarketSandfarmDistanceController extends Controller { * 按主键查找单个对象 supermarket_sandfarm_distance 生产点到销售点的距离配置 */ @Before(SupermarketSandfarmDistancePKValidator.class) - public void findByPk(){ + public void findByPk() { SupermarketSandfarmDistance model = getModel(SupermarketSandfarmDistance.class, "", true); // 忽略不在model中的字段 renderJson(SupermarketSandfarmDistanceService.me.findByPk(model)); } @@ -120,7 +119,7 @@ public class SupermarketSandfarmDistanceController extends Controller { * 按主键查找单个对象 supermarket_sandfarm_distance 生产点到销售点的距离配置 */ @Before(SupermarketSandfarmDistancePKValidator.class) - public void get(){ + public void get() { SupermarketSandfarmDistance model = getModel(SupermarketSandfarmDistance.class, "", true); // 忽略不在model中的字段 renderJson(SupermarketSandfarmDistanceService.me.findByPk(model)); } @@ -128,7 +127,7 @@ public class SupermarketSandfarmDistanceController extends Controller { /** * 返回所有 supermarket_sandfarm_distance 生产点到销售点的距离配置 */ - public void list(){ + public void list() { renderJson(Result.object(SupermarketSandfarmDistanceService.me.list())); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java index aef978d..f444867 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java @@ -11,13 +11,13 @@ public class SupermarketSandfarmDistanceSyncService extends BaseSyncService { public Result save(SupermarketSandfarmDistance model, Sysuser sysuser) { Supermarket supermarket = SvrCacheData.SUP_CACHE.get(model.getSupermarketId()); - if(supermarket == null){ + if (supermarket == null) { return Result.failed("未找到对应砂站信息"); } Sandfarm sandfarm = Sandfarm.dao.findById(model.getSandfarmId()); - if(sandfarm == null){ + if (sandfarm == null) { return Result.failed("未找到对应砂场信息"); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/stock/StockController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/stock/StockController.java index f678d99..9e000a6 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/stock/StockController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/stock/StockController.java @@ -16,17 +16,17 @@ public class StockController extends Controller { /** * 分页查找 stock 订单相关 - 销售点库存量 */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - Integer supermarket_id = getInt("supermarket_id"); - Integer product_id = getInt("product_id"); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + Integer supermarket_id = getInt("supermarket_id"); + Integer product_id = getInt("product_id"); renderJson(Result.object(StockService.me.find(pp, supermarket_id, product_id))); } /** * 返回所有 stock 订单相关 - 销售点库存量 */ - public void list(){ + public void list() { renderJson(Result.object(StockService.me.list())); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/RegisterUserValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/RegisterUserValidator.java index a4c3658..3abd15c 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/RegisterUserValidator.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/RegisterUserValidator.java @@ -6,7 +6,7 @@ import com.cowr.common.view.Result; import com.jfinal.core.Controller; import com.jfinal.kit.StrKit; -public class RegisterUserValidator extends CrudParamValidator { +public class RegisterUserValidator extends CrudParamValidator { @Override protected void validate(Controller c) { validateRegex("sysuser.phone", StrUtil.regphone, "sysuser.phone", "用户手机号格式错误"); @@ -17,13 +17,13 @@ public class RegisterUserValidator extends CrudParamValidator { validateString("customer.memo", 0, 256, "customer.memo", "备注长度在0~256之间"); validateInteger("customer.invoice_type", 0, 3, "invoice_type", "请选择是开具普票还是专票"); - if(c.getInt("customer.invoice_type") == 2){ + if (c.getInt("customer.invoice_type") == 2) { validateString("customer.texpayer_num", 1, 20, "customer.texpayer_num", "开具专票必须录入有效纳税人识别号"); validateString("customer.bank_name", 1, 128, "customer.bank_name", "开具专票必须录入有效开户行信息"); validateString("customer.bank_account", 1, 20, "customer.bank_account", "开具专票必须录入有效开户行账号"); validateString("customer.address", 1, 256, "customer.address", "公司地址的长度在1~255之间"); validateString("customer.phone", 1, 20, "customer.phone", "开票电话格式不正确"); - }else{ + } else { validateString("customer.texpayer_num", 0, 20, "customer.texpayer_num", "纳税人识别号格式不正确"); validateString("customer.bank_name", 0, 128, "customer.bank_name", "开户银行名称格式不正确"); validateString("customer.bank_account", 0, 20, "customer.bank_account", "开户银行账号格式不正确"); 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 9dce983..d440e2a 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 @@ -814,7 +814,7 @@ public class SysuserSyncService extends BaseSyncService { sqlbuf.append(") a\n"); sqlbuf.append("where 1 = 1"); - if(type != null && type == UserTypeEnum.CUSTOMER.getTypeid()){ + if (type != null && type == UserTypeEnum.CUSTOMER.getTypeid()) { sqlbuf.setLength(0); sqlbuf.append(" from (\n"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java index a23e3d0..ce0a0a6 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/transportcompany/TransportCompanyController.java @@ -26,7 +26,7 @@ public class TransportCompanyController extends Controller { * 不存在 data = false */ @Before(TransportCompanyPKValidator.class) - public void checkExistsByPk(){ + public void checkExistsByPk() { TransportCompany model = getModel(TransportCompany.class, "", true); // 忽略不在model中的字段 renderJson(TransportCompanyService.me.checkExistsByPk(model)); } @@ -35,7 +35,7 @@ public class TransportCompanyController extends Controller { * 新增 transport_company 物流公司 */ @Before(TransportCompanyValidator.class) - public void save(){ + public void save() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -51,7 +51,7 @@ public class TransportCompanyController extends Controller { * 删除 transport_company 物流公司 */ @Before(TransportCompanyPKValidator.class) - public void del(){ + public void del() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -67,7 +67,7 @@ public class TransportCompanyController extends Controller { * 恢复 transport_company 物流公司 */ @Before(TransportCompanyPKValidator.class) - public void restore(){ + public void restore() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -83,7 +83,7 @@ public class TransportCompanyController extends Controller { * 修改 transport_company 物流公司 */ @Before(TransportCompanyValidator.class) - public void edit(){ + public void edit() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); if (tokenuser == null) { @@ -98,10 +98,10 @@ public class TransportCompanyController extends Controller { /** * 分页查找 transport_company 物流公司 */ - public void find(){ - PageParam pp = getBean(PageParam.class, "", true); - String name = get("name"); - Integer del = getInt("del"); + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + String name = get("name"); + Integer del = getInt("del"); renderJson(Result.object(TransportCompanyService.me.find(pp, name, del))); } @@ -109,7 +109,7 @@ public class TransportCompanyController extends Controller { * 按主键查找单个对象 transport_company 物流公司 */ @Before(TransportCompanyPKValidator.class) - public void findByPk(){ + public void findByPk() { TransportCompany model = getModel(TransportCompany.class, "", true); // 忽略不在model中的字段 renderJson(TransportCompanyService.me.findByPk(model)); } @@ -118,7 +118,7 @@ public class TransportCompanyController extends Controller { * 按主键查找单个对象 transport_company 物流公司 */ @Before(TransportCompanyPKValidator.class) - public void get(){ + public void get() { TransportCompany model = getModel(TransportCompany.class, "", true); // 忽略不在model中的字段 renderJson(TransportCompanyService.me.findByPk(model)); } @@ -126,7 +126,7 @@ public class TransportCompanyController extends Controller { /** * 返回所有 transport_company 物流公司 */ - public void list(){ + public void list() { renderJson(Result.object(TransportCompanyService.me.list())); } } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java index 604e72c..f121625 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java @@ -13,14 +13,14 @@ import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.IAtom; public class TruckSyncService extends BaseSyncService { - public static TruckSyncService me = new TruckSyncService(); - private static Log log = Log.getLog(TruckSyncService.class); + public static TruckSyncService me = new TruckSyncService(); + private static Log log = Log.getLog(TruckSyncService.class); public Result save(Truck model, Sysuser sysuser) { - int trans_co_id = model.getTransCoId(); - TransportCompany tco = TransportCompany.dao.findById(trans_co_id); + int trans_co_id = model.getTransCoId(); + TransportCompany tco = TransportCompany.dao.findById(trans_co_id); - if(tco == null){ + if (tco == null) { return Result.failed("未找到对应物流公司信息"); } @@ -67,10 +67,10 @@ public class TruckSyncService extends BaseSyncService { } public Result update(Truck model, Sysuser sysuser) { - int trans_co_id = model.getTransCoId(); - TransportCompany tco = TransportCompany.dao.findById(trans_co_id); + int trans_co_id = model.getTransCoId(); + TransportCompany tco = TransportCompany.dao.findById(trans_co_id); - if(tco == null){ + if (tco == null) { return Result.failed("未找到对应物流公司信息"); } @@ -79,11 +79,12 @@ public class TruckSyncService extends BaseSyncService { /** * 车辆有逻辑删除 + * * @param model * @param sysuser * @return */ - public Result delete(Truck model, Sysuser sysuser){ + public Result delete(Truck model, Sysuser sysuser) { try { // 注意这里有 ！，找到后才做 update 操作 BaseModel oldobj = (BaseModel) model.findByPk(); @@ -133,7 +134,7 @@ public class TruckSyncService extends BaseSyncService { } } - public Result restore(Truck model, Sysuser sysuser){ + public Result restore(Truck model, Sysuser sysuser) { try { // 注意这里有 ！，找到后才做 update 操作 BaseModel oldobj = (BaseModel) model.findByPk();