diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimit.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimit.java new file mode 100644 index 0000000..2132f60 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimit.java @@ -0,0 +1,14 @@ +package com.cowr.model; + +import com.cowr.model.base.BaseTruckWeightLimit; + +/** + * Generated by COWR Tue Aug 11 23:48:13 CST 2021 + * TableName: truck_weight_limit + * Remarks: + * PrimaryKey: truck_license + */ +@SuppressWarnings("serial") +public class TruckWeightLimit extends BaseTruckWeightLimit { + public static final TruckWeightLimit dao = new TruckWeightLimit().dao(); +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimitModifyLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimitModifyLog.java new file mode 100644 index 0000000..8baa323 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/TruckWeightLimitModifyLog.java @@ -0,0 +1,14 @@ +package com.cowr.model; + +import com.cowr.model.base.BaseTruckWeightLimitModifyLog; + +/** + * Generated by COWR Tue Aug 11 23:48:13 CST 2021 + * TableName: truck_weight_limit_modify_log + * Remarks: + * PrimaryKey: id + */ +@SuppressWarnings("serial") +public class TruckWeightLimitModifyLog extends BaseTruckWeightLimitModifyLog { + public static final TruckWeightLimitModifyLog dao = new TruckWeightLimitModifyLog().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 9c4d3c1..1db297b 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 @@ -81,6 +81,8 @@ public class _MappingKit { arp.addMapping("order_transfer", "sn", OrderTransfer.class); // Composite Primary Key order: supermarket_id,product_id arp.addMapping("stock", "supermarket_id,product_id", Stock.class); + arp.addMapping("truck_weight_limit", "truck_license", TruckWeightLimit.class); + arp.addMapping("truck_weight_limit_modify_log", "id", TruckWeightLimitModifyLog.class); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java new file mode 100644 index 0000000..6347ccd --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimit.java @@ -0,0 +1,178 @@ +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 Tue Aug 11 23:48:13 CST 2021 + * TableName: truck_weight_limit + * Remarks: + * PrimaryKey: truck_license + */ +@SuppressWarnings("serial") +public abstract class BaseTruckWeightLimit> extends BaseModel implements IBean { + + public static final String tablename = "truck_weight_limit"; + + @JSONField(serialize=false) + public String getTablename(){ + return tablename; + } + + /** + * name: truck_license + * type: VARCHAR(10) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * @param truckLicense 车牌 + */ + @JSONField(name="truck_license") + public void setTruckLicense(String truckLicense) { + set("truck_license", truckLicense); + } + + + /** + * @return truck_license 车牌 + */ + @JSONField(name="truck_license") + public String getTruckLicense() { + return getStr("truck_license"); + } + + /** + * name: weight_limit + * type: DECIMAL(12,2) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param weightLimit 限重值 + */ + @JSONField(name="weight_limit") + public void setWeightLimit(java.math.BigDecimal weightLimit) { + set("weight_limit", weightLimit); + } + + + /** + * @return weight_limit 限重值 + */ + @JSONField(name="weight_limit") + public java.math.BigDecimal getWeightLimit() { + return get("weight_limit"); + } + + /** + * name: attachment + * type: TEXT(65535) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param attachment + */ + @JSONField(name="attachment") + public void setAttachment(String attachment) { + set("attachment", attachment); + } + + + /** + * @return attachment + */ + @JSONField(name="attachment") + public String getAttachment() { + return getStr("attachment"); + } + + /** + * name: create_user_id + * type: INT(10) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param createUserId 创建人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") + public Integer getCreateUserId() { + return getInt("create_user_id"); + } + + /** + * name: create_user_name + * type: VARCHAR(20) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param createUserName 创建人姓名 + */ + @JSONField(name="create_user_name") + public void setCreateUserName(String createUserName) { + set("create_user_name", createUserName); + } + + + /** + * @return create_user_name 创建人姓名 + */ + @JSONField(name="create_user_name") + public String getCreateUserName() { + return getStr("create_user_name"); + } + + /** + * name: create_time + * type: DATETIME(19) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param createTime 创建时间 + */ + @JSONField(name="create_time") + public void setCreateTime(java.util.Date createTime) { + set("create_time", createTime); + } + + + /** + * @return create_time 创建时间 + */ + @JSONField(name="create_time") + public java.util.Date getCreateTime() { + return get("create_time"); + } + + /** + * name: change_time + * type: TIMESTAMP(19) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * @param changeTime 修改时间 + */ + @JSONField(name="change_time") + public void setChangeTime(java.util.Date changeTime) { + set("change_time", changeTime); + } + + + /** + * @return 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/BaseTruckWeightLimitModifyLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java new file mode 100644 index 0000000..aa12570 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseTruckWeightLimitModifyLog.java @@ -0,0 +1,178 @@ +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 Tue Aug 11 23:48:13 CST 2021 + * TableName: truck_weight_limit_modify_log + * Remarks: + * PrimaryKey: id + */ +@SuppressWarnings("serial") +public abstract class BaseTruckWeightLimitModifyLog> extends BaseModel implements IBean { + + public static final String tablename = "truck_weight_limit_modify_log"; + + @JSONField(serialize=false) + public String getTablename(){ + return tablename; + } + + /** + * name: id + * type: INT UNSIGNED(10) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * @param id 主键 + */ + @JSONField(name="id") + public void setId(Long id) { + set("id", id); + } + + + /** + * @return id 主键 + */ + @JSONField(name="id") + public Long getId() { + return getLong("id"); + } + + /** + * name: truck_license + * type: VARCHAR(10) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param truckLicense 车牌 + */ + @JSONField(name="truck_license") + public void setTruckLicense(String truckLicense) { + set("truck_license", truckLicense); + } + + + /** + * @return truck_license 车牌 + */ + @JSONField(name="truck_license") + public String getTruckLicense() { + return getStr("truck_license"); + } + + /** + * name: weight_limit + * type: DECIMAL(12,2) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param weightLimit 限重值 + */ + @JSONField(name="weight_limit") + public void setWeightLimit(java.math.BigDecimal weightLimit) { + set("weight_limit", weightLimit); + } + + + /** + * @return weight_limit 限重值 + */ + @JSONField(name="weight_limit") + public java.math.BigDecimal getWeightLimit() { + return get("weight_limit"); + } + + /** + * name: attachment + * type: TEXT(65535) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param attachment + */ + @JSONField(name="attachment") + public void setAttachment(String attachment) { + set("attachment", attachment); + } + + + /** + * @return attachment + */ + @JSONField(name="attachment") + public String getAttachment() { + return getStr("attachment"); + } + + /** + * name: change_user_id + * type: INT(10) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param changeUserId + */ + @JSONField(name="change_user_id") + public void setChangeUserId(Integer changeUserId) { + set("change_user_id", changeUserId); + } + + + /** + * @return change_user_id + */ + @JSONField(name="change_user_id") + public Integer getChangeUserId() { + return getInt("change_user_id"); + } + + /** + * name: change_user_name + * type: VARCHAR(20) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param changeUserName + */ + @JSONField(name="change_user_name") + public void setChangeUserName(String changeUserName) { + set("change_user_name", changeUserName); + } + + + /** + * @return change_user_name + */ + @JSONField(name="change_user_name") + public String getChangeUserName() { + return getStr("change_user_name"); + } + + /** + * name: change_time + * type: TIMESTAMP(19) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * @param changeTime 修改时间 + */ + @JSONField(name="change_time") + public void setChangeTime(java.util.Date changeTime) { + set("change_time", changeTime); + } + + + /** + * @return 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/ssjygl/truck/weightlimit/TruckWeightLimitPKValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitPKValidator.java new file mode 100644 index 0000000..3501c36 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitPKValidator.java @@ -0,0 +1,25 @@ +package com.cowr.ssjygl.truck.weightlimit; + + +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.cowr.model.TruckWeightLimit; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Tue Aug 11 23:48:17 CST 2021 + * TableName: truck_weight_limit + * Remarks: + * PrimaryKey: truck_license + */ +public class TruckWeightLimitPKValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + validateRequired("truck_license", "truck_license", "车牌不能为空"); + validateString("truck_license", 1, 10, "truck_license", "truck_license 长度 1~10"); + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} \ No newline at end of file diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitValidator.java new file mode 100644 index 0000000..4987f46 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimit/TruckWeightLimitValidator.java @@ -0,0 +1,38 @@ +package com.cowr.ssjygl.truck.weightlimit; + +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.TruckWeightLimit; + +/** + * Generated by COWR Tue Aug 11 23:48:17 CST 2021 + * TableName: truck_weight_limit + * Remarks: + * PrimaryKey: truck_license + */ +public class TruckWeightLimitValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + validateRequired("truck_license", "truck_license", "车牌不能为空"); + validateString("truck_license", 1, 10, "truck_license", "truck_license 长度 1~10"); + + validateRequired("weight_limit", "weight_limit", "限重不能为空"); + validateBigDecimal("weight_limit", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "weight_limit", "weight_limit 范围 -9.9999999999E10~9.9999999999E10"); + + validateRequired("attachment", "attachment", "附件不能为空"); + validateString("attachment", 1, 65535, "attachment", "attachment 长度 1~65535"); + + // 使用 model 更新时，model 不能只有主键有值 + // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 + // 如果确实是需要将主键外的字段置为 null，可以在代码生成后删掉这段 + if ("edit".equals(getActionMethodName())) { + validateUpdateModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段 + } + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} \ No newline at end of file diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java new file mode 100644 index 0000000..8ff6d6d --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java @@ -0,0 +1,43 @@ +package com.cowr.ssjygl.truck.weightlimitmodifylog; + +import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; +import com.cowr.model.TruckWeightLimitModifyLog; +import com.jfinal.aop.Before; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Tue Aug 11 23:48:17 CST 2021 + * TableName: truck_weight_limit_modify_log + * Remarks: + * PrimaryKey: id + */ +public class TruckWeightLimitModifyLogController extends Controller { + + /** + * 分页查找 truck_weight_limit_modify_log + */ + public void find(){ + PageParam pp = getBean(PageParam.class, "", true); + String truck_license = get("truck_license"); + renderJson(Result.object(TruckWeightLimitModifyLogService.me.find(pp, truck_license))); + } + + + /** + * 按主键查找单个对象 truck_weight_limit_modify_log + */ + @Before(TruckWeightLimitModifyLogPKValidator.class) + public void get(){ + TruckWeightLimitModifyLog model = getModel(TruckWeightLimitModifyLog.class, "", true); // 忽略不在model中的字段 + renderJson(TruckWeightLimitModifyLogService.me.findByPk(model)); + } + + /** + * 返回所有 truck_weight_limit_modify_log + */ + public void list(){ + String truck_license = get("truck_license"); + renderJson(Result.object(TruckWeightLimitModifyLogService.me.list(truck_license))); + } +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java new file mode 100644 index 0000000..059b6ea --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogPKValidator.java @@ -0,0 +1,25 @@ +package com.cowr.ssjygl.truck.weightlimitmodifylog; + + +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.cowr.model.TruckWeightLimitModifyLog; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Tue Aug 11 23:48:17 CST 2021 + * TableName: truck_weight_limit_modify_log + * Remarks: + * PrimaryKey: id + */ +public class TruckWeightLimitModifyLogPKValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + validateRequired("id", "id", "id 必填"); + validateLong("id", 1, 2147483647, "id", "id 范围 1~2147483647"); + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} \ No newline at end of file diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java new file mode 100644 index 0000000..9cc8518 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java @@ -0,0 +1,61 @@ +package com.cowr.ssjygl.truck.weightlimitmodifylog; + +import com.cowr.common.Const; +import com.cowr.common.base.BaseService; +import com.cowr.common.view.PageParam; +import com.cowr.model.TruckWeightLimitModifyLog; +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 Tue Aug 11 23:48:17 CST 2021 + * TableName: truck_weight_limit_modify_log + * Remarks: + * PrimaryKey: id + */ +public class TruckWeightLimitModifyLogService extends BaseService { + private static final Log log = Log.getLog(TruckWeightLimitModifyLogService.class); + public static final TruckWeightLimitModifyLogService me = new TruckWeightLimitModifyLogService(); + + public Page find(PageParam pp, String truck_license) { + String selectsql = "select * "; + String fromsql = "from truck_weight_limit_modify_log t where 1=1 "; + List paraList = new ArrayList<>(); + + 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; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && TruckWeightLimitModifyLog.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } else { + findSql += " order by t.change_time desc "; + } + + return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + } + + public List list(String truck_license) { + String sql = "select * from truck_weight_limit_modify_log t where 1=1\n"; + if (StrKit.notBlank(truck_license)) { + sql += " and t.truck_license like %" + truck_license.trim() + "%"; + } + return TruckWeightLimitModifyLog.dao.find(sql); + } +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java new file mode 100644 index 0000000..abdcb92 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogValidator.java @@ -0,0 +1,57 @@ +package com.cowr.ssjygl.truck.weightlimitmodifylog; + +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.TruckWeightLimitModifyLog; + +/** + * Generated by COWR Tue Aug 11 23:48:17 CST 2021 + * TableName: truck_weight_limit_modify_log + * Remarks: + * PrimaryKey: id + */ +public class TruckWeightLimitModifyLogValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + // 默认新增时，前端不需要传主键。若需要前端传主键，需要去掉这个判断 + if (!"save".equals(getActionMethodName())) { + validateRequired("id", "id", "id 必填"); + + validateLong("id", 1, 2147483647, "id", "id 范围 1~2147483647"); + } + + validateString("truck_license", 1, 10, "truck_license", "truck_license 长度 1~10"); + + + validateBigDecimal("old_weight_limit", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "old_weight_limit", "old_weight_limit 范围 -9.9999999999E10~9.9999999999E10"); + + + validateBigDecimal("new_weight_limit", new java.math.BigDecimal(-9.9999999999E10), new java.math.BigDecimal(9.9999999999E10), "new_weight_limit", "new_weight_limit 范围 -9.9999999999E10~9.9999999999E10"); + + + validateString("attachment", 1, 65535, "attachment", "attachment 长度 1~65535"); + + if (StrKit.notBlank(c.get("change_user_id"))) { // 可为空字段，当传入值时，才做验证 + validateInteger("change_user_id", 1, 2147483647, "change_user_id", "change_user_id 范围 1~2147483647"); + } + + validateString("change_user_name", 0, 20, "change_user_name", "change_user_name 长度 0~20"); + + + validateString("change_time", 0, 19, "change_time", "change_time 长度 0~19"); + + + // 使用 model 更新时，model 不能只有主键有值 + // 这里用 getActionMethodName 写死，判断是 update 时，才做验证 + // 如果确实是需要将主键外的字段置为 null，可以在代码生成后删掉这段 + if ("edit".equals(getActionMethodName())) { + validateUpdateModel(TruckWeightLimitModifyLog.class, "", true); // 忽略不在model中的字段 + } + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} \ No newline at end of file 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 8f00b52..14e823b 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 @@ -59,6 +59,8 @@ import com.cowr.local.ssjygl.transport.TransportController; import com.cowr.local.ssjygl.transport.TransportQueryController; import com.cowr.local.ssjygl.transportcompany.TransportCompanyController; import com.cowr.local.ssjygl.truck.TruckController; +import com.cowr.local.ssjygl.truck.truckweightlimit.TruckWeightLimitController; +import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController; import com.cowr.model.Supermarket; import com.cowr.model._MappingKit; import com.cowr.ssjygl.CacheData; @@ -71,6 +73,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; @@ -196,6 +199,8 @@ public class Config extends JFinalConfig { // -- 物流公司相关 me.add("/transCo", TransportCompanyController.class); me.add("/truck", TruckController.class); + me.add("/truck/twl", TruckWeightLimitController.class); + me.add("/truck/twlml", TruckWeightLimitModifyLogController.class); me.add("/driver", DriverController.class); me.add("/blacklist", BlacklistController.class); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java new file mode 100644 index 0000000..a92ffce --- /dev/null +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java @@ -0,0 +1,59 @@ +package com.cowr.local.ssjygl.truck.truckweightlimit; + +import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; +import com.cowr.model.TruckWeightLimit; +import com.cowr.ssjygl.truck.weightlimit.TruckWeightLimitPKValidator; +import com.jfinal.aop.Before; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Tue Aug 11 23:48:17 CST 2021 + * TableName: truck_weight_limit + * Remarks: + * PrimaryKey: truck_license + */ +public class TruckWeightLimitController extends Controller { + + /** + * 按主键检查对象是否存在 + * 返回 code = 200 + * 存在时 data = true + * 不存在 data = false + */ + @Before(TruckWeightLimitPKValidator.class) + public void checkExistsByPk(){ + TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段 + renderJson(TruckWeightLimitService.me.checkExistsByPk(model)); + } + + + + /** + * 分页查找 truck_weight_limit + */ + public void find(){ + PageParam pp = getBean(PageParam.class, "", true); + String truck_license = get("truck_license"); + String stm = get("stm"); + String etm = get("etm"); + + renderJson(Result.object(TruckWeightLimitService.me.find(pp, truck_license, stm, etm))); + } + + /** + * 按主键查找单个对象 truck_weight_limit + */ + @Before(TruckWeightLimitPKValidator.class) + public void get(){ + TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段 + renderJson(TruckWeightLimitService.me.findByPk(model)); + } + + /** + * 返回所有 truck_weight_limit + */ + public void list(){ + renderJson(Result.object(TruckWeightLimitService.me.list())); + } +} diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitService.java new file mode 100644 index 0000000..b10f0f9 --- /dev/null +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitService.java @@ -0,0 +1,63 @@ +package com.cowr.local.ssjygl.truck.truckweightlimit; + +import com.cowr.common.Const; +import com.cowr.common.view.PageParam; +import com.cowr.local.ssjygl.base.BaseSyncService; +import com.cowr.model.TruckWeightLimit; +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; + + +public class TruckWeightLimitService extends BaseSyncService { + private static final Log log = Log.getLog(TruckWeightLimitService.class); + public static final TruckWeightLimitService me = new TruckWeightLimitService(); + + public Page find(PageParam pp, String truck_license, String stm, String etm) { + String selectsql = "select * "; + String fromsql = "from truck_weight_limit t where 1=1 "; + List paraList = new ArrayList<>(); + + if (StrKit.notBlank(truck_license)) { + fromsql += " and t.truck_license like ? \n"; + paraList.add("%" + truck_license.trim() + "%"); + } + + if (StrKit.notBlank(stm)) { + fromsql += " and t.create_time >= ? \n"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.create_time <= ? \n"; + paraList.add(etm); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && TruckWeightLimit.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } else { + findSql += " order by t.create_time desc "; + } + + return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + } + + public List list() { + return TruckWeightLimit.dao.find("select * from truck_weight_limit"); + } +} 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 83fb087..0f40e00 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 @@ -57,6 +57,8 @@ import com.cowr.service.ssjygl.ticket.receive.TicketReceiveController; 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; @@ -68,6 +70,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; @@ -176,6 +179,8 @@ public class Config extends JFinalConfig { // -- 物流公司相关 me.add("/transCo", TransportCompanyController.class); me.add("/truck", TruckController.class); + me.add("/truck/twl", TruckWeightLimitController.class); + me.add("/truck/twlml", TruckWeightLimitModifyLogController.class); me.add("/driver", DriverController.class); me.add("/blacklist", BlacklistController.class); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java new file mode 100644 index 0000000..2470cca --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitController.java @@ -0,0 +1,108 @@ +package com.cowr.service.ssjygl.truck.truckweightlimit; + +import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; +import com.cowr.model.Sysuser; +import com.cowr.model.TruckWeightLimit; +import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; +import com.cowr.ssjygl.truck.weightlimit.TruckWeightLimitPKValidator; +import com.cowr.ssjygl.truck.weightlimit.TruckWeightLimitValidator; +import com.jfinal.aop.Before; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Tue Aug 11 23:48:17 CST 2021 + * TableName: truck_weight_limit + * Remarks: + * PrimaryKey: truck_license + */ +public class TruckWeightLimitController extends Controller { + + /** + * 按主键检查对象是否存在 + * 返回 code = 200 + * 存在时 data = true + * 不存在 data = false + */ + @Before(TruckWeightLimitPKValidator.class) + public void checkExistsByPk(){ + TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段 + renderJson(TruckWeightLimitSyncService.me.checkExistsByPk(model)); + } + + /** + * 新增 truck_weight_limit + */ + @Before(TruckWeightLimitValidator.class) + public void save(){ + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + + TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段 + renderJson(TruckWeightLimitSyncService.me.save(model, tokenuser)); + } + + /** + * 修改 truck_weight_limit + */ + @Before(TruckWeightLimitValidator.class) + public void edit(){ + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + + TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段 + renderJson(TruckWeightLimitSyncService.me.update(model, tokenuser)); + } + + /** + * 删除 truck_weight_limit + */ + @Before(TruckWeightLimitPKValidator.class) + public void del(){ + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + + TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段 + renderJson(TruckWeightLimitSyncService.me.delete(model, tokenuser)); + } + + /** + * 分页查找 truck_weight_limit + */ + public void find(){ + PageParam pp = getBean(PageParam.class, "", true); + String truck_license = get("truck_license"); + String stm = get("stm"); + String etm = get("etm"); + + renderJson(Result.object(TruckWeightLimitSyncService.me.find(pp, truck_license, stm, etm))); + } + + /** + * 按主键查找单个对象 truck_weight_limit + */ + @Before(TruckWeightLimitPKValidator.class) + public void get(){ + TruckWeightLimit model = getModel(TruckWeightLimit.class, "", true); // 忽略不在model中的字段 + renderJson(TruckWeightLimitSyncService.me.findByPk(model)); + } + + /** + * 返回所有 truck_weight_limit + */ + public void list(){ + renderJson(Result.object(TruckWeightLimitSyncService.me.list())); + } +} diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java new file mode 100644 index 0000000..4a4485f --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java @@ -0,0 +1,220 @@ +package com.cowr.service.ssjygl.truck.truckweightlimit; + +import com.cowr.common.Const; +import com.cowr.common.enums.Enums; +import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; +import com.cowr.model.SyncTask; +import com.cowr.model.Sysuser; +import com.cowr.model.TruckWeightLimit; +import com.cowr.model.TruckWeightLimitModifyLog; +import com.cowr.service.ssjygl.base.BaseSyncService; +import com.cowr.service.ssjygl.synctask.SyncTaskService; +import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.IAtom; +import com.jfinal.plugin.activerecord.Page; +import com.jfinal.plugin.activerecord.Record; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + + +public class TruckWeightLimitSyncService extends BaseSyncService { + private static final Log log = Log.getLog(TruckWeightLimitSyncService.class); + public static final TruckWeightLimitSyncService me = new TruckWeightLimitSyncService(); + + + public Result save(TruckWeightLimit model, Sysuser sysuser) { + TruckWeightLimit obj = model.findByPk(); + + if (obj != null) { + return Result.failedstr("车牌 %s 限重值已设置", model.getTruckLicense()); + } + + model.setCreateUserId(sysuser.getId()); + model.setCreateUserName(sysuser.getName()); + model.setCreateTime(new Date()); + model.setChangeTime(new Date()); + + SyncTask synctask = new SyncTask(); + + boolean ret = Db.tx(new IAtom() { + @Override + public boolean run() { + TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); + modifyLog.setTruckLicense(model.getTruckLicense()); + modifyLog.setWeightLimit(model.getWeightLimit()); + modifyLog.setAttachment(model.getAttachment()); + modifyLog.setChangeUserId(sysuser.getId()); + modifyLog.setChangeUserName(sysuser.getName()); + modifyLog.setChangeTime(new Date()); + + try{ + boolean ret = model.save() && modifyLog.save(); + if (!ret) { + return false; + } + + synctask.addSaveData(model); // 有自增长主键的，在保存 model 后会自动填充主键的值，然后才能加到 synctask 里面 + synctask.addSaveData(modifyLog); + + return SyncTaskService.me.save(synctask) + && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser) + && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser); + }catch (Exception e) { + log.error(e.getMessage(), e); + return false; + } + } + }); + + if (ret) { + SyncTaskService.me.send(synctask); + } + + return ret ? Result.success() : Result.failed(false, "新增失败"); + } + + public Result update(TruckWeightLimit model, Sysuser sysuser) { + TruckWeightLimit oldobj = model.findByPk(); + + if (oldobj == null) { + return Result.failedstr("未找到车牌 %s 的限重记录", model.getTruckLicense()); + } + + model.setChangeTime(new Date()); + + TruckWeightLimit saveold = oldobj.clone(); + // 将修改后的对象返回 + String[] keys = model._getAttrNames(); + for (String key : keys) { + oldobj.set(key, model.get(key)); + } + + model.setCreateUserId(oldobj.getCreateUserId()); + model.setCreateTime(oldobj.getCreateTime()); + SyncTask synctask = new SyncTask(); + + boolean ret = Db.tx(new IAtom() { + @Override + public boolean run() { + TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); + modifyLog.setTruckLicense(model.getTruckLicense()); + modifyLog.setWeightLimit(model.getWeightLimit()); + modifyLog.setAttachment(model.getAttachment()); + modifyLog.setChangeUserId(sysuser.getId()); + modifyLog.setChangeUserName(sysuser.getName()); + modifyLog.setChangeTime(new Date()); + + try{ + boolean ret = oldobj.update() && modifyLog.save(); + if (!ret) { + return false; + } + + synctask.addUpdateData(oldobj); // 有自增长主键的，在保存 model 后会自动填充主键的值，然后才能加到 synctask 里面 + synctask.addSaveData(modifyLog); + + return SyncTaskService.me.save(synctask) + && ModifyLogService.me.save(model, saveold, Enums.DataOpType.UPDATE.getId(), sysuser) + && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser); + }catch (Exception e) { + log.error(e.getMessage(), e); + return false; + } + } + }); + + if (ret) { + SyncTaskService.me.send(synctask); + } + + return ret ? Result.object(oldobj) : Result.failed(false, "修改失败"); + } + + public Result delete(TruckWeightLimit model, Sysuser sysuser) { + if (!model.checkExistsByPk()) { + return Result.failed(false, "按主键未找到对应记录"); + } + + String truck_license = model.getTruckLicense(); + List modifyLogList = TruckWeightLimitModifyLog.dao.find("select * from truck_weight_limit_modify_log where truck_license = ?", truck_license); + + SyncTask synctask = new SyncTask(); + boolean ret = Db.tx(new IAtom() { + @Override + public boolean run() { + try { + if (modifyLogList.size() > 0) { + int s = Db.delete("delete from truck_weight_limit_modify_log where truck_license = ?", truck_license); + if (s != modifyLogList.size()) return false; + } + boolean ret = model.delete(); + if (!ret) return false; + + modifyLogList.stream().forEach(s -> synctask.addDeleteData(s)); + synctask.addDeleteData(model); + + return SyncTaskService.me.save(synctask) + && ModifyLogService.me.save(model, model.findByPk(), Enums.DataOpType.DELETE.getId(), sysuser); + } catch (Exception e) { + log.error(e.getMessage(), e); + return false; + } + } + }); + + if (ret) { + SyncTaskService.me.send(synctask); + } + + return ret ? Result.success() : Result.failed(false, "删除失败"); + } + + public Page find(PageParam pp, String truck_license, String stm, String etm) { + String selectsql = "select * "; + String fromsql = "from truck_weight_limit t where 1=1 "; + List paraList = new ArrayList<>(); + + if (StrKit.notBlank(truck_license)) { + fromsql += " and t.truck_license like ? \n"; + paraList.add("%" + truck_license.trim() + "%"); + } + + if (StrKit.notBlank(stm)) { + fromsql += " and t.create_time >= ? \n"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.create_time <= ? \n"; + paraList.add(etm); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && TruckWeightLimit.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } else { + findSql += " order by t.create_time desc "; + } + + return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + } + + public List list() { + return TruckWeightLimit.dao.find("select * from truck_weight_limit"); + } +}