林本磊 / nanyangnet

Download as
Browse Code »

Commit f8f083277913882600d4353271df9414f93df9d8

Authored by 林本磊
1 parent 83c502fa
Exists in dev

fix: 数据转换

Showing 3 changed files with 157 additions and 161 deletions   Show diff stats
platform/src/main/java/com/jflyfox/api/entity/BDemand.java 0 → 100644
  Diff comments   View file @f8f0832
@@ -0,0 +1,144 @@ @@ -0,0 +1,144 @@
  1 +package com.jflyfox.api.entity;
  2 +
  3 +import com.jflyfox.component.base.BaseProjectModel;
  4 +import com.jflyfox.jfinal.component.annotation.ModelBind;
  5 +
  6 +/**
  7 + * @author ：lin
  8 + * @date ：Created in 2020/6/22 15:06
  9 + * @description：
  10 + */
  11 +@ModelBind(table = "b_demand")
  12 +public class BDemand extends BaseProjectModel<BDemand> {
  13 +
  14 + public static final BDemand dao = new BDemand();
  15 +
  16 + private String ID = "id";
  17 +
  18 + private String USER_NAME = "user_name";
  19 +
  20 + private String DISTANCE = "distance";
  21 +
  22 + private String TYPE = "type";
  23 +
  24 + private String SOURCE_ADDRESS = "source_address";
  25 +
  26 + private String TARGET_ADDRESS = "target_address";
  27 +
  28 + private String GOODS_CATEGORY = "goods_category";
  29 +
  30 + private String GOODS_WEIGHT = "goods_weight";
  31 +
  32 + private String STATUS = "status";
  33 +
  34 + private String CREATED_DATE = "created_date";
  35 +
  36 + public String getID() {
  37 + return ID;
  38 + }
  39 +
  40 + public BDemand setID(Integer value) {
  41 + set(ID, value);
  42 + return this;
  43 + }
  44 +
  45 +
  46 + public String getUSER_NAME() {
  47 + return USER_NAME;
  48 + }
  49 +
  50 + public BDemand setUSER_NAME(String value) {
  51 + set(USER_NAME, value);
  52 + return this;
  53 + }
  54 +
  55 +
  56 + public String getDISTANCE() {
  57 + return DISTANCE;
  58 + }
  59 +
  60 + public BDemand setDISTANCE(String value) {
  61 + set(DISTANCE, value);
  62 + return this;
  63 + }
  64 +
  65 +
  66 +
  67 + public String getTYPE() {
  68 + return TYPE;
  69 + }
  70 +
  71 + public BDemand setTYPE(String value) {
  72 + set(TYPE, value);
  73 + return this;
  74 + }
  75 +
  76 +
  77 + public String getSOURCE_ADDRESS() {
  78 + return SOURCE_ADDRESS;
  79 + }
  80 +
  81 + public BDemand setSOURCE_ADDRESS(String value) {
  82 + set(SOURCE_ADDRESS, value);
  83 + return this;
  84 + }
  85 +
  86 +
  87 +
  88 + public String getTARGET_ADDRESS() {
  89 + return TARGET_ADDRESS;
  90 + }
  91 +
  92 + public BDemand setTARGET_ADDRESS(String value) {
  93 + set(TARGET_ADDRESS, value);
  94 + return this;
  95 + }
  96 +
  97 +
  98 + public String getGOODS_CATEGORY() {
  99 + return GOODS_CATEGORY;
  100 + }
  101 +
  102 + public BDemand setGOODS_CATEGORY(String value) {
  103 + set(GOODS_CATEGORY, value);
  104 + return this;
  105 + }
  106 +
  107 +
  108 + public String getGOODS_WEIGHT() {
  109 + return GOODS_WEIGHT;
  110 + }
  111 +
  112 + public BDemand setGOODS_WEIGHT(String value) {
  113 + set(GOODS_WEIGHT, value);
  114 + return this;
  115 + }
  116 +
  117 + public String getCREATED_DATE() {
  118 + return CREATED_DATE;
  119 + }
  120 +
  121 + public BDemand setCREATED_DATE(String value) {
  122 + set(CREATED_DATE, value);
  123 + return this;
  124 + }
  125 +
  126 +
  127 + public String getSTATUS() {
  128 + return STATUS;
  129 + }
  130 +
  131 + public BDemand setSTATUS(String value) {
  132 + set(STATUS, value);
  133 + return this;
  134 + }
  135 +
  136 + @Override
  137 + public BDemand findById(Object idValue) {
  138 + BDemand order = super.findById(idValue);
  139 + if (order != null && order.getBoolean("active")) {
  140 + return order;
  141 + }
  142 + return null;
  143 + }
  144 +}
