From 59107fee737e041f16966f1f16de92e1ef1afac5 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Thu, 23 Sep 2021 14:26:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A0=82=E7=AB=99=E5=B9=B4?= =?UTF-8?q?=E4=BA=A7=E9=87=8F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cowr/common/utils/DateTimeUtil.java | 5 ++ .../java/com/cowr/model/SupermarketYield.java | 14 +++ .../main/java/com/cowr/model/_MappingKit.java | 2 + .../cowr/model/base/BaseSupermarketYield.java | 90 +++++++++++++++++++ .../ssjygl/stat/sale/OrderStatService.java | 51 +++++++---- .../yield/SupermarketYieldService.java | 59 ++++++++++++ .../src/main/java/generator/Main.java | 1 + .../com/cowr/local/ssjygl/main/Config.java | 2 + .../yield/SupermarketYieldController.java | 22 +++++ .../com/cowr/service/ssjygl/main/Config.java | 4 +- .../yield/SupermarketYieldController.java | 87 ++++++++++++++++++ .../yield/SupermarketYieldPKValidator.java | 27 ++++++ .../yield/SupermarketYieldSyncService.java | 15 ++++ .../yield/SupermarketYieldValidator.java | 45 ++++++++++ 14 files changed, 405 insertions(+), 19 deletions(-) create mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketYield.java create mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketYield.java create mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java create mode 100644 ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java create mode 100644 ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldController.java create mode 100644 ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldPKValidator.java create mode 100644 ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldSyncService.java create mode 100644 ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldValidator.java 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 cc95e36..432abde 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 @@ -20,6 +20,11 @@ public class DateTimeUtil { return new SimpleDateFormat("yyyy-01-01"); } }; + public static final ThreadLocal year = new ThreadLocal() { + protected SimpleDateFormat initialValue() { + return new SimpleDateFormat("yyyy"); + } + }; public static final ThreadLocal month_start = new ThreadLocal() { protected SimpleDateFormat initialValue() { return new SimpleDateFormat("yyyy-01-01"); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketYield.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketYield.java new file mode 100644 index 0000000..351d191 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/SupermarketYield.java @@ -0,0 +1,14 @@ +package com.cowr.model; + +import com.cowr.model.base.BaseSupermarketYield; + +/** + * Generated by COWR Thu Sep 23 10:25:34 CST 2021 + * TableName: supermarket_yield + * Remarks: 基础配置 - 超市计划产量 + * PrimaryKey: supermarket_id,year + */ +@SuppressWarnings("serial") +public class SupermarketYield extends BaseSupermarketYield { + public static final SupermarketYield dao = new SupermarketYield().dao(); +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java index 1db297b..b0e442c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java @@ -34,6 +34,8 @@ public class _MappingKit { arp.addMapping("supermarket_product", "supermarket_id,product_id", SupermarketProduct.class); // Composite Primary Key order: supermarket_id,customer_id arp.addMapping("supermarket_customer_distance", "supermarket_id,customer_id", SupermarketCustomerDistance.class); + // Composite Primary Key order: supermarket_id,year + arp.addMapping("supermarket_yield", "supermarket_id,year", SupermarketYield.class); arp.addMapping("blacklist", "id", Blacklist.class); arp.addMapping("truck", "license", Truck.class); arp.addMapping("purchase", "id", Purchase.class); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketYield.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketYield.java new file mode 100644 index 0000000..48946d0 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSupermarketYield.java @@ -0,0 +1,90 @@ +package com.cowr.model.base; + +import com.cowr.common.base.BaseModel; +import com.jfinal.plugin.activerecord.IBean; +import com.alibaba.fastjson.annotation.JSONField; + +/** + * Generated by COWR Thu Sep 23 10:25:33 CST 2021 + * TableName: supermarket_yield + * Remarks: 基础配置 - 超市计划产量 + * PrimaryKey: supermarket_id,year + */ +@SuppressWarnings("serial") +public abstract class BaseSupermarketYield> extends BaseModel implements IBean { + + public static final String tablename = "supermarket_yield"; + + @JSONField(serialize=false) + public String getTablename(){ + return tablename; + } + + /** + * name: supermarket_id + * type: INT(10) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * @param supermarketId + */ + @JSONField(name="supermarket_id") + public void setSupermarketId(Integer supermarketId) { + set("supermarket_id", supermarketId); + } + + + /** + * @return supermarket_id + */ + @JSONField(name="supermarket_id") + public Integer getSupermarketId() { + return getInt("supermarket_id"); + } + + /** + * name: year + * type: CHAR(4) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * @param year 年度YYYY + */ + @JSONField(name="year") + public void setYear(String year) { + set("year", year); + } + + + /** + * @return year 年度YYYY + */ + @JSONField(name="year") + public String getYear() { + return getStr("year"); + } + + /** + * name: yield + * type: DOUBLE(10,2) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param yield 年产量，万吨 + */ + @JSONField(name="yield") + public void setYield(Double yield) { + set("yield", yield); + } + + + /** + * @return yield 年产量，万吨 + */ + @JSONField(name="yield") + public Double getYield() { + return getDouble("yield"); + } + + +} 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 298b4d7..81c76aa 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 @@ -2017,7 +2017,7 @@ public class OrderStatService { public Workbook trafficStatisticsOfEachSandStationExport(String stm, String etm, String tm, Integer invoice_type) { Record data = trafficStatisticsOfEachSandStation(stm, etm, tm, invoice_type); List list = data.get("data"); - List sups = data.get("supermarket"); + List sups = data.get("supermarket"); Workbook wb = new XSSFWorkbook(); Sheet sheet = wb.createSheet(stm.substring(0, 10) + " ~ " + etm.substring(0, 10) + "各砂站运输量统计表"); @@ -2036,29 +2036,36 @@ public class OrderStatService { row.createCell(a++).setCellValue("退费金额（元）"); Row row2 = sheet.createRow(1); + Row row3 = sheet.createRow(2); int a2 = 8; - for (Supermarket s : sups) { - row.createCell(a).setCellValue(s.getName()); + for (int i=0; i sups = Supermarket.dao.find("select * from supermarket where id <= 6"); + String year = DateTimeUtil.year.get().format(new Date()); + + if (StrKit.notBlank(tm) && tm.length() > 4) { + year = tm.substring(0, 4); + } + + List sups = Db.find("select t.*, s.yield from supermarket t \n" + + " left join supermarket_yield s on s.supermarket_id = t.id and s.year = ? \n" + + " where id <= 6", year); String paramsSql = ""; if (invoice_type != null) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java new file mode 100644 index 0000000..3687f1d --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/yield/SupermarketYieldService.java @@ -0,0 +1,59 @@ +package com.cowr.ssjygl.supermarket.yield; + +import com.cowr.common.Const; +import com.cowr.common.base.BaseService; +import com.cowr.common.view.PageParam; +import com.cowr.model.SupermarketYield; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; +import com.jfinal.plugin.activerecord.Record; + +import java.util.ArrayList; +import java.util.List; + +/** + * Generated by COWR Thu Sep 23 10:25:40 CST 2021 + * TableName: supermarket_yield + * Remarks: 基础配置 - 超市计划产量 + * PrimaryKey: supermarket_id,year + */ +public class SupermarketYieldService extends BaseService { + private static final Log log = Log.getLog(SupermarketYieldService.class); + public static final SupermarketYieldService me = new SupermarketYieldService(); + + public Page find(PageParam pp, Integer supermarket_id, String year) { + String selectsql = "select t.*, s.name supermarket_name "; + String fromsql = "from supermarket_yield t \n" + + " left join supermarket s on s.id = t.supermarket_id \n" + + " where 1=1 "; + List paraList = new ArrayList<>(); + + if (supermarket_id != null) { + fromsql += " and t.supermarket_id = ? \n"; + paraList.add(supermarket_id); + } + + if (StrKit.notBlank(year)) { + fromsql += " and t.year = ? \n"; + paraList.add(year); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && SupermarketYield.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } + + return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + } +} diff --git a/ssjygl-xsx-common/src/main/java/generator/Main.java b/ssjygl-xsx-common/src/main/java/generator/Main.java index d64e1eb..446b162 100644 --- a/ssjygl-xsx-common/src/main/java/generator/Main.java +++ b/ssjygl-xsx-common/src/main/java/generator/Main.java @@ -84,6 +84,7 @@ public class Main { "ticket_log", "ticket_receive", "customer_type", + "supermarket_yield", }; PropKit.use("db.properties"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 6277a16..7af9e7d 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -51,6 +51,7 @@ import com.cowr.local.ssjygl.supermarket.receiverdistance.SupermarketReceiverDis import com.cowr.local.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceController; import com.cowr.local.ssjygl.supermarket.stock.StockController; import com.cowr.local.ssjygl.supermarket.stock.StockSyncService; +import com.cowr.local.ssjygl.supermarket.yield.SupermarketYieldController; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.local.ssjygl.system.sysuser.SysuserController; import com.cowr.local.ssjygl.ticket.invalidverify.TicketInvalidVerifyController; @@ -192,6 +193,7 @@ public class Config extends JFinalConfig { me.add("/supermarket/ssd", SupermarketSandfarmDistanceController.class); me.add("/supermarket/srd", SupermarketReceiverDistanceController.class); me.add("/supermarket/scd", SupermarketCustomerDistanceController.class); + me.add("/supermarket/yield", SupermarketYieldController.class); me.add("/purchase", PurchaseController.class); me.add("/product", ProductController.class); me.add("/stock", StockController.class); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java new file mode 100644 index 0000000..73facab --- /dev/null +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/supermarket/yield/SupermarketYieldController.java @@ -0,0 +1,22 @@ +package com.cowr.local.ssjygl.supermarket.yield; + +import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; +import com.cowr.ssjygl.supermarket.yield.SupermarketYieldService; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Thu Sep 23 10:25:40 CST 2021 + * TableName: supermarket_yield + * Remarks: 基础配置 - 超市计划产量 + * PrimaryKey: supermarket_id,year + */ +public class SupermarketYieldController extends Controller { + /** + * 分页查找 supermarket_yield 基础配置 - 超市计划产量 + */ + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + renderJson(Result.object(SupermarketYieldService.me.find(pp, getInt("supermarket_id"), get("year")))); + } +} 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 cadaf5d..f3b79dc 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 @@ -49,6 +49,7 @@ import com.cowr.service.ssjygl.supermarket.customerdistance.SupermarketCustomerD import com.cowr.service.ssjygl.supermarket.receiverdistance.SupermarketReceiverDistanceController; import com.cowr.service.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceController; import com.cowr.service.ssjygl.supermarket.stock.StockController; +import com.cowr.service.ssjygl.supermarket.yield.SupermarketYieldController; import com.cowr.service.ssjygl.synctask.SyncTaskService; import com.cowr.service.ssjygl.system.sysuser.SysuserController; import com.cowr.service.ssjygl.ticket.invalidverify.TicketInvalidVerifyController; @@ -58,7 +59,6 @@ import com.cowr.service.ssjygl.transport.TransportQueryController; import com.cowr.service.ssjygl.transportcompany.TransportCompanyController; import com.cowr.service.ssjygl.truck.TruckController; import com.cowr.service.ssjygl.truck.truckweightlimit.TruckWeightLimitController; -import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController; import com.cowr.ssjygl.CacheData; import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController; import com.cowr.ssjygl.cctv.CctvController; @@ -69,6 +69,7 @@ import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController; import com.cowr.ssjygl.stat.transfer.OrderTransferStatController; import com.cowr.ssjygl.transportcompany.TransportCompanyService; import com.cowr.ssjygl.transprice.TransPriceService; +import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController; import com.jfinal.config.*; import com.jfinal.json.FastJsonFactory; import com.jfinal.kit.PathKit; @@ -167,6 +168,7 @@ public class Config extends JFinalConfig { me.add("/supermarket/ssd", SupermarketSandfarmDistanceController.class); me.add("/supermarket/srd", SupermarketReceiverDistanceController.class); me.add("/supermarket/scd", SupermarketCustomerDistanceController.class); + me.add("/supermarket/yield", SupermarketYieldController.class); me.add("/purchase", PurchaseController.class); me.add("/product", ProductController.class); me.add("/stock", StockController.class); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldController.java new file mode 100644 index 0000000..12b2f3d --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldController.java @@ -0,0 +1,87 @@ +package com.cowr.service.ssjygl.supermarket.yield; + +import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; +import com.cowr.model.SupermarketYield; +import com.cowr.model.Sysuser; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; +import com.cowr.ssjygl.supermarket.yield.SupermarketYieldService; +import com.jfinal.aop.Before; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Thu Sep 23 10:25:40 CST 2021 + * TableName: supermarket_yield + * Remarks: 基础配置 - 超市计划产量 + * PrimaryKey: supermarket_id,year + */ +public class SupermarketYieldController extends Controller { + + /** + * 新增 supermarket_yield 基础配置 - 超市计划产量 + */ + @Before(SupermarketYieldValidator.class) + public void save() { + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + SupermarketYield model = getModel(SupermarketYield.class, "", true); // 忽略不在model中的字段 + renderJson(SupermarketYieldSyncService.me.save(model, tokenuser)); + } + + /** + * 删除 supermarket_yield 基础配置 - 超市计划产量 + */ + @Before(SupermarketYieldPKValidator.class) + public void del() { + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + SupermarketYield model = getModel(SupermarketYield.class, "", true); // 忽略不在model中的字段 + renderJson(SupermarketYieldSyncService.me.delete(model, tokenuser)); + } + + /** + * 恢复 supermarket_yield 基础配置 - 超市计划产量 + */ + @Before(SupermarketYieldPKValidator.class) + public void restore() { + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + SupermarketYield model = getModel(SupermarketYield.class, "", true); // 忽略不在model中的字段 + renderJson(SupermarketYieldSyncService.me.restore(model, tokenuser)); + } + + /** + * 修改 supermarket_yield 基础配置 - 超市计划产量 + */ + @Before(SupermarketYieldValidator.class) + public void edit() { + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + SupermarketYield model = getModel(SupermarketYield.class, "", true); // 忽略不在model中的字段 + renderJson(SupermarketYieldSyncService.me.update(model, tokenuser)); + } + + /** + * 分页查找 supermarket_yield 基础配置 - 超市计划产量 + */ + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + renderJson(Result.object(SupermarketYieldService.me.find(pp, getInt("supermarket_id"), get("year")))); + } +} diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldPKValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldPKValidator.java new file mode 100644 index 0000000..d8e3eec --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldPKValidator.java @@ -0,0 +1,27 @@ +package com.cowr.service.ssjygl.supermarket.yield; + + +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.cowr.model.SupermarketYield; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Thu Sep 23 10:25:40 CST 2021 + * TableName: supermarket_yield + * Remarks: 基础配置 - 超市计划产量 + * PrimaryKey: supermarket_id,year + */ +public class SupermarketYieldPKValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + validateRequired("supermarket_id", "supermarket_id", "supermarket_id 必填"); + validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); + validateRequired("year", "year", "year 必填"); + validateString("year", 1, 4, "year", "year 长度 1~4"); + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} \ No newline at end of file diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldSyncService.java new file mode 100644 index 0000000..f32e9a5 --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldSyncService.java @@ -0,0 +1,15 @@ +package com.cowr.service.ssjygl.supermarket.yield; + +import com.cowr.service.ssjygl.base.BaseSyncService; +import com.jfinal.log.Log; + +/** + * Generated by COWR Thu Sep 23 10:25:40 CST 2021 + * TableName: supermarket_yield + * Remarks: 基础配置 - 超市计划产量 + * PrimaryKey: supermarket_id,year + */ +public class SupermarketYieldSyncService extends BaseSyncService { + private static final Log log = Log.getLog(SupermarketYieldSyncService.class); + public static final SupermarketYieldSyncService me = new SupermarketYieldSyncService(); +} diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldValidator.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldValidator.java new file mode 100644 index 0000000..89827f3 --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/yield/SupermarketYieldValidator.java @@ -0,0 +1,45 @@ +package com.cowr.service.ssjygl.supermarket.yield; + +import com.jfinal.core.Controller; +import com.jfinal.kit.StrKit; +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.cowr.model.SupermarketYield; + +/** + * Generated by COWR Thu Sep 23 10:25:40 CST 2021 + * TableName: supermarket_yield + * Remarks: 基础配置 - 超市计划产量 + * PrimaryKey: supermarket_id,year + */ +public class SupermarketYieldValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + // 默认新增时，前端不需要传主键。若需要前端传主键，需要去掉这个判断 + if (!"save".equals(getActionMethodName())) { + validateRequired("supermarket_id", "supermarket_id", "supermarket_id 必填"); + + validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); + } + // 默认新增时，前端不需要传主键。若需要前端传主键，需要去掉这个判断 + if (!"save".equals(getActionMethodName())) { + validateRequired("year", "year", "year 必填"); + + validateString("year", 1, 4, "year", "year 长度 1~4"); + } + if (StrKit.notBlank(c.get("yield"))) { // 可为空字段，当传入值时，才做验证 + validateDouble("yield", -9.99999999E8, 9.99999999E8, "yield", "yield 范围 -9.99999999E8~9.99999999E8"); + } + + // 使用 model 更新时，model 不能只有主键有值 + // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 + // 如果确实是需要将主键外的字段置为 null，可以在代码生成后删掉这段 + if ("edit".equals(getActionMethodName())) { + validateUpdateModel(SupermarketYield.class, "", true); // 忽略不在model中的字段 + } + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} \ No newline at end of file