xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

车辆型号限重管理-3

dev
wuwenxiong 2021-09-08 11:22:46 +08:00
parent f30b3eb687
commit 1740b95553
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogController.java
View File

@ -20,7 +20,9 @@ public class TruckWeightLimitModifyLogController extends Controller {
public void find(){ public void find(){
PageParam pp = getBean(PageParam.class, "", true); PageParam pp = getBean(PageParam.class, "", true);
String truck_license = get("truck_license"); String truck_license = get("truck_license");
renderJson(Result.object(TruckWeightLimitModifyLogService.me.find(pp, truck_license))); String stm = get("stm");
String etm = get("etm");
renderJson(Result.object(TruckWeightLimitModifyLogService.me.find(pp, truck_license, stm, etm)));
} }
@ -38,6 +40,8 @@ public class TruckWeightLimitModifyLogController extends Controller {
*/ */
public void list(){ public void list(){
String truck_license = get("truck_license"); String truck_license = get("truck_license");
renderJson(Result.object(TruckWeightLimitModifyLogService.me.list(truck_license))); String stm = get("stm");
String etm = get("etm");
renderJson(Result.object(TruckWeightLimitModifyLogService.me.list(truck_license, stm, etm)));
} }
} }

32
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/truck/weightlimitmodifylog/TruckWeightLimitModifyLogService.java
View File

@ -19,10 +19,9 @@ import java.util.List;
* PrimaryKey: id * PrimaryKey: id
*/ */
public class TruckWeightLimitModifyLogService extends BaseService { public class TruckWeightLimitModifyLogService extends BaseService {
private static final Log log = Log.getLog(TruckWeightLimitModifyLogService.class);
public static final TruckWeightLimitModifyLogService me = new TruckWeightLimitModifyLogService(); public static final TruckWeightLimitModifyLogService me = new TruckWeightLimitModifyLogService();
public Page<Record> find(PageParam pp, String truck_license) { public Page<Record> find(PageParam pp, String truck_license, String stm, String etm) {
String selectsql = "select * "; String selectsql = "select * ";
String fromsql = "from truck_weight_limit_modify_log t where 1=1 "; String fromsql = "from truck_weight_limit_modify_log t where 1=1 ";
List<Object> paraList = new ArrayList<>(); List<Object> paraList = new ArrayList<>();
@ -32,6 +31,16 @@ public class TruckWeightLimitModifyLogService extends BaseService {
paraList.add("%" + truck_license.trim() + "%"); paraList.add("%" + truck_license.trim() + "%");
} }
if (StrKit.notBlank(stm)) {
fromsql += " and t.change_time >= ? \n";
paraList.add(stm);
}
if (StrKit.notBlank(etm)) {
fromsql += " and t.change_time <= ? \n";
paraList.add(etm);
}
String totalRowSql = "select count(*) " + fromsql; String totalRowSql = "select count(*) " + fromsql;
String findSql = selectsql + fromsql; String findSql = selectsql + fromsql;
@ -51,11 +60,22 @@ public class TruckWeightLimitModifyLogService extends BaseService {
return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray());
} }
public List<TruckWeightLimitModifyLog> list(String truck_license) { public List<Record> list(String truck_license, String stm, String etm) {
String sql = "select * from truck_weight_limit_modify_log t where 1=1\n"; String sql = "select * from truck_weight_limit_modify_log t where 1=1 ";
List<Object> paraList = new ArrayList<>();
if (StrKit.notBlank(truck_license)) { if (StrKit.notBlank(truck_license)) {
sql += " and t.truck_license like %" + truck_license.trim() + "%"; sql += " and t.truck_license = ?";
paraList.add(truck_license);
} }
return TruckWeightLimitModifyLog.dao.find(sql); if (StrKit.notBlank(stm)) {
sql += " and t.change_time >= ?";
paraList.add(stm);
}
if (StrKit.notBlank(etm)) {
sql += " and t.change_time <= ?";
paraList.add(etm);
}
return Db.find(sql, paraList.toArray());
} }
} }

4
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/devicectrl/controllers/OutController.java
View File

@ -250,6 +250,10 @@ public class OutController extends Controller implements Runnable {
log.debug("%s 【%s】上磅后，控制LED显示称重结果【%s】", getWhich(), pair.license, weight); log.debug("%s 【%s】上磅后，控制LED显示称重结果【%s】", getWhich(), pair.license, weight);
try { try {
// 如果对应的车辆有限重配置则判断限重配置是否超标，如果没有则用系统默认的限重配置判断
// 如果超重则在LED上显示超重信息
BigDecimal total_price = OrderclusterService.me.getTotalPriceByLicense(CliCacheData.SUP.getId(), pair.license, weight); BigDecimal total_price = OrderclusterService.me.getTotalPriceByLicense(CliCacheData.SUP.getId(), pair.license, weight);
log.debug("%s 【%s】总价 %s 元", getWhich(), pair.license, total_price); log.debug("%s 【%s】总价 %s 元", getWhich(), pair.license, total_price);