platform/src/main/java/com/jflyfox/api/entity/BOrder.java
View file @83c502f
@@ -1,144 +0,0 @@ @@ -1,144 +0,0 @@
1 -package com.jflyfox.api.entity;  
2 -  
3 -import com.jflyfox.component.base.BaseProjectModel;  
4 -import com.jflyfox.jfinal.component.annotation.ModelBind;  
5 -  
6 -/**  
7 - * @author ：lin  
8 - * @date ：Created in 2020/6/22 15:06  
9 - * @description：  
10 - */  
11 -@ModelBind(table = "b_order")  
12 -public class BOrder extends BaseProjectModel<BOrder> {  
13 -  
14 - public static final BOrder dao = new BOrder();  
15 -  
16 - private String ID = "id";  
17 -  
18 - private String CONSIGNOR_USER_REAL_NAME = "consignor_user_real_name";  
19 -  
20 - private String DISTANCE = "distance";  
21 -  
22 - private String VEHICLE_TYPE = "vehicle_type";  
23 -  
24 - private String SOURCE_ADDRESS = "source_address";  
25 -  
26 - private String TARGET_ADDRESS = "target_address";  
27 -  
28 - private String GOODS_CATEGORY = "goods_category";  
29 -  
30 - private String GOODS_WEIGHT = "goods_weight";  
31 -  
32 - private String STATUS = "status";  
33 -  
34 - private String CREATED_DATE = "created_date";  
35 -  
36 - public String getID() {  
37 - return ID;  
38 - }  
39 -  
40 - public BOrder setID(Integer value) {  
41 - set(ID, value);  
42 - return this;  
43 - }  
44 -  
45 -  
46 - public String getCONSIGNOR_USER_REAL_NAME() {  
47 - return CONSIGNOR_USER_REAL_NAME;  
48 - }  
49 -  
50 - public BOrder setCONSIGNOR_USER_REAL_NAME(String value) {  
51 - set(CONSIGNOR_USER_REAL_NAME, value);  
52 - return this;  
53 - }  
54 -  
55 -  
56 - public String getDISTANCE() {  
57 - return DISTANCE;  
58 - }  
59 -  
60 - public BOrder setDISTANCE(String value) {  
61 - set(DISTANCE, value);  
62 - return this;  
63 - }  
64 -  
65 -  
66 -  
67 - public String getVEHICLE_TYPE() {  
68 - return VEHICLE_TYPE;  
69 - }  
70 -  
71 - public BOrder setVEHICLE_TYPE(String value) {  
72 - set(VEHICLE_TYPE, value);  
73 - return this;  
74 - }  
75 -  
76 -  
77 - public String getSOURCE_ADDRESS() {  
78 - return SOURCE_ADDRESS;  
79 - }  
80 -  
81 - public BOrder setSOURCE_ADDRESS(String value) {  
82 - set(SOURCE_ADDRESS, value);  
83 - return this;  
84 - }  
85 -  
86 -  
87 -  
88 - public String getTARGET_ADDRESS() {  
89 - return TARGET_ADDRESS;  
90 - }  
91 -  
92 - public BOrder setTARGET_ADDRESS(String value) {  
93 - set(TARGET_ADDRESS, value);  
94 - return this;  
95 - }  
96 -  
97 -  
98 - public String getGOODS_CATEGORY() {  
99 - return GOODS_CATEGORY;  
100 - }  
101 -  
102 - public BOrder setGOODS_CATEGORY(String value) {  
103 - set(GOODS_CATEGORY, value);  
104 - return this;  
105 - }  
106 -  
107 -  
108 - public String getGOODS_WEIGHT() {  
109 - return GOODS_WEIGHT;  
110 - }  
111 -  
112 - public BOrder setGOODS_WEIGHT(String value) {  
113 - set(GOODS_WEIGHT, value);  
114 - return this;  
115 - }  
116 -  
117 - public String getCREATED_DATE() {  
118 - return CREATED_DATE;  
119 - }  
120 -  
121 - public BOrder setCREATED_DATE(String value) {  
122 - set(CREATED_DATE, value);  
123 - return this;  
124 - }  
125 -  
126 -  
127 - public String getSTATUS() {  
128 - return STATUS;  
129 - }  
130 -  
131 - public BOrder setSTATUS(String value) {  
132 - set(STATUS, value);  
133 - return this;  
134 - }  
135 -  
136 - @Override  
137 - public BOrder findById(Object idValue) {  
138 - BOrder order = super.findById(idValue);  
139 - if (order != null && order.getBoolean("active")) {  
140 - return order;  
141 - }  
142 - return null;  
143 - }  
144 -}  
platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java
  Diff comments   View file @f8f0832
