From f8f083277913882600d4353271df9414f93df9d8 Mon Sep 17 00:00:00 2001 From: linbenlei <572833793@qq.com> Date: Tue, 2 Feb 2021 09:22:04 +0800 Subject: [PATCH] fix: 数据转换 --- platform/src/main/java/com/jflyfox/api/entity/BDemand.java | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ platform/src/main/java/com/jflyfox/api/entity/BOrder.java | 144 ------------------------------------------------------------------------------------------------------------------------------------------------ platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java | 30 +++++++++++++----------------- 3 files changed, 157 insertions(+), 161 deletions(-) create mode 100644 platform/src/main/java/com/jflyfox/api/entity/BDemand.java delete mode 100644 platform/src/main/java/com/jflyfox/api/entity/BOrder.java diff --git a/platform/src/main/java/com/jflyfox/api/entity/BDemand.java b/platform/src/main/java/com/jflyfox/api/entity/BDemand.java new file mode 100644 index 0000000..b94a824 --- /dev/null +++ b/platform/src/main/java/com/jflyfox/api/entity/BDemand.java @@ -0,0 +1,144 @@ +package com.jflyfox.api.entity; + +import com.jflyfox.component.base.BaseProjectModel; +import com.jflyfox.jfinal.component.annotation.ModelBind; + +/** + * @author ：lin + * @date ：Created in 2020/6/22 15:06 + * @description： + */ +@ModelBind(table = "b_demand") +public class BDemand extends BaseProjectModel { + + public static final BDemand dao = new BDemand(); + + private String ID = "id"; + + private String USER_NAME = "user_name"; + + private String DISTANCE = "distance"; + + private String TYPE = "type"; + + private String SOURCE_ADDRESS = "source_address"; + + private String TARGET_ADDRESS = "target_address"; + + private String GOODS_CATEGORY = "goods_category"; + + private String GOODS_WEIGHT = "goods_weight"; + + private String STATUS = "status"; + + private String CREATED_DATE = "created_date"; + + public String getID() { + return ID; + } + + public BDemand setID(Integer value) { + set(ID, value); + return this; + } + + + public String getUSER_NAME() { + return USER_NAME; + } + + public BDemand setUSER_NAME(String value) { + set(USER_NAME, value); + return this; + } + + + public String getDISTANCE() { + return DISTANCE; + } + + public BDemand setDISTANCE(String value) { + set(DISTANCE, value); + return this; + } + + + + public String getTYPE() { + return TYPE; + } + + public BDemand setTYPE(String value) { + set(TYPE, value); + return this; + } + + + public String getSOURCE_ADDRESS() { + return SOURCE_ADDRESS; + } + + public BDemand setSOURCE_ADDRESS(String value) { + set(SOURCE_ADDRESS, value); + return this; + } + + + + public String getTARGET_ADDRESS() { + return TARGET_ADDRESS; + } + + public BDemand setTARGET_ADDRESS(String value) { + set(TARGET_ADDRESS, value); + return this; + } + + + public String getGOODS_CATEGORY() { + return GOODS_CATEGORY; + } + + public BDemand setGOODS_CATEGORY(String value) { + set(GOODS_CATEGORY, value); + return this; + } + + + public String getGOODS_WEIGHT() { + return GOODS_WEIGHT; + } + + public BDemand setGOODS_WEIGHT(String value) { + set(GOODS_WEIGHT, value); + return this; + } + + public String getCREATED_DATE() { + return CREATED_DATE; + } + + public BDemand setCREATED_DATE(String value) { + set(CREATED_DATE, value); + return this; + } + + + public String getSTATUS() { + return STATUS; + } + + public BDemand setSTATUS(String value) { + set(STATUS, value); + return this; + } + + @Override + public BDemand findById(Object idValue) { + BDemand order = super.findById(idValue); + if (order != null && order.getBoolean("active")) { + return order; + } + return null; + } +} diff --git a/platform/src/main/java/com/jflyfox/api/entity/BOrder.java b/platform/src/main/java/com/jflyfox/api/entity/BOrder.java deleted file mode 100644 index e1614f0..0000000 --- a/platform/src/main/java/com/jflyfox/api/entity/BOrder.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.jflyfox.api.entity; - -import com.jflyfox.component.base.BaseProjectModel; -import com.jflyfox.jfinal.component.annotation.ModelBind; - -/** - * @author ：lin - * @date ：Created in 2020/6/22 15:06 - * @description： - */ -@ModelBind(table = "b_order") -public class BOrder extends BaseProjectModel { - - public static final BOrder dao = new BOrder(); - - private String ID = "id"; - - private String CONSIGNOR_USER_REAL_NAME = "consignor_user_real_name"; - - private String DISTANCE = "distance"; - - private String VEHICLE_TYPE = "vehicle_type"; - - private String SOURCE_ADDRESS = "source_address"; - - private String TARGET_ADDRESS = "target_address"; - - private String GOODS_CATEGORY = "goods_category"; - - private String GOODS_WEIGHT = "goods_weight"; - - private String STATUS = "status"; - - private String CREATED_DATE = "created_date"; - - public String getID() { - return ID; - } - - public BOrder setID(Integer value) { - set(ID, value); - return this; - } - - - public String getCONSIGNOR_USER_REAL_NAME() { - return CONSIGNOR_USER_REAL_NAME; - } - - public BOrder setCONSIGNOR_USER_REAL_NAME(String value) { - set(CONSIGNOR_USER_REAL_NAME, value); - return this; - } - - - public String getDISTANCE() { - return DISTANCE; - } - - public BOrder setDISTANCE(String value) { - set(DISTANCE, value); - return this; - } - - - - public String getVEHICLE_TYPE() { - return VEHICLE_TYPE; - } - - public BOrder setVEHICLE_TYPE(String value) { - set(VEHICLE_TYPE, value); - return this; - } - - - public String getSOURCE_ADDRESS() { - return SOURCE_ADDRESS; - } - - public BOrder setSOURCE_ADDRESS(String value) { - set(SOURCE_ADDRESS, value); - return this; - } - - - - public String getTARGET_ADDRESS() { - return TARGET_ADDRESS; - } - - public BOrder setTARGET_ADDRESS(String value) { - set(TARGET_ADDRESS, value); - return this; - } - - - public String getGOODS_CATEGORY() { - return GOODS_CATEGORY; - } - - public BOrder setGOODS_CATEGORY(String value) { - set(GOODS_CATEGORY, value); - return this; - } - - - public String getGOODS_WEIGHT() { - return GOODS_WEIGHT; - } - - public BOrder setGOODS_WEIGHT(String value) { - set(GOODS_WEIGHT, value); - return this; - } - - public String getCREATED_DATE() { - return CREATED_DATE; - } - - public BOrder setCREATED_DATE(String value) { - set(CREATED_DATE, value); - return this; - } - - - public String getSTATUS() { - return STATUS; - } - - public BOrder setSTATUS(String value) { - set(STATUS, value); - return this; - } - - @Override - public BOrder findById(Object idValue) { - BOrder order = super.findById(idValue); - if (order != null && order.getBoolean("active")) { - return order; - } - return null; - } -} diff --git a/platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java b/platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java index 27e66c6..a971be3 100644 --- a/platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java +++ b/platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java @@ -1,7 +1,7 @@ package com.jflyfox.modules.front.template; import com.jfinal.plugin.activerecord.Page; -import com.jflyfox.api.entity.BOrder; +import com.jflyfox.api.entity.BDemand; import com.jflyfox.jfinal.base.BaseService; import com.jflyfox.jfinal.base.Paginator; import com.jflyfox.modules.admin.article.TbArticle; @@ -286,11 +286,11 @@ public class TemplateService extends BaseService { return config == null ? "" : config.getValue(); } - public Page getOrders(int pageNo, int pageSize) { - String fromSql = " from b_order b where 1=1 "; + public Page getOrders(int pageNo, int pageSize) { + String fromSql = " from b_demand b where 1=1 "; // 推荐文章列表 - Page orders = BOrder.dao.paginate(new Paginator(pageNo, pageSize), "select * ", fromSql); - List list = orders.getList(); + Page demands = BDemand.dao.paginate(new Paginator(pageNo, pageSize), "select * ", fromSql); + List list = demands.getList(); Map map =new HashMap<>(); map.put("TRUCK","车运"); map.put("SHIP","船运"); @@ -302,24 +302,20 @@ public class TemplateService extends BaseService { stMap.put("GOING","进行中"); stMap.put("FINISH","结束"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - for (BOrder bOrder : list){ - String type = (String) bOrder.getAttrs().get("vehicle_type"); - bOrder.setVEHICLE_TYPE(map.get(type)); - String status = (String)bOrder.getAttrs().get("status"); - bOrder.setSTATUS(stMap.get(status)); - Date date = (Date)bOrder.getAttrs().get("created_date"); + for (BDemand demand : list){ + String type = (String) demand.getAttrs().get("vehicle_type"); + demand.setTYPE(map.get(type)); + String status = (String)demand.getAttrs().get("status"); + demand.setSTATUS(stMap.get(status)); + Date date = (Date)demand.getAttrs().get("created_date"); Calendar cal = Calendar.getInstance(); cal.setTime(date); cal.add(Calendar.HOUR,-8); date = cal.getTime(); String strDate = formatter.format(date); - bOrder.setCREATED_DATE(strDate); + demand.setCREATED_DATE(strDate); - /*Timestamp date = (String)bOrder.getAttrs().get("created_date"); - - date = date.substring(0,date.length()-2); - bOrder.setCREATED_DATE(date);*/ } - return orders; + return demands; } } \ No newline at end of file -- libgit2 0.21.2