1 package com.jflyfox.modules.front.template; 1 package com.jflyfox.modules.front.template;
2 2
3 import com.jfinal.plugin.activerecord.Page; 3 import com.jfinal.plugin.activerecord.Page;
4 -import com.jflyfox.api.entity.BOrder; 4 +import com.jflyfox.api.entity.BDemand;
5 import com.jflyfox.jfinal.base.BaseService; 5 import com.jflyfox.jfinal.base.BaseService;
6 import com.jflyfox.jfinal.base.Paginator; 6 import com.jflyfox.jfinal.base.Paginator;
7 import com.jflyfox.modules.admin.article.TbArticle; 7 import com.jflyfox.modules.admin.article.TbArticle;
@@ -286,11 +286,11 @@ public class TemplateService extends BaseService { @@ -286,11 +286,11 @@ public class TemplateService extends BaseService {
286 return config == null ? "" : config.getValue(); 286 return config == null ? "" : config.getValue();
287 } 287 }
288 288
289 - public Page<BOrder> getOrders(int pageNo, int pageSize) {  
290 - String fromSql = " from b_order b where 1=1 "; 289 + public Page<BDemand> getOrders(int pageNo, int pageSize) {
  290 + String fromSql = " from b_demand b where 1=1 ";
291 // 推荐文章列表 291 // 推荐文章列表
292 - Page<BOrder> orders = BOrder.dao.paginate(new Paginator(pageNo, pageSize), "select * ", fromSql);  
293 - List<BOrder> list = orders.getList(); 292 + Page<BDemand> demands = BDemand.dao.paginate(new Paginator(pageNo, pageSize), "select * ", fromSql);
  293 + List<BDemand> list = demands.getList();
294 Map<String,String> map =new HashMap<>(); 294 Map<String,String> map =new HashMap<>();
295 map.put("TRUCK","车运"); 295 map.put("TRUCK","车运");
296 map.put("SHIP","船运"); 296 map.put("SHIP","船运");
@@ -302,24 +302,20 @@ public class TemplateService extends BaseService { @@ -302,24 +302,20 @@ public class TemplateService extends BaseService {
302 stMap.put("GOING","进行中"); 302 stMap.put("GOING","进行中");
303 stMap.put("FINISH","结束"); 303 stMap.put("FINISH","结束");
304 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 304 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
305 - for (BOrder bOrder : list){  
306 - String type = (String) bOrder.getAttrs().get("vehicle_type");  
307 - bOrder.setVEHICLE_TYPE(map.get(type));  
308 - String status = (String)bOrder.getAttrs().get("status");  
309 - bOrder.setSTATUS(stMap.get(status));  
310 - Date date = (Date)bOrder.getAttrs().get("created_date"); 305 + for (BDemand demand : list){
  306 + String type = (String) demand.getAttrs().get("vehicle_type");
  307 + demand.setTYPE(map.get(type));
  308 + String status = (String)demand.getAttrs().get("status");
  309 + demand.setSTATUS(stMap.get(status));
  310 + Date date = (Date)demand.getAttrs().get("created_date");
311 Calendar cal = Calendar.getInstance(); 311 Calendar cal = Calendar.getInstance();
312 cal.setTime(date); 312 cal.setTime(date);
313 cal.add(Calendar.HOUR,-8); 313 cal.add(Calendar.HOUR,-8);
314 date = cal.getTime(); 314 date = cal.getTime();
315 String strDate = formatter.format(date); 315 String strDate = formatter.format(date);
316 - bOrder.setCREATED_DATE(strDate); 316 + demand.setCREATED_DATE(strDate);
317 317
318 - /*Timestamp date = (String)bOrder.getAttrs().get("created_date");  
319 -  
320 - date = date.substring(0,date.length()-2);  
321 - bOrder.setCREATED_DATE(date);*/  
322 } 318 }
323 - return orders; 319 + return demands;
324 } 320 }
325 } 321 }
326 \ No newline at end of file 322 \ No newline at end of file