潘钊 / bsth_control · Commits

Commit d7124004ce86eb276f3da3fb22f8fe4d15e0f3b1

Authored by 潘钊
2 parents d2d815f5 d3b6eb98
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang 

# Conflicts:
#	src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
#	src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
#	src/main/resources/static/real_control_v2/fragments/north/nav/dataManager/cars_move.html
Inline Side-by-side
Showing 25 changed files with 823 additions and 648 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 25 of 30 files are displayed.

src/main/java/com/bsth/controller/forms/ExportController.java
  View file @d712400
... ... @@ -28,6 +28,7 @@ import com.bsth.entity.mcy_forms.Vehicleloading;
28 28 import com.bsth.entity.mcy_forms.Waybillday;
29 29 import com.bsth.service.forms.ExportService;
30 30 import com.bsth.service.forms.FormsService;
  31 +import com.bsth.util.Arith;
31 32 import com.bsth.util.ReportUtils;
32 33  
33 34 @RestController
... ... @@ -167,7 +168,7 @@ public class ExportController {
167 168 }
168 169  
169 170 // 路单数据报表
170   - @RequestMapping(value = "/singledataExport", method = RequestMethod.POST)
  171 + @RequestMapping(value = "/singledataExport", method = RequestMethod.GET)
171 172 public List<Map<String, Object>> singledataExport(@RequestParam Map<String, Object> map) {
172 173 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
173 174 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
... ... @@ -213,12 +214,12 @@ public class ExportController {
213 214 }
214 215  
215 216 // 车辆加注
216   - @RequestMapping(value = "/vehicleloadingExport", method = RequestMethod.POST)
  217 + @RequestMapping(value = "/vehicleloadingExport", method = RequestMethod.GET)
217 218 public List<Map<String, Object>> vehicleloadingExport(@RequestParam Map<String, Object> map) {
218 219 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
219 220 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
220 221 ReportUtils ee = new ReportUtils();
221   - List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("gsdmVehic").toString(),map.get("fgsdmVehic").toString(),map.get("line").toString(),
  222 + List<Vehicleloading> vehicleloading = formsService.vehicleloading(map.get("line").toString(),
222 223 map.get("data").toString());
223 224 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
224 225 int i = 1;
... ... @@ -558,17 +559,13 @@ public class ExportController {
558 559 List<Daily> allline = formsService.daily(map);
559 560  
560 561 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
561   - Float zgl=0f;
562   - Float ks=0f;
563   - Float yh=0f;
564   - Float bc=0f;
  562 + double zgl=0.0;
  563 + double ks=0.0;
  564 + double yh=0.0;
  565 + int bc=0;
565 566 Map<String, Object> m ;
566 567 for (Daily d : allline) {
567 568 m = new HashMap<String, Object>();
568   - zgl +=d.getZlc()==""?0f:Float.valueOf(d.getZlc());
569   - ks +=d.getJzl1()==""?0f:Float.valueOf(d.getJzl1());
570   - yh +=d.getYh()==""?0f:Float.valueOf(d.getYh());
571   - bc +=d.getBc()==""?0f:Float.valueOf(d.getBc());
572 569 m.put("zbh", d.getZbh());
573 570 m.put("jgh",d.getJgh());
574 571 m.put("jName", d.getjName());
... ... @@ -576,9 +573,13 @@ public class ExportController {
576 573 m.put("jzl1", d.getJzl1());
577 574 m.put("yh", d.getYh());
578 575 m.put("bc", d.getBc());
  576 + zgl =Arith.add(zgl, d.getZlc());
  577 + ks =Arith.add(ks, d.getJzl1());
  578 + yh =Arith.add(yh, d.getYh());
  579 + bc +=Integer.parseInt(d.getBc());
579 580  
580 581 resList.add(m);
581   - }
  582 + }
582 583  
583 584 m=new HashMap<String,Object>();
584 585 m.put("total_zgl", zgl);
... ...
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
  View file @d712400
... ... @@ -73,17 +73,16 @@ public class MCY_FormsController {
73 73 }
74 74  
75 75 // 路单数据
76   - @RequestMapping(value = "/singledata", method = RequestMethod.POST)
  76 + @RequestMapping(value = "/singledata", method = RequestMethod.GET)
77 77 public List<Singledata> singledata(@RequestParam Map<String, Object> map) {
78 78  
79 79 return formsService.singledata(map);
80 80 }
81 81  
82 82 // 车辆加注
83   - @RequestMapping(value = "/vehicleloading", method = RequestMethod.POST)
84   - public List<Vehicleloading> vehicleloading(@RequestParam String gsdmVehic, @RequestParam String fgsdmVehic,
85   - @RequestParam String line, @RequestParam String data) {
86   - return formsService.vehicleloading(gsdmVehic, fgsdmVehic, line, data);
  83 + @RequestMapping(value = "/vehicleloading", method = RequestMethod.GET)
  84 + public List<Vehicleloading> vehicleloading(@RequestParam String line, @RequestParam String data) {
  85 + return formsService.vehicleloading(line, data);
87 86 }
88 87  
89 88 // 运营服务阶段报表
... ...
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @d712400
... ... @@ -238,9 +238,11 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
238 238 Map<String, Object> m = new HashMap<String, Object>();
239 239 m.put("rq", y.getRq());
240 240 m.put("gsname",y.getGsname() );
  241 + m.put("fgsname", y.getFgsname());
241 242 m.put("xlname", y.getXlname());
242 243 m.put("nbbm", y.getNbbm());
243 244 m.put("jsy", y.getJsy());
  245 + m.put("name", y.getName());
244 246 m.put("jzl", y.getJzl());
245 247 m.put("czlc", y.getCzlc());
246 248 m.put("jzlc", y.getJzlc());
... ...
src/main/java/com/bsth/controller/realcontrol/DataManagerController.java
  View file @d712400
1   -package com.bsth.controller.realcontrol;
2   -
3   -import com.bsth.service.realcontrol.DataManagerService;
4   -import org.apache.commons.lang3.StringEscapeUtils;
5   -import org.springframework.beans.factory.annotation.Autowired;
6   -import org.springframework.web.bind.annotation.RequestMapping;
7   -import org.springframework.web.bind.annotation.RequestParam;
8   -import org.springframework.web.bind.annotation.RestController;
9   -
10   -import java.util.Map;
11   -
12   -/**
13   - * 数据管理，包括从老系统的数据迁移。新系统的数据校验等
14   - * Created by panzhao on 2017/4/17.
15   - */
16   -@RestController
17   -@RequestMapping("dataManager")
18   -public class DataManagerController {
19   -
20   - @Autowired
21   - DataManagerService dataManagerService;
22   -
23   - @RequestMapping("cars/old_now")
24   - public Map<String, Object> carInfos(@RequestParam Integer lineId){
25   - return dataManagerService.carInfos(lineId);
26   - }
27   -
28   - @RequestMapping("car/updateDevices")
29   - public Map<String, Object> updateDevices(@RequestParam String jsonStr){
30   - jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
31   - return dataManagerService.updateDevices(jsonStr);
32   - }
33   -}
  1 +package com.bsth.controller.realcontrol;
  2 +
  3 +import com.bsth.service.realcontrol.DataManagerService;
  4 +import org.apache.commons.lang3.StringEscapeUtils;
  5 +import org.springframework.beans.factory.annotation.Autowired;
  6 +import org.springframework.web.bind.annotation.RequestMapping;
  7 +import org.springframework.web.bind.annotation.RequestParam;
  8 +import org.springframework.web.bind.annotation.RestController;
  9 +
  10 +import java.util.Map;
  11 +
  12 +/**
  13 + * 数据管理，包括从老系统的数据迁移。新系统的数据校验等
  14 + * Created by panzhao on 2017/4/17.
  15 + */
  16 +@RestController
  17 +@RequestMapping("dataManager")
  18 +public class DataManagerController {
  19 +
  20 + @Autowired
  21 + DataManagerService dataManagerService;
  22 +
  23 + @RequestMapping("cars/old_now")
  24 + public Map<String, Object> carInfos(@RequestParam Integer lineId){
  25 + return dataManagerService.carInfos(lineId);
  26 + }
  27 +
  28 + @RequestMapping("car/updateDevices")
  29 + public Map<String, Object> updateDevices(@RequestParam String jsonStr){
  30 + jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
  31 + return dataManagerService.updateDevices(jsonStr);
  32 + }
  33 +}
... ...
src/main/java/com/bsth/data/BasicData.java
  View file @d712400
... ... @@ -332,7 +332,8 @@ public class BasicData implements CommandLineRunner {
332 332 }
333 333  
334 334 perTempMap.put(jobCode, p);
335   - allPersonMap.put(jobCode, p.getPersonnelName());
  335 +
  336 + allPersonMap.put(jobCode.substring(jobCode.indexOf("-")+1), p.getPersonnelName());
336 337 }
337 338  
338 339 jsyMap = jsyTempMap;
... ...
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
  View file @d712400
... ... @@ -136,4 +136,4 @@ public class LateAdjustHandle implements ApplicationContextAware{
136 136 lineConfigData = applicationContext.getBean(LineConfigData.class);
137 137 sendUtils = applicationContext.getBean(SendUtils.class);
138 138 }
139 139 -}
  140 +}
140 141 \ No newline at end of file
... ...
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
  View file @d712400
... ... @@ -15,10 +15,10 @@ import java.util.Comparator;
15 15 import java.util.List;
16 16  
17 17 /**
18   - *
19   - * @ClassName: ScheduleLateThread
20   - * @Description: TODO(班次误点扫描线程)
21   - * @author PanZhao
  18 + *
  19 + * @ClassName: ScheduleLateThread
  20 + * @Description: TODO(班次误点扫描线程)
  21 + * @author PanZhao
22 22 * @date 2016年8月31日 下午3:09:02
23 23 *
24 24 */
... ... @@ -27,20 +27,20 @@ public class ScheduleLateThread extends Thread{
27 27  
28 28 @Autowired
29 29 DayOfSchedule dayOfSchedule;
30   -
  30 +
31 31 @Autowired
32 32 SendUtils sendUtils;
33   -
  33 +
34 34 private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
35   -
  35 +
36 36 @Override
37 37 public void run() {
38 38 List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
39 39 Collections.sort(all, cpm);
40   -
  40 +
41 41 long t = System.currentTimeMillis();
42 42 int size = all.size();
43   -
  43 +
44 44 ScheduleRealInfo sch;
45 45 for(int i = 0; i < size; i ++){
46 46 sch = all.get(i);
... ... @@ -67,4 +67,4 @@ public class ScheduleLateThread extends Thread{
67 67 }
68 68 }
69 69 }
70 70 -}
  71 +}
71 72 \ No newline at end of file
... ...
src/main/java/com/bsth/entity/oil/Ylb.java
  View file @d712400
... ... @@ -63,6 +63,11 @@ public class Ylb {
63 63 @Transient
64 64 private String gsname;
65 65  
  66 + @Transient
  67 + private String fgsname;
  68 +
  69 + @Transient
  70 + private String name;
66 71  
67 72 public Integer getId() {
68 73 return id;
... ... @@ -299,6 +304,22 @@ public class Ylb {
299 304 }
300 305  
301 306  
  307 + public String getFgsname() {
  308 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
  309 + }
  310 +
  311 + public void setFgsname(String fgsname) {
  312 + this.fgsname = fgsname;
  313 + }
  314 +
  315 + public String getName() {
  316 + return BasicData.allPerson.get(this.jsy);
  317 + }
  318 +
  319 + public void setName(String name) {
  320 + this.name = name;
  321 + }
  322 +
302 323  
303 324  
304 325  
... ...
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
  View file @d712400
... ... @@ -56,7 +56,7 @@ public class OfflineServiceImpl implements OfflineService {
56 56 Object date=map.get("date");
57 57  
58 58 if(line!=null){
59   - sql +=" and line like'%"+line.toString()+"%'";
  59 + sql +=" and line like'%"+line.toString().trim()+"%'";
60 60 }
61 61  
62 62 if(nbbm!=null){
... ... @@ -131,6 +131,7 @@ public class OfflineServiceImpl implements OfflineService {
131 131 @SuppressWarnings("unchecked")
132 132 public PageObject <Offline> Pagequery(Map<String, Object> map) {
133 133 // TODO Auto-generated method stub
  134 +
134 135 String sql="select count(*) record from bsth_c_offline where 1=1 ";
135 136  
136 137 Object line=map.get("line");
... ... @@ -140,7 +141,7 @@ public class OfflineServiceImpl implements OfflineService {
140 141 Object date=map.get("date");
141 142  
142 143 if(line!=null){
143   - sql +=" and line like'%"+line.toString()+"%'";
  144 + sql +=" and line like'%"+line.toString().trim()+"%'";
144 145 }
145 146  
146 147 if(nbbm!=null){
... ... @@ -194,10 +195,9 @@ public class OfflineServiceImpl implements OfflineService {
194 195 Date datess = new Date(d1);
195 196 String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
196 197 String sk=new SimpleDateFormat("HH:mm").format(datess);
197   - String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"' and"
198   - + " real_exec_date='"+dates+"' ";
199   -// + "and fcsj_actual > '"+sk+"' ";
200   -// + "and '"+sk+"' <dfsj";
  198 + String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
  199 + + " from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"' and"
  200 + + " real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
201 201 List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,
202 202 new RowMapper<ScheduleRealInfo>(){
203 203 @Override
... ... @@ -208,20 +208,15 @@ public class OfflineServiceImpl implements OfflineService {
208 208 s.setLpName(rs.getString("lp_name"));
209 209 return s;
210 210 }
211   - });
212   - if(pbb.size()>0){
213   - list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
214   - list.get(i).setLpname(pbb.get(0).getLpName());
215   -
216   - }
217   -
  211 + });
  212 + if(pbb.size()>0){
  213 + list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
  214 + list.get(i).setLpname(pbb.get(0).getLpName());
  215 + }
218 216 }
  217 +
219 218 PageObject<Offline> pageObject = pageHelper.getPageObject();
220   -// for (int i = 0; i < list.size(); i++) {
221   -// if(list.get(i).getLpname()!=null){
222 219 pageObject.setDataList(list);
223   -// }
224   -// }
225 220  
226 221 return pageObject;
227 222 }
... ...
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
  View file @d712400
... ... @@ -43,7 +43,7 @@ public class OutboundServiceImpl implements OutboundService{
43 43 Object updown=map.get("updown");
44 44 Object date=map.get("date");
45 45 if(line!=null){
46   - sql +=" and line like'%"+line.toString()+"%'";
  46 + sql +=" and line like'%"+line.toString().trim()+"%'";
47 47 }
48 48  
49 49 if(nbbm!=null){
... ... @@ -105,7 +105,7 @@ public class OutboundServiceImpl implements OutboundService{
105 105 outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
106 106 outbound.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
107 107 outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
108   - outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
  108 +// outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
109 109 list.add(outbound);
110 110 }
111 111 return list;
... ... @@ -120,7 +120,7 @@ public class OutboundServiceImpl implements OutboundService{
120 120 Object updown=map.get("updown");
121 121 Object date=map.get("date");
122 122 if(line!=null){
123   - sql +=" and line like '%"+line.toString()+"%'";
  123 + sql +=" and line like '%"+line.toString().trim()+"%'";
124 124  
125 125 }
126 126  
... ... @@ -174,10 +174,9 @@ public class OutboundServiceImpl implements OutboundService{
174 174 Date datess = new Date(d1);
175 175 String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
176 176 String sk=new SimpleDateFormat("HH:mm").format(datess);
177   - String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"' and"
178   - + " real_exec_date='"+dates+"' ";
179   -// + "and fcsj_actual > '"+sk+"' ";
180   -// + "and '"+sk+"' <dfsj";
  177 + String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
  178 + + " from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"' and"
  179 + + " real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
181 180 List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,
182 181 new RowMapper<ScheduleRealInfo>(){
183 182 @Override
... ...
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
  View file @d712400
... ... @@ -46,7 +46,7 @@ public class SpeedingServiceImpl implements SpeedingService {
46 46 Object date=map.get("date");
47 47  
48 48 if(line!=null){
49   - sql +=" and line like'%"+line.toString()+"%'";
  49 + sql +=" and line like'%"+line.toString().trim()+"%'";
50 50 }
51 51  
52 52 if(nbbm!=null){
... ... @@ -125,7 +125,7 @@ public class SpeedingServiceImpl implements SpeedingService {
125 125 Object date=map.get("date");
126 126  
127 127 if(line!=null){
128   - sql +=" and line like'%"+line.toString()+"%'";
  128 + sql +=" and line like'%"+line.toString().trim()+"%'";
129 129 }
130 130  
131 131 if(nbbm!=null){
... ... @@ -177,10 +177,9 @@ public class SpeedingServiceImpl implements SpeedingService {
177 177 Date datess = new Date(d1);
178 178 String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
179 179 String sk=new SimpleDateFormat("HH:mm").format(datess);
180   - String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"' and"
181   - + " real_exec_date='"+dates+"' ";
182   -// + "and fcsj_actual > '"+sk+"' ";
183   -// + "and '"+sk+"' <dfsj";
  180 + String sqlPbb="SELECT * FROM ( select lp_name,cl_zbh,j_gh,j_name,MIN(fcsj) as fcsj,MAX(zdsj) as ddsj"
  181 + + " from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"' and"
  182 + + " real_exec_date='"+dates+"' GROUP BY cl_zbh,lp_name,j_gh,j_name ) t WHERE t.fcsj<='"+sk+"' AND t.ddsj>='"+sk+"' " ;
184 183 List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,
185 184 new RowMapper<ScheduleRealInfo>(){
186 185 @Override
... ...
src/main/java/com/bsth/service/forms/FormsService.java
  View file @d712400
... ... @@ -31,7 +31,7 @@ public interface FormsService {
31 31  
32 32 public List<Singledata> singledata(Map<String, Object> map);
33 33  
34   - public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line,String data);
  34 + public List<Vehicleloading> vehicleloading(String line,String data);
35 35  
36 36 public List<Operationservice> operationservice(Map<String, Object> map);
37 37  
... ...
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @d712400
... ... @@ -25,7 +25,9 @@ import com.bsth.entity.mcy_forms.Singledata;
25 25 import com.bsth.entity.mcy_forms.Turnoutrate;
26 26 import com.bsth.entity.mcy_forms.Vehicleloading;
27 27 import com.bsth.entity.mcy_forms.Waybillday;
  28 +import com.bsth.entity.oil.Ylb;
28 29 import com.bsth.entity.realcontrol.ScheduleRealInfo;
  30 +import com.bsth.repository.oil.YlbRepository;
29 31 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
30 32 import com.bsth.data.BasicData;
31 33 import com.bsth.entity.mcy_forms.Allline;
... ... @@ -55,6 +57,9 @@ public class FormsServiceImpl implements FormsService {
55 57  
56 58 @Autowired
57 59 CulateMileageService culateMileageService;
  60 +
  61 + @Autowired
  62 + YlbRepository ylbRepository;
58 63  
59 64 // 行车路单日报表
60 65 @Override
... ... @@ -417,7 +422,19 @@ public class FormsServiceImpl implements FormsService {
417 422 // 路单数据
418 423 @Override
419 424 public List<Singledata> singledata(Map<String, Object> map) {
420   - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  425 +
  426 + String gsdm="";
  427 + if(map.get("gsdmSing")!=null){
  428 + gsdm=map.get("gsdmSing").toString();
  429 + }
  430 + String fgsdm="";
  431 + if(map.get("fgsdmSing")!=null){
  432 + fgsdm=map.get("fgsdmSing").toString();
  433 + }
  434 +
  435 + String xlbm=map.get("line").toString().trim();
  436 +
  437 + /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
421 438 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
422 439 Date d = null;
423 440 Date d1 = null;
... ... @@ -429,60 +446,92 @@ public class FormsServiceImpl implements FormsService {
429 446 e.printStackTrace();
430 447 }
431 448 String rq2 = sdf1.format(d);
432   - String rq3 = sdf1.format(d1);
  449 + String rq3 = sdf1.format(d1);*/
433 450  
434   - rq = rq2 + "-" + rq3;
  451 +// rq = rq2 + "-" + rq3;
435 452 startDate = map.get("startDate").toString();
436   - endDate = map.get("endDate").toString();
437   - String sql = "select t.*,y.yh,y.jzl from ("
438   - + " select r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
439   - + " from bsth_c_s_sp_info_real r where r.schedule_date_str "
440   - + " BETWEEN '"+startDate+"' and '"+endDate+"' and r.xl_bm='"+map.get("line").toString()+"' "
441   - + " AND r.gs_bm is not null and r.gs_bm='"+map.get("gsdmSing").toString()+"' "
442   - + " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"' "
443   - + " group by r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm) t "
444   - + " LEFT JOIN (select a.nbbm,a.jsy,SUM(a.yh) as yh,SUM(a.jzl) as jzl "
445   - + " from bsth_c_ylb a where a.rq BETWEEN '"+startDate+"' and '"+endDate+"'and "
446   - + " a.ssgsdm='"+map.get("gsdmSing").toString()+"' and a.fgsdm='"+map.get("fgsdmSing").toString()+"' "
447   - + "group by a.nbbm,a.jsy) y"
448   - + " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
  453 +// endDate = map.get("endDate").toString();
  454 +// String sql = "select t.*,y.yh,y.jzl from ("
  455 +// + " select r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
  456 +// + " from bsth_c_s_sp_info_real r where r.schedule_date_str "
  457 +// + " BETWEEN '"+startDate+"' and '"+endDate+"' and r.xl_bm='"+map.get("line").toString()+"' "
  458 +// + " AND r.gs_bm is not null and r.gs_bm='"+map.get("gsdmSing").toString()+"' "
  459 +// + " and r.fgs_bm='"+map.get("fgsdmSing").toString()+"' "
  460 +// + " group by r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm) t "
  461 +// + " LEFT JOIN (select a.nbbm,a.jsy,SUM(a.yh) as yh,SUM(a.jzl) as jzl "
  462 +// + " from bsth_c_ylb a where a.rq BETWEEN '"+startDate+"' and '"+endDate+"'and "
  463 +// + " a.ssgsdm='"+map.get("gsdmSing").toString()+"' and a.fgsdm='"+map.get("fgsdmSing").toString()+"' "
  464 +// + "group by a.nbbm,a.jsy) y"
  465 +// + " on y.nbbm=t.cl_zbh and y.jsy= t.j_gh";
449 466  
  467 + String sql="select r.s_gh,r.s_name, "
  468 + + " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
  469 + + " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+startDate+"'";
  470 + if(xlbm.equals("")){
  471 + sql +="and r.gs_bm='"+gsdm+"' "
  472 + + " and r.fgs_bm='"+fgsdm+"'";
  473 + }else{
  474 + sql += " and r.xl_bm = '"+xlbm+"'";
  475 + }
  476 + sql += " group by r.s_gh,r.s_name,"
  477 + + " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
  478 +
450 479 List<Singledata> list = jdbcTemplate.query(sql, new RowMapper<Singledata>() {
451 480 //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
452 481 @Override
453 482 public Singledata mapRow(ResultSet arg0, int arg1) throws SQLException {
454 483 Singledata sin = new Singledata();
455   - sin.setrQ(rq);
456   - sin.setgS(arg0.getString("gs_bm"));
  484 + sin.setrQ(startDate);
457 485 sin.setxL(arg0.getString("xl_name"));
458 486 sin.setClzbh(arg0.getString("cl_zbh"));
459 487 sin.setJsy(arg0.getString("j_gh"));
460 488 sin.setjName(arg0.getString("j_name"));
461   - sin.setHyl(arg0.getString("YH"));
462   - sin.setJzl(arg0.getString("JZL"));
463   - // sin.setJzl(arg0.getString(""));//非营业性用油
464   - sin.setJhjl(arg0.getString("JZL"));
  489 + sin.setSgh(arg0.getString("s_gh"));
  490 + sin.setsName(arg0.getString("s_name"));
  491 + sin.setgS(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs_bm")+"_"+arg0.getString("gs_bm")));
465 492  
466 493 return sin;
467 494 }
468 495 });
469   - DecimalFormat df = new DecimalFormat("0.00");
470   - for(int i=0;i<list.size();i++){
471   -
472   - Singledata si=list.get(i);
473   - si.setgS(BasicData.businessCodeNameMap.get(si.getgS()));
474   - si.setJzl(df.format(Double.parseDouble(si.getJzl())));
475   - si.setHyl(df.format(Double.parseDouble(si.getHyl())));
476   - Map<String, Object> maps = new HashMap<>();
477   - maps = commonService.findKMBC1(si.getjName(),si.getClzbh(), startDate,
478   - endDate);
479   - //sin.setjName(maps.get("j_name") == null ? "" : maps.get("j_name").toString());
480   - si.setSgh(maps.get("s_gh") == null ? "" : maps.get("s_gh").toString());
481   - si.setsName(maps.get("s_name") == null ? "" : maps.get("s_name").toString());
482   - si.setJhlc(maps.get("yygl") == null ? "" : maps.get("yygl").toString());
483   - si.setEmptMileage(maps.get("ksgl") == null ? "" : maps.get("ksgl").toString());
484   - si.setJhjl(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
485 496  
  497 + List<Ylb> listYlb= ylbRepository.obtainYl(startDate, gsdm, fgsdm, xlbm, "", "xlbm");
  498 + List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, startDate);
  499 + for (int i = 0; i < list.size(); i++) {
  500 + List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
  501 + Singledata sin=list.get(i);
  502 + String jsy=sin.getJsy();
  503 + String clzbh=sin.getClzbh();
  504 + for (int j = 0; j < listReal.size(); j++) {
  505 + ScheduleRealInfo s=listReal.get(j);
  506 + if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)){
  507 + newList.add(s);
  508 + }
  509 + }
  510 +
  511 + double jhgl=culateMileageService.culateJhgl(newList);
  512 + double yygl=culateMileageService.culateSjgl(newList);
  513 + double ljgl=culateMileageService.culateLjgl(newList);
  514 + double ksgl=culateMileageService.culateKsgl(newList);
  515 + double jcgl=culateMileageService.culateJccgl(newList);
  516 + double zyygl=Arith.add(yygl, ljgl);
  517 + double zksgl=Arith.add(ksgl, jcgl);
  518 + sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
  519 + sin.setEmptMileage(String.valueOf(zksgl));
  520 + sin.setJhjl(String.valueOf(jhgl));
  521 + double yhl=0.0;
  522 + double jzl=0.0;
  523 + double fyy=0.0;
  524 + for (int j = 0; j < listYlb.size(); j++) {
  525 + Ylb y=listYlb.get(j);
  526 + if(y.getJsy().equals(jsy) && y.getNbbm().equals(clzbh)){
  527 + yhl=Arith.add(yhl, y.getYh()==null?0:y.getYh());
  528 + jzl=Arith.add(jzl, y.getJzl()==null?0:y.getJzl());
  529 + fyy=Arith.add(fyy, y.getSh()==null?0:y.getSh());
  530 + }
  531 + }
  532 + sin.setHyl(String.valueOf(yhl));
  533 + sin.setJzl(String.valueOf(jzl));
  534 + sin.setUnyyyl(String.valueOf(fyy));
486 535 }
487 536 return list;
488 537 }
... ... @@ -545,50 +594,72 @@ public class FormsServiceImpl implements FormsService {
545 594  
546 595 // 车辆加注
547 596 @Override
548   - public List<Vehicleloading> vehicleloading(String gsdmVehic,String fgsdmVehic,String line, String date) {
  597 + public List<Vehicleloading> vehicleloading(String line, String date) {
549 598  
550   - String sql = " SELECT r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type "
551   - + " FROM bsth_c_s_sp_info_real r "
552   - + " INNER join ( select y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH from bsth_c_ylb y "
553   - + " where to_days(y.RQ)=to_days('" + date + "') and y.XLBM= '" + line + "' GROUP BY y.RQ,y.XLBM,y.NBBM,y.JSY,y.JZL,y.YH) y "
554   - + " on r.cl_zbh=y.nbbm "
555   - + " where to_days(r.schedule_date_str)=to_days('" + date + "')"
556   - + " and r.xl_bm='" + line + "' "
557   - + " AND r.gs_bm is not null"
558   - + " and r.bc_type not in('in','out')";
559   - if(gsdmVehic.toString()!=""){
560   - sql+=" and r.gs_bm='"+gsdmVehic+"'";
561   - }
562   - if(fgsdmVehic.toString()!=""){
563   - sql+=" and r.fgs_bm='"+fgsdmVehic +"'";
564   - }
565   - sql += " GROUP BY r.schedule_date_str,r.xl_bm,r.xl_name,r.cl_zbh,r.j_name,y.YH,y.JZL,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name ";
  599 + String sql="select r.s_gh,r.s_name, "
  600 + + " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm"
  601 + + " from bsth_c_s_sp_info_real r where r.schedule_date_str = '"+date+"' "
  602 + + " and r.xl_bm = '"+line+"' group by r.s_gh,r.s_name,"
  603 + + " r.xl_bm,r.xl_name,r.cl_zbh,r.j_gh,r.j_name,r.gs_bm,r.fgs_bm";
  604 +
566 605 List<Vehicleloading> list = jdbcTemplate.query(sql, new RowMapper<Vehicleloading>() {
567 606 @Override
568 607 public Vehicleloading mapRow(ResultSet arg0, int arg1) throws SQLException {
569 608 Vehicleloading ve = new Vehicleloading();
570   - ve.setrQ(arg0.getString("schedule_date_str"));
571   - ve.setgS(arg0.getString("gs_name"));
  609 + ve.setgS(BasicData.businessFgsCodeNameMap.get(arg0.getString("fgs_bm")+"_"+arg0.getString("gs_bm")));
572 610 ve.setxL(arg0.getString("xl_name"));
573 611 ve.setClzbh(arg0.getString("cl_zbh"));
574   - ve.setJzl(arg0.getString("JZL"));
575   - ve.setHyl(arg0.getString("YH"));
576   - // ve.setLs(arg0.getString("").toString());//尿素
577 612 ve.setJgh(arg0.getString("j_gh").toString());
578 613 return ve;
579 614 }
580 615 });
581 616  
582   - for(int i=0;i<list.size();i++){
583   - Vehicleloading v=list.get(i);
584   - Map<String, Object> maps = new HashMap<>();
585   - maps = commonService.findKMBC2(v.getJgh(), v.getClzbh(),
586   - v.getrQ());
587   - v.setJhlc(maps.get("jhlc") == null ? "" : maps.get("jhlc").toString());
588   - v.setJhbc(maps.get("jhbc").toString() == null ? "" : maps.get("jhbc").toString());// 计划班次
589   - v.setSjbc(maps.get("sjbc").toString() == null ? "" : maps.get("sjbc").toString());// 实际班次
590   - }
591 617  
  618 + List<Ylb> listYlb= ylbRepository.obtainYl(startDate, "", "", line, "", "xlbm");
  619 + List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
  620 + for (int i = 0; i < list.size(); i++) {
  621 + List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
  622 + Vehicleloading sin=list.get(i);
  623 + sin.setrQ(date);
  624 + String jsy=sin.getJgh();
  625 + String clzbh=sin.getClzbh();
  626 + for (int j = 0; j < listReal.size(); j++) {
  627 + ScheduleRealInfo s=listReal.get(j);
  628 + if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)){
  629 + newList.add(s);
  630 + }
  631 + }
  632 +
  633 + int jhbc=culateMileageService.culateJhbc(newList, "");
  634 + int sjbc=culateMileageService.culateSjbc(newList, "");
  635 + int ljbc=culateMileageService.culateLjbc(newList, "");
  636 + double yygl=culateMileageService.culateSjgl(newList);
  637 + double ljgl=culateMileageService.culateLjgl(newList);
  638 + double ksgl=culateMileageService.culateKsgl(newList);
  639 + double jcgl=culateMileageService.culateJccgl(newList);
  640 + double zyygl=Arith.add(yygl, ljgl);
  641 + double zksgl=Arith.add(ksgl, jcgl);
  642 + sin.setJhlc(String.valueOf(Arith.add(zyygl,zksgl)));
  643 + sin.setJhbc(String.valueOf(jhbc));
  644 + sin.setSjbc(String.valueOf(sjbc+ljbc));
  645 + double yhl=0.0;
  646 + double jzl=0.0;
  647 + double fyy=0.0;
  648 + double ns=0.0;
  649 + for (int j = 0; j < listYlb.size(); j++) {
  650 + Ylb y=listYlb.get(j);
  651 + if(y.getJsy().equals(jsy) && y.getNbbm().equals(clzbh)){
  652 + yhl=Arith.add(yhl, y.getYh()==null?0:y.getYh());
  653 + jzl=Arith.add(jzl, y.getJzl()==null?0:y.getJzl());
  654 + fyy=Arith.add(fyy, y.getSh()==null?0:y.getSh());
  655 + ns =Arith.add(ns, y.getNs()==null?0:y.getNs());
  656 + }
  657 + }
  658 + sin.setHyl(String.valueOf(yhl));
  659 + sin.setJzl(String.valueOf(jzl));
  660 + sin.setUnyyyl(String.valueOf(fyy));
  661 + sin.setLs(String.valueOf(ns));
  662 + }
592 663 return list;
593 664 }
594 665  
... ... @@ -816,7 +887,7 @@ public class FormsServiceImpl implements FormsService {
816 887 }
817 888  
818 889 String fgsbm="";
819   - if(map.get("fgsdmDaily").toString()!=null){
  890 + if(map.get("fgsdmDaily")!=null){
820 891 fgsbm=map.get("fgsdmDaily").toString();
821 892 }
822 893  
... ... @@ -853,6 +924,12 @@ public class FormsServiceImpl implements FormsService {
853 924 for(int i=0;i<list.size();i++){
854 925 sList =new ArrayList<ScheduleRealInfo>();
855 926 Daily d=list.get(i);
  927 + if(d.getYh()==null){
  928 + d.setYh("0");
  929 + }else{
  930 + if(d.getYh().equals(""))
  931 + d.setYh("0");
  932 + }
856 933 for (int j = 0; j < lists.size(); j++) {
857 934 ScheduleRealInfo s=lists.get(j);
858 935 if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
... ...
src/main/java/com/bsth/service/realcontrol/DataManagerService.java
  View file @d712400
1   -package com.bsth.service.realcontrol;
2   -
3   -import java.util.Map;
4   -
5   -/**
6   - * Created by panzhao on 2017/4/18.
7   - */
8   -public interface DataManagerService {
9   -
10   - Map<String, Object> carInfos(Integer lineId);
11   -
12   - Map<String,Object> updateDevices(String jsonStr);
13   -}
  1 +package com.bsth.service.realcontrol;
  2 +
  3 +import java.util.Map;
  4 +
  5 +/**
  6 + * Created by panzhao on 2017/4/18.
  7 + */
  8 +public interface DataManagerService {
  9 +
  10 + Map<String, Object> carInfos(Integer lineId);
  11 +
  12 + Map<String,Object> updateDevices(String jsonStr);
  13 +}
... ...
src/main/java/com/bsth/service/realcontrol/impl/DataManagerServiceImpl.java
  View file @d712400
1   -package com.bsth.service.realcontrol.impl;
2   -
3   -import com.alibaba.fastjson.JSONArray;
4   -import com.alibaba.fastjson.JSONObject;
5   -import com.bsth.common.ResponseCode;
6   -import com.bsth.data.BasicData;
7   -import com.bsth.entity.Cars;
8   -import com.bsth.repository.CarsRepository;
9   -import com.bsth.service.realcontrol.DataManagerService;
10   -import com.bsth.util.db.DBUtils_oldSystem;
11   -import org.slf4j.Logger;
12   -import org.slf4j.LoggerFactory;
13   -import org.springframework.beans.factory.annotation.Autowired;
14   -import org.springframework.jdbc.core.JdbcTemplate;
15   -import org.springframework.stereotype.Service;
16   -
17   -import java.util.ArrayList;
18   -import java.util.HashMap;
19   -import java.util.List;
20   -import java.util.Map;
21   -
22   -/**
23   - * Created by panzhao on 2017/4/18.
24   - */
25   -@Service
26   -public class DataManagerServiceImpl implements DataManagerService{
27   -
28   - @Autowired
29   - CarsRepository carsRepository;
30   -
31   - @Autowired
32   - JdbcTemplate controlJdbcTemp;
33   -
34   - @Autowired
35   - BasicData.BasicDataLoader dataLoader;
36   -
37   - Logger logger = LoggerFactory.getLogger(this.getClass());
38   -
39   - @Override
40   - public Map<String, Object> carInfos(Integer lineId) {
41   -
42   - Map<String, Object> rs = new HashMap<>();
43   - try {
44   - List<Map<String, String>> nowData = new ArrayList<>();
45   - List<Map<String, String>> oldData = new ArrayList<>();
46   - Map<String, String> map;
47   -
48   - //查询新系统车辆信息
49   - List<Cars> list = carsRepository.findCarsByLineId(lineId);
50   - for(Cars c : list){
51   - map = new HashMap<>();
52   - map.put("nbbm", c.getInsideCode());
53   - map.put("device", c.getEquipmentCode());
54   - nowData.add(map);
55   - }
56   -
57   - //获取老系统数据
58   - JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
59   - List<Map<String, Object>> oyList = jdbcTemplate.queryForList("select NBBM,SBBH from JJWGPS_T_CLXXB t where xlbm=?", BasicData.lineId2CodeMap.get(lineId));
60   - for(Map<String, Object> tempMap : oyList){
61   - map = new HashMap<>();
62   - map.put("nbbm", tempMap.get("NBBM").toString());
63   - map.put("device", tempMap.get("SBBH").toString());
64   - oldData.add(map);
65   - }
66   -
67   - rs.put("status", ResponseCode.SUCCESS);
68   - rs.put("nows", nowData);
69   - rs.put("olds", oldData);
70   - }catch (Exception e){
71   - logger.error("", e);
72   - rs.put("status", ResponseCode.ERROR);
73   - rs.put("msg", e.getMessage());
74   - }
75   -
76   - return rs;
77   - }
78   -
79   - /**
80   - * 更新设备号
81   - * @param jsonStr
82   - * @return
83   - */
84   - @Override
85   - public Map<String, Object> updateDevices(String jsonStr) {
86   - Map<String, Object> rs = new HashMap<>();
87   - try {
88   - int count=0;
89   - JSONArray array = JSONArray.parseArray(jsonStr);
90   - JSONObject jObj;
91   - for(int i = 0; i < array.size(); i ++){
92   - jObj = array.getJSONObject(i);
93   - count += controlJdbcTemp.update("update bsth_c_cars set equipment_code=? where inside_code=?"
94   - , jObj.getString("device"), jObj.getString("nbbm"));
95   - }
96   -
97   - //刷新缓存
98   - dataLoader.loadDeviceInfo();
99   - rs.put("status", ResponseCode.SUCCESS);
100   - rs.put("count", count);
101   - }catch (Exception e){
102   - logger.error("", e);
103   - rs.put("status", ResponseCode.ERROR);
104   - rs.put("msg", e.getMessage());
105   - }
106   - return rs;
107   - }
108   -}
  1 +package com.bsth.service.realcontrol.impl;
  2 +
  3 +import com.alibaba.fastjson.JSONArray;
  4 +import com.alibaba.fastjson.JSONObject;
  5 +import com.bsth.common.ResponseCode;
  6 +import com.bsth.data.BasicData;
  7 +import com.bsth.entity.Cars;
  8 +import com.bsth.repository.CarsRepository;
  9 +import com.bsth.service.realcontrol.DataManagerService;
  10 +import com.bsth.util.db.DBUtils_oldSystem;
  11 +import org.slf4j.Logger;
  12 +import org.slf4j.LoggerFactory;
  13 +import org.springframework.beans.factory.annotation.Autowired;
  14 +import org.springframework.jdbc.core.JdbcTemplate;
  15 +import org.springframework.stereotype.Service;
  16 +
  17 +import java.util.ArrayList;
  18 +import java.util.HashMap;
  19 +import java.util.List;
  20 +import java.util.Map;
  21 +
  22 +/**
  23 + * Created by panzhao on 2017/4/18.
  24 + */
  25 +@Service
  26 +public class DataManagerServiceImpl implements DataManagerService{
  27 +
  28 + @Autowired
  29 + CarsRepository carsRepository;
  30 +
  31 + @Autowired
  32 + JdbcTemplate controlJdbcTemp;
  33 +
  34 + @Autowired
  35 + BasicData.BasicDataLoader dataLoader;
  36 +
  37 + Logger logger = LoggerFactory.getLogger(this.getClass());
  38 +
  39 + @Override
  40 + public Map<String, Object> carInfos(Integer lineId) {
  41 +
  42 + Map<String, Object> rs = new HashMap<>();
  43 + try {
  44 + List<Map<String, String>> nowData = new ArrayList<>();
  45 + List<Map<String, String>> oldData = new ArrayList<>();
  46 + Map<String, String> map;
  47 +
  48 + //查询新系统车辆信息
  49 + List<Cars> list = carsRepository.findCarsByLineId(lineId);
  50 + for(Cars c : list){
  51 + map = new HashMap<>();
  52 + map.put("nbbm", c.getInsideCode());
  53 + map.put("device", c.getEquipmentCode());
  54 + nowData.add(map);
  55 + }
  56 +
  57 + //获取老系统数据
  58 + JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
  59 + List<Map<String, Object>> oyList = jdbcTemplate.queryForList("select NBBM,SBBH from JJWGPS_T_CLXXB t where xlbm=?", BasicData.lineId2CodeMap.get(lineId));
  60 + for(Map<String, Object> tempMap : oyList){
  61 + map = new HashMap<>();
  62 + map.put("nbbm", tempMap.get("NBBM").toString());
  63 + map.put("device", tempMap.get("SBBH").toString());
  64 + oldData.add(map);
  65 + }
  66 +
  67 + rs.put("status", ResponseCode.SUCCESS);
  68 + rs.put("nows", nowData);
  69 + rs.put("olds", oldData);
  70 + }catch (Exception e){
  71 + logger.error("", e);
  72 + rs.put("status", ResponseCode.ERROR);
  73 + rs.put("msg", e.getMessage());
  74 + }
  75 +
  76 + return rs;
  77 + }
  78 +
  79 + /**
  80 + * 更新设备号
  81 + * @param jsonStr
  82 + * @return
  83 + */
  84 + @Override
  85 + public Map<String, Object> updateDevices(String jsonStr) {
  86 + Map<String, Object> rs = new HashMap<>();
  87 + try {
  88 + int count=0;
  89 + JSONArray array = JSONArray.parseArray(jsonStr);
  90 + JSONObject jObj;
  91 + for(int i = 0; i < array.size(); i ++){
  92 + jObj = array.getJSONObject(i);
  93 + count += controlJdbcTemp.update("update bsth_c_cars set equipment_code=? where inside_code=?"
  94 + , jObj.getString("device"), jObj.getString("nbbm"));
  95 + }
  96 +
  97 + //刷新缓存
  98 + dataLoader.loadDeviceInfo();
  99 + rs.put("status", ResponseCode.SUCCESS);
  100 + rs.put("count", count);
  101 + }catch (Exception e){
  102 + logger.error("", e);
  103 + rs.put("status", ResponseCode.ERROR);
  104 + rs.put("msg", e.getMessage());
  105 + }
  106 + return rs;
  107 + }
  108 +}
... ...
src/main/java/com/bsth/util/db/DBUtils_oldSystem.java
  View file @d712400
1   -package com.bsth.util.db;
2   -
3   -import com.mchange.v2.c3p0.DataSources;
4   -import org.apache.log4j.Logger;
5   -
6   -import javax.sql.DataSource;
7   -import java.sql.Connection;
8   -import java.sql.ResultSet;
9   -import java.sql.SQLException;
10   -import java.sql.Statement;
11   -import java.util.HashMap;
12   -import java.util.Map;
13   -
14   -/**
15   - * 老系统数据库连接池（保持少量的连接，不会对老系统有什么影响）
16   - * @author PanZhao
17   - *
18   - */
19   -//@Component
20   -public class DBUtils_oldSystem {
21   -
22   - private static String url = null;
23   -
24   - private static String username = null;
25   -
26   - private static String pwd = null;
27   -
28   - private static DataSource ds_pooled;
29   -
30   - static Logger logger = Logger.getLogger(DBUtils_oldSystem.class);
31   -
32   - static {
33   -
34   - try {
35   - // 1. 加载驱动类
36   - Class.forName("oracle.jdbc.driver.OracleDriver");
37   -
38   - url = "jdbc:oracle:thin:@10.10.200.225:1521:orcl";
39   - username = "jjwgps";
40   - pwd = "jjwgps";
41   -
42   - // 设置连接数据库的配置信息
43   - DataSource ds_unpooled = DataSources.unpooledDataSource(url,
44   - username, pwd);
45   -
46   - Map<String, Object> pool_conf = new HashMap<String, Object>();
47   - // 设置最大连接数
48   - pool_conf.put("maxPoolSize", 5);
49   -
50   - pool_conf.put("testConnectionOnCheckout", false);
51   - //异步检测连接的有效性
52   - pool_conf.put("testConnectionOnCheckin", true);
53   - //10分钟检测一次
54   - pool_conf.put("idleConnectionTestPeriod", 60 * 10);
55   - ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
56   - } catch (ClassNotFoundException e) {
57   - logger.error(e.toString());
58   - e.printStackTrace();
59   - } catch (SQLException e) {
60   - logger.error("初始化老系统连接池失败，非正式环境请忽略这个问题！");
61   - logger.error(e.toString());
62   - e.printStackTrace();
63   - }
64   - }
65   -
66   - /**
67   - * 获取连接对象
68   - */
69   - public static Connection getConnection() throws SQLException {
70   - return ds_pooled.getConnection();
71   - }
72   -
73   - /**
74   - * 释放连接池资源
75   - */
76   - public static void clearup() {
77   - if (ds_pooled != null) {
78   - try {
79   - DataSources.destroy(ds_pooled);
80   - } catch (SQLException e) {
81   - logger.error(e.toString());
82   - e.printStackTrace();
83   - }
84   - }
85   - }
86   -
87   - /**
88   - * 资源关闭
89   - *
90   - * @param rs
91   - * @param stmt
92   - * @param conn
93   - */
94   - public static void close(ResultSet rs, Statement stmt, Connection conn) {
95   - if (rs != null) {
96   - try {
97   - rs.close();
98   - } catch (SQLException e) {
99   - logger.error(e.toString());
100   - e.printStackTrace();
101   - }
102   - }
103   -
104   - if (stmt != null) {
105   - try {
106   - stmt.close();
107   - } catch (SQLException e) {
108   - logger.error(e.toString());
109   - e.printStackTrace();
110   - }
111   - }
112   -
113   - if (conn != null) {
114   - try {
115   - conn.close();
116   - } catch (SQLException e) {
117   - logger.error(e.toString());
118   - e.printStackTrace();
119   - }
120   - }
121   - }
122   -
123   - public static DataSource getDataSource(){
124   - return ds_pooled;
125   - }
126   -}
  1 +package com.bsth.util.db;
  2 +
  3 +import com.mchange.v2.c3p0.DataSources;
  4 +import org.apache.log4j.Logger;
  5 +
  6 +import javax.sql.DataSource;
  7 +import java.sql.Connection;
  8 +import java.sql.ResultSet;
  9 +import java.sql.SQLException;
  10 +import java.sql.Statement;
  11 +import java.util.HashMap;
  12 +import java.util.Map;
  13 +
  14 +/**
  15 + * 老系统数据库连接池（保持少量的连接，不会对老系统有什么影响）
  16 + * @author PanZhao
  17 + *
  18 + */
  19 +//@Component
  20 +public class DBUtils_oldSystem {
  21 +
  22 + private static String url = null;
  23 +
  24 + private static String username = null;
  25 +
  26 + private static String pwd = null;
  27 +
  28 + private static DataSource ds_pooled;
  29 +
  30 + static Logger logger = Logger.getLogger(DBUtils_oldSystem.class);
  31 +
  32 + static {
  33 +
  34 + try {
  35 + // 1. 加载驱动类
  36 + Class.forName("oracle.jdbc.driver.OracleDriver");
  37 +
  38 + url = "jdbc:oracle:thin:@10.10.200.225:1521:orcl";
  39 + username = "jjwgps";
  40 + pwd = "jjwgps";
  41 +
  42 + // 设置连接数据库的配置信息
  43 + DataSource ds_unpooled = DataSources.unpooledDataSource(url,
  44 + username, pwd);
  45 +
  46 + Map<String, Object> pool_conf = new HashMap<String, Object>();
  47 + // 设置最大连接数
  48 + pool_conf.put("maxPoolSize", 5);
  49 +
  50 + pool_conf.put("testConnectionOnCheckout", false);
  51 + //异步检测连接的有效性
  52 + pool_conf.put("testConnectionOnCheckin", true);
  53 + //10分钟检测一次
  54 + pool_conf.put("idleConnectionTestPeriod", 60 * 10);
  55 + ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
  56 + } catch (ClassNotFoundException e) {
  57 + logger.error(e.toString());
  58 + e.printStackTrace();
  59 + } catch (SQLException e) {
  60 + logger.error("初始化老系统连接池失败，非正式环境请忽略这个问题！");
  61 + logger.error(e.toString());
  62 + e.printStackTrace();
  63 + }
  64 + }
  65 +
  66 + /**
  67 + * 获取连接对象
  68 + */
  69 + public static Connection getConnection() throws SQLException {
  70 + return ds_pooled.getConnection();
  71 + }
  72 +
  73 + /**
  74 + * 释放连接池资源
  75 + */
  76 + public static void clearup() {
  77 + if (ds_pooled != null) {
  78 + try {
  79 + DataSources.destroy(ds_pooled);
  80 + } catch (SQLException e) {
  81 + logger.error(e.toString());
  82 + e.printStackTrace();
  83 + }
  84 + }
  85 + }
  86 +
  87 + /**
  88 + * 资源关闭
  89 + *
  90 + * @param rs
  91 + * @param stmt
  92 + * @param conn
  93 + */
  94 + public static void close(ResultSet rs, Statement stmt, Connection conn) {
  95 + if (rs != null) {
  96 + try {
  97 + rs.close();
  98 + } catch (SQLException e) {
  99 + logger.error(e.toString());
  100 + e.printStackTrace();
  101 + }
  102 + }
  103 +
  104 + if (stmt != null) {
  105 + try {
  106 + stmt.close();
  107 + } catch (SQLException e) {
  108 + logger.error(e.toString());
  109 + e.printStackTrace();
  110 + }
  111 + }
  112 +
  113 + if (conn != null) {
  114 + try {
  115 + conn.close();
  116 + } catch (SQLException e) {
  117 + logger.error(e.toString());
  118 + e.printStackTrace();
  119 + }
  120 + }
  121 + }
  122 +
  123 + public static DataSource getDataSource(){
  124 + return ds_pooled;
  125 + }
  126 +}
... ...
src/main/resources/static/pages/forms/mould/list.xls
View file @d712400
No preview for this file type
src/main/resources/static/pages/forms/mould/vehicleloading.xls
View file @d712400
No preview for this file type
src/main/resources/static/pages/forms/statement/daily.html
  View file @d712400
... ... @@ -92,8 +92,7 @@
92 92  
93 93 <script>
94 94 $(function(){
95   - var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'};
96   - var fage=false;
  95 +
97 96 // 关闭左侧栏
98 97 if (!$('body').hasClass('page-sidebar-closed'))
99 98 $('.menu-toggler.sidebar-toggler').click();
... ... @@ -102,6 +101,7 @@
102 101 format : 'YYYY-MM-DD',
103 102 locale : 'zh-cn'
104 103 });
  104 + var fage=false;
105 105 var xlList;
106 106 var obj = [];
107 107  
... ...
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @d712400
... ... @@ -551,7 +551,7 @@ letter-spacing: 20px;
551 551 <td>{{obj.fast}}</td>
552 552 <td>{{obj.slow}}</td>
553 553 <td>{{obj.fcsj}}</td>
554   - <td style="word-break: keep-all;white-space:nowrap;">{{obj.fcsjActual}}
  554 + <td>{{obj.fcsjActual}}
555 555 {{if obj.bcType== "in"}}
556 556 (进)
557 557 {{/if}}
... ...
src/main/resources/static/pages/mforms/operationservices/operationservice.html
  View file @d712400
... ... @@ -42,19 +42,20 @@
42 42 class="form-control" name="subCompany" id="fgsdmOperat"
43 43 style="width: 140px;"></select>
44 44 </div>
45   - <div style="display: inline-block;">
  45 + <div style="margin-top: 2px"></div>
  46 + <div style="display: inline-block;margin-left: 33px;">
46 47 <span class="item-label" style="width: 80px;">线路: </span> <select
47   - class="form-control" name="line" id="line" style="width: 180px;"></select>
  48 + class="form-control" name="line" id="line" style="width: 140px;"></select>
48 49 </div>
49 50 <div style="display: inline-block; margin-left: 15px;">
50 51 <span class="item-label" style="width: 80px;">开始时间: </span> <input
51 52 class="form-control" type="text" id="startDate"
52   - style="width: 120px;" />
  53 + style="width: 140px;" />
53 54 </div>
54 55 <div style="display: inline-block; margin-left: 15px;">
55 56 <span class="item-label" style="width: 80px;">结束时间: </span> <input
56 57 class="form-control" type="text" id="endDate"
57   - style="width: 120px;" />
  58 + style="width: 140px;" />
58 59 </div>
59 60 <div style="display: inline-block; margin-left: 15px">
60 61 <span class="item-label" style="width: 150px;">统计： </span>
... ... @@ -102,69 +103,94 @@
102 103 format : 'YYYY-MM-DD',
103 104 locale : 'zh-cn'
104 105 });
  106 +
  107 + var d = new Date();
  108 + var year = d.getFullYear();
  109 + var month = d.getMonth() + 1;
  110 + var day = d.getDate();
  111 + if(month < 10)
  112 + month = "0" + month;
  113 + if(day < 10)
  114 + day = "0" + day;
  115 + $("#startDate").val(year + "-" + month + "-" + day);
  116 + $("#endDate").val(year + "-" + month + "-" + day);
105 117  
106   - $.get('/basic/lineCode2Name', function(result) {
107   - var data = [];
108   -
109   - for ( var code in result) {
110   - data.push({
111   - id : code,
112   - text : result[code]
113   - });
114   - }
115   - initPinYinSelect2('#line', data, '');
116   -
117   - })
118   -
  118 + var fage=false;
  119 + var xlList;
119 120 var obj = [];
120   - $.get('/user/companyData', function(result) {
121   - obj = result;
122   - var options = '';
123   - for (var i = 0; i < obj.length; i++) {
124   - options += '<option value="'+obj[i].companyCode+'">'
125   - + obj[i].companyName + '</option>';
126   - }
127   -
128   - if (obj.length == 0) {
129   - $("#gsdmDiv_operat").css('display', 'none');
130   - $('#fgsdmDiv_operat').css('display', 'none');
131   - } else if (obj.length == 1) {
132   - $("#gsdmDiv_operat").css('display', 'none');
133   - if (obj[0].children.length == 1 || obj[0].children.length == 0)
134   - $('#fgsdmDiv_operat').css('display', 'none');
135   - }
136   - $('#gsdmOperat').html(options);
137   - updateCompany();
138   - });
139   -
140   - $("#gsdmOperat").on("change", updateCompany);
141   - function updateCompany() {
  121 +
  122 +
  123 + $.get('/report/lineList',function(result){
  124 + xlList=result;
  125 + $.get('/user/companyData', function(result){
  126 + obj = result;
  127 + var options = '';
  128 + for(var i = 0; i < obj.length; i++){
  129 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  130 + }
  131 +
  132 + if(obj.length ==0){
  133 + $("#gsdmDiv_operat").css('display','none');
  134 + }else if(obj.length ==1){
  135 + $("#gsdmDiv_operat").css('display','none');
  136 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  137 + $('#fgsdmDiv_operat').css('display','none');
  138 + }
  139 + $('#gsdmOperat').html(options);
  140 + updateCompany();
  141 + });
  142 + })
  143 + $("#gsdmOperat").on("change",updateCompany);
  144 + function updateCompany(){
142 145 var company = $('#gsdmOperat').val();
143 146 var options = '';
144   - for (var i = 0; i < obj.length; i++) {
145   - if (obj[i].companyCode == company) {
  147 + for(var i = 0; i < obj.length; i++){
  148 + if(obj[i].companyCode == company){
146 149 var children = obj[i].children;
147   - for (var j = 0; j < children.length; j++) {
148   - options += '<option value="'+children[j].code+'">'
149   - + children[j].name + '</option>';
  150 + for(var j = 0; j < children.length; j++){
  151 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
150 152 }
151 153 }
152 154 }
153 155 $('#fgsdmOperat').html(options);
  156 + initXl();
154 157 }
155 158  
156   - $.get('/basic/lineCode2Name', function(result) {
157   - var data = [];
158   -
159   - for ( var code in result) {
160   - data.push({
161   - id : code,
162   - text : result[code]
163   - });
  159 + /* $.get('/basic/lineCode2Name',function(result){
  160 + var data=[];
  161 +
  162 + for(var code in result){
  163 + data.push({id: code, text: result[code]});
164 164 }
165   - initPinYinSelect2('#line', data, '');
166   -
167   - })
  165 + initPinYinSelect2('#line',data,'');
  166 +
  167 + }) */
  168 +
  169 + $("#fgsdmOperat").on("change",initXl);
  170 + function initXl(){
  171 + var data=[];
  172 + if(fage){
  173 + $("#line").select2("destroy").html('');
  174 + }
  175 + var fgs=$('#fgsdmOperat').val();
  176 + var gs=$('#gsdmOperat').val();
  177 + for(var i=0;i<xlList.length;i++){
  178 + if(gs!=""){
  179 + if(fgs!=""){
  180 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  181 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  182 + }
  183 + }else{
  184 + if(xlList[i]["gsbm"]==gs){
  185 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  186 + }
  187 + }
  188 + }
  189 + }
  190 + initPinYinSelect2('#line',data,'');
  191 + fage=true;
  192 + }
  193 +
168 194  
169 195 $("#query").on(
170 196 "click",
... ...
src/main/resources/static/pages/mforms/singledatas/singledata.html
  View file @d712400
... ... @@ -37,18 +37,14 @@
37 37 <select class="form-control" name="subCompany" id="fgsdmSing" style="width: 140px;"></select>
38 38 </div>
39 39 <div style="display: inline-block;">
40   - <span class="item-label" style="width: 80px;">线路: </span>
41   - <select class="form-control" name="line" id="line" style="width: 136px;"></select>
  40 + <span class="item-label" style="width: 80px;">&nbsp;线路: </span>
  41 + <select class="form-control" name="line" id="line" style="width: 140px;"></select>
42 42 </div>
43   - <div style="margin-top: 10px"></div>
44 43 <div style="display: inline-block;margin-left: 15px;">
45   - <span class="item-label" style="width: 80px;">开始时间: </span>
46   - <input class="form-control" type="text" id="startDate" style="width: 120px;"/>
47   - </div>
48   - <div style="display: inline-block;margin-left: 15px;">
49   - <span class="item-label" style="width: 80px;">结束时间: </span>
50   - <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
  44 + <span class="item-label" style="width: 140px;">时间: </span>
  45 + <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
51 46 </div>
  47 +
52 48 <div style="display: inline-block;margin-left: 15px">
53 49 <span class="item-label" style="width: 150px;">统计： </span>
54 50 </div>
... ... @@ -101,26 +97,31 @@
101 97 locale : 'zh-cn'
102 98 });
103 99  
  100 + var fage=false;
  101 + var xlList;
104 102 var obj = [];
105   - $.get('/user/companyData', function(result){
106   - obj = result;
107   - var options = '';
108   - for(var i = 0; i < obj.length; i++){
109   - options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
110   - }
111   -
112   - if(obj.length ==0){
113   - $("#gsdmDiv_sing").css('display','none');
114   - $('#fgsdmDiv_sing').css('display','none');
115   - }else if(obj.length ==1){
116   - $("#gsdmDiv_sing").css('display','none');
117   - if(obj[0].children.length == 1 || obj[0].children.length ==0)
118   - $('#fgsdmDiv_sing').css('display','none');
119   - }
120   - $('#gsdmSing').html(options);
121   - updateCompany();
122   - });
123   -
  103 +
  104 +
  105 + $.get('/report/lineList',function(result){
  106 + xlList=result;
  107 + $.get('/user/companyData', function(result){
  108 + obj = result;
  109 + var options = '';
  110 + for(var i = 0; i < obj.length; i++){
  111 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  112 + }
  113 +
  114 + if(obj.length ==0){
  115 + $("#gsdmDiv_sing").css('display','none');
  116 + }else if(obj.length ==1){
  117 + $("#gsdmDiv_sing").css('display','none');
  118 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  119 + $('#fgsdmDiv_sing').css('display','none');
  120 + }
  121 + $('#gsdmSing').html(options);
  122 + updateCompany();
  123 + });
  124 + })
124 125 $("#gsdmSing").on("change",updateCompany);
125 126 function updateCompany(){
126 127 var company = $('#gsdmSing').val();
... ... @@ -134,10 +135,10 @@
134 135 }
135 136 }
136 137 $('#fgsdmSing').html(options);
  138 + initXl();
137 139 }
138 140  
139   -
140   - $.get('/basic/lineCode2Name',function(result){
  141 + /* $.get('/basic/lineCode2Name',function(result){
141 142 var data=[];
142 143  
143 144 for(var code in result){
... ... @@ -145,19 +146,41 @@
145 146 }
146 147 initPinYinSelect2('#line',data,'');
147 148  
148   - })
  149 + }) */
  150 +
  151 + $("#fgsdmSing").on("change",initXl);
  152 + function initXl(){
  153 + var data=[];
  154 + if(fage){
  155 + $("#line").select2("destroy").html('');
  156 + }
  157 + var fgs=$('#fgsdmSing').val();
  158 + var gs=$('#gsdmSing').val();
  159 + for(var i=0;i<xlList.length;i++){
  160 + if(gs!=""){
  161 + if(fgs!=""){
  162 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  163 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  164 + }
  165 + }else{
  166 + if(xlList[i]["gsbm"]==gs){
  167 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  168 + }
  169 + }
  170 + }
  171 + }
  172 + initPinYinSelect2('#line',data,'');
  173 + fage=true;
  174 + }
149 175  
150 176  
151 177 $("#query").on("click",function(){
152 178 var line = $("#line").val();
153 179 var startDate = $("#startDate").val();
154   - var endDate = $("#endDate").val();
155 180 var lpName = $("#lpName").val();
156 181 var gsdmSing = $("#gsdmSing").val();
157   - var fgsdmSing = $("#fgsdmSing").val();
158   - $post("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,endDate:endDate ,lpName:lpName},function(result){
159   - $("#sDate").text(startDate);
160   - $("#eDate").text(endDate);
  182 + var fgsdmSing = $("#fgsdmSing").val(); var params = {};
  183 + $get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName},function(result){
161 184 var temp = {};
162 185 var today_account = 0;
163 186 temp["line"] = $("#line").text();
... ... @@ -181,7 +204,7 @@
181 204 var lpName = $("#lpName").val();
182 205 var gsdmSing = $("#gsdmSing").val();
183 206 var fgsdmSing = $("#fgsdmSing").val();
184   - $post('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
  207 + $get('/mcy_export/singledataExport',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,type:'export'},function(result){
185 208 window.open("/downloadFile/download?fileName=路单数据"+moment(startDate).format("YYYYMMDD"));
186 209 });
187 210 });
... ... @@ -203,7 +226,7 @@
203 226 <td>{{obj.emptMileage}}</td>
204 227 <td>{{obj.hyl}}</td>
205 228 <td>{{obj.jzl}}</td>
206   - <td> </td>
  229 + <td>{{obj.unyyyl}}</td>
207 230 <td>{{obj.jhjl}}</td>
208 231 </tr>
209 232 {{/each}}
... ...
src/main/resources/static/pages/mforms/vehicleloadings/vehicleloading.html
  View file @d712400
... ... @@ -64,7 +64,7 @@
64 64 <th>耗油量(不含非营业性用油)</th>
65 65 <th>尿素</th>
66 66 <th>实际公里(含空放公里)</th>
67   - <th>非商业性用油</th>
  67 + <th>非营业性用油</th>
68 68 <th>计划班次</th>
69 69 <th>实际班次</th>
70 70 </tr>
... ... @@ -89,26 +89,31 @@
89 89 format : 'YYYY-MM-DD',
90 90 locale : 'zh-cn'
91 91 });
  92 + var fage=false;
  93 + var xlList;
  94 + var obj = [];
92 95  
93   - $.get('/user/companyData', function(result){
94   - obj = result;
95   - var options = '';
96   - for(var i = 0; i < obj.length; i++){
97   - options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
98   - }
99   -
100   - if(obj.length ==0){
101   - $("#gsdmDiv_vehic").css('display','none');
102   - $('#fgsdmDiv_vehic').css('display','none');
103   - }else if(obj.length ==1){
104   - $("#gsdmDiv_vehic").css('display','none');
105   - if(obj[0].children.length == 1 || obj[0].children.length ==0)
106   - $('#fgsdmDiv_vehic').css('display','none');
107   - }
108   - $('#gsdmVehic').html(options);
109   - updateCompany();
110   - });
111   -
  96 +
  97 + $.get('/report/lineList',function(result){
  98 + xlList=result;
  99 + $.get('/user/companyData', function(result){
  100 + obj = result;
  101 + var options = '';
  102 + for(var i = 0; i < obj.length; i++){
  103 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  104 + }
  105 +
  106 + if(obj.length ==0){
  107 + $("#gsdmDiv_vehic").css('display','none');
  108 + }else if(obj.length ==1){
  109 + $("#gsdmDiv_vehic").css('display','none');
  110 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  111 + $('#fgsdmDiv_vehic').css('display','none');
  112 + }
  113 + $('#gsdmVehic').html(options);
  114 + updateCompany();
  115 + });
  116 + })
112 117 $("#gsdmVehic").on("change",updateCompany);
113 118 function updateCompany(){
114 119 var company = $('#gsdmVehic').val();
... ... @@ -122,9 +127,10 @@
122 127 }
123 128 }
124 129 $('#fgsdmVehic').html(options);
  130 + initXl();
125 131 }
126   -
127   - $.get('/basic/lineCode2Name',function(result){
  132 +
  133 + /* $.get('/basic/lineCode2Name',function(result){
128 134 var data=[];
129 135  
130 136 for(var code in result){
... ... @@ -132,9 +138,33 @@
132 138 }
133 139 initPinYinSelect2('#line',data,'');
134 140  
135   - })
  141 + }) */
  142 +
  143 + $("#fgsdmVehic").on("change",initXl);
  144 + function initXl(){
  145 + var data=[];
  146 + if(fage){
  147 + $("#line").select2("destroy").html('');
  148 + }
  149 + var fgs=$('#fgsdmVehic').val();
  150 + var gs=$('#gsdmVehic').val();
  151 + for(var i=0;i<xlList.length;i++){
  152 + if(gs!=""){
  153 + if(fgs!=""){
  154 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  155 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  156 + }
  157 + }else{
  158 + if(xlList[i]["gsbm"]==gs){
  159 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  160 + }
  161 + }
  162 + }
  163 + }
  164 + initPinYinSelect2('#line',data,'');
  165 + fage=true;
  166 + }
136 167  
137   -
138 168 var line ;
139 169 var date ;
140 170 var gsdmVehic ;
... ... @@ -142,9 +172,9 @@
142 172 $("#query").on("click",function(){
143 173 line = $("#line").val();
144 174 date = $("#date").val();
145   - gsdmVehic = $("#gsdmVehic").val();
146   - fgsdmVehic = $("#fgsdmVehic").val();
147   - $post('/mcy_forms/vehicleloading',{line:line,data:date, gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic},function(result){
  175 +// gsdmVehic = $("#gsdmVehic").val();
  176 +// fgsdmVehic = $("#fgsdmVehic").val();
  177 + $get('/mcy_forms/vehicleloading',{line:line,data:date},function(result){
148 178 // 把数据填充到模版中
149 179 var tbodyHtml = template('vehicleloading',{list:result});
150 180 // 把渲染好的模版html文本追加到表格中
... ... @@ -157,7 +187,7 @@
157 187 date = $("#date").val();
158 188 gsdmVehic = $("#gsdmVehic").val();
159 189 fgsdmVehic = $("#fgsdmVehic").val();
160   - $post('/mcy_export/vehicleloadingExport',{line:line,data:date,gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic,type:'export'},function(result){
  190 + $get('/mcy_export/vehicleloadingExport',{line:line,data:date,gsdmVehic: gsdmVehic,fgsdmVehic:fgsdmVehic,type:'export'},function(result){
161 191 window.open("/downloadFile/download?fileName=车辆加注"+moment(date).format("YYYYMMDD"));
162 192 });
163 193 });
... ... @@ -173,9 +203,9 @@
173 203 <td>{{obj.clzbh}}</td>
174 204 <td>{{obj.jzl}}</td>
175 205 <td>{{obj.hyl}}</td>
176   - <td> </td>
  206 + <td>{{obj.ls}}</td>
177 207 <td>{{obj.jhlc}}</td>
178   - <td> </td>
  208 + <td>{{obj.unyyyl}}</td>
179 209 <td>{{obj.jhbc}}</td>
180 210 <td>{{obj.sjbc}}</td>
181 211 </tr>
... ...
src/main/resources/static/pages/oil/list_ph.html
  View file @d712400
... ... @@ -199,7 +199,7 @@
199 199 {{obj.rq}}
200 200 </td>
201 201 <td>
202   - {{obj.gsname}}
  202 + {{obj.fgsname}}
203 203 </td>
204 204 <td>
205 205 {{obj.xlname}}
... ...
src/main/resources/static/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css
  View file @d712400
1   -/* perfect-scrollbar v0.6.16 */
2   -.ps-container {
3   - -ms-touch-action: auto;
4   - touch-action: auto;
5   - overflow: hidden !important;
6   - -ms-overflow-style: none; }
7   - @supports (-ms-overflow-style: none) {
8   - .ps-container {
9   - overflow: auto !important; } }
10   - @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
11   - .ps-container {
12   - overflow: auto !important; } }
13   - .ps-container.ps-active-x > .ps-scrollbar-x-rail,
14   - .ps-container.ps-active-y > .ps-scrollbar-y-rail {
15   - display: block;
16   - background-color: transparent; }
17   - .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
18   - background-color: #eee;
19   - opacity: 0.9; }
20   - .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
21   - background-color: #999;
22   - height: 11px; }
23   - .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
24   - background-color: #eee;
25   - opacity: 0.9; }
26   - .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
27   - background-color: #999;
28   - width: 11px; }
29   - .ps-container > .ps-scrollbar-x-rail {
30   - display: none;
31   - position: absolute;
32   - /* please don't change 'position' */
33   - opacity: 0;
34   - -webkit-transition: background-color .2s linear, opacity .2s linear;
35   - -o-transition: background-color .2s linear, opacity .2s linear;
36   - -moz-transition: background-color .2s linear, opacity .2s linear;
37   - transition: background-color .2s linear, opacity .2s linear;
38   - bottom: 0px;
39   - /* there must be 'bottom' for ps-scrollbar-x-rail */
40   - height: 15px; }
41   - .ps-container > .ps-scrollbar-x-rail > .ps-scrollbar-x {
42   - position: absolute;
43   - /* please don't change 'position' */
44   - background-color: #aaa;
45   - -webkit-border-radius: 6px;
46   - -moz-border-radius: 6px;
47   - border-radius: 6px;
48   - -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
49   - transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
50   - -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
51   - -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
52   - transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
53   - transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
54   - bottom: 2px;
55   - /* there must be 'bottom' for ps-scrollbar-x */
56   - height: 6px; }
57   - .ps-container > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x, .ps-container > .ps-scrollbar-x-rail:active > .ps-scrollbar-x {
58   - height: 11px; }
59   - .ps-container > .ps-scrollbar-y-rail {
60   - display: none;
61   - position: absolute;
62   - /* please don't change 'position' */
63   - opacity: 0;
64   - -webkit-transition: background-color .2s linear, opacity .2s linear;
65   - -o-transition: background-color .2s linear, opacity .2s linear;
66   - -moz-transition: background-color .2s linear, opacity .2s linear;
67   - transition: background-color .2s linear, opacity .2s linear;
68   - right: 0;
69   - /* there must be 'right' for ps-scrollbar-y-rail */
70   - width: 15px; }
71   - .ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y {
72   - position: absolute;
73   - /* please don't change 'position' */
74   - background-color: #aaa;
75   - -webkit-border-radius: 6px;
76   - -moz-border-radius: 6px;
77   - border-radius: 6px;
78   - -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
79   - transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
80   - -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
81   - -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
82   - transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
83   - transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
84   - right: 2px;
85   - /* there must be 'right' for ps-scrollbar-y */
86   - width: 6px; }
87   - .ps-container > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y, .ps-container > .ps-scrollbar-y-rail:active > .ps-scrollbar-y {
88   - width: 11px; }
89   - .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
90   - background-color: #eee;
91   - opacity: 0.9; }
92   - .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
93   - background-color: #999;
94   - height: 11px; }
95   - .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
96   - background-color: #eee;
97   - opacity: 0.9; }
98   - .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
99   - background-color: #999;
100   - width: 11px; }
101   - .ps-container:hover > .ps-scrollbar-x-rail,
102   - .ps-container:hover > .ps-scrollbar-y-rail {
103   - opacity: 0.6; }
104   - .ps-container:hover > .ps-scrollbar-x-rail:hover {
105   - background-color: #eee;
106   - opacity: 0.9; }
107   - .ps-container:hover > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x {
108   - background-color: #999; }
109   - .ps-container:hover > .ps-scrollbar-y-rail:hover {
110   - background-color: #eee;
111   - opacity: 0.9; }
112   - .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y {
113   - background-color: #999; }
  1 +/* perfect-scrollbar v0.6.16 */
  2 +.ps-container {
  3 + -ms-touch-action: auto;
  4 + touch-action: auto;
  5 + overflow: hidden !important;
  6 + -ms-overflow-style: none; }
  7 + @supports (-ms-overflow-style: none) {
  8 + .ps-container {
  9 + overflow: auto !important; } }
  10 + @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
  11 + .ps-container {
  12 + overflow: auto !important; } }
  13 + .ps-container.ps-active-x > .ps-scrollbar-x-rail,
  14 + .ps-container.ps-active-y > .ps-scrollbar-y-rail {
  15 + display: block;
  16 + background-color: transparent; }
  17 + .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
  18 + background-color: #eee;
  19 + opacity: 0.9; }
  20 + .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
  21 + background-color: #999;
  22 + height: 11px; }
  23 + .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
  24 + background-color: #eee;
  25 + opacity: 0.9; }
  26 + .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
  27 + background-color: #999;
  28 + width: 11px; }
  29 + .ps-container > .ps-scrollbar-x-rail {
  30 + display: none;
  31 + position: absolute;
  32 + /* please don't change 'position' */
  33 + opacity: 0;
  34 + -webkit-transition: background-color .2s linear, opacity .2s linear;
  35 + -o-transition: background-color .2s linear, opacity .2s linear;
  36 + -moz-transition: background-color .2s linear, opacity .2s linear;
  37 + transition: background-color .2s linear, opacity .2s linear;
  38 + bottom: 0px;
  39 + /* there must be 'bottom' for ps-scrollbar-x-rail */
  40 + height: 15px; }
  41 + .ps-container > .ps-scrollbar-x-rail > .ps-scrollbar-x {
  42 + position: absolute;
  43 + /* please don't change 'position' */
  44 + background-color: #aaa;
  45 + -webkit-border-radius: 6px;
  46 + -moz-border-radius: 6px;
  47 + border-radius: 6px;
  48 + -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
  49 + transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
  50 + -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
  51 + -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
  52 + transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
  53 + transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
  54 + bottom: 2px;
  55 + /* there must be 'bottom' for ps-scrollbar-x */
  56 + height: 6px; }
  57 + .ps-container > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x, .ps-container > .ps-scrollbar-x-rail:active > .ps-scrollbar-x {
  58 + height: 11px; }
  59 + .ps-container > .ps-scrollbar-y-rail {
  60 + display: none;
  61 + position: absolute;
  62 + /* please don't change 'position' */
  63 + opacity: 0;
  64 + -webkit-transition: background-color .2s linear, opacity .2s linear;
  65 + -o-transition: background-color .2s linear, opacity .2s linear;
  66 + -moz-transition: background-color .2s linear, opacity .2s linear;
  67 + transition: background-color .2s linear, opacity .2s linear;
  68 + right: 0;
  69 + /* there must be 'right' for ps-scrollbar-y-rail */
  70 + width: 15px; }
  71 + .ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y {
  72 + position: absolute;
  73 + /* please don't change 'position' */
  74 + background-color: #aaa;
  75 + -webkit-border-radius: 6px;
  76 + -moz-border-radius: 6px;
  77 + border-radius: 6px;
  78 + -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
  79 + transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
  80 + -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
  81 + -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
  82 + transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
  83 + transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
  84 + right: 2px;
  85 + /* there must be 'right' for ps-scrollbar-y */
  86 + width: 6px; }
  87 + .ps-container > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y, .ps-container > .ps-scrollbar-y-rail:active > .ps-scrollbar-y {
  88 + width: 11px; }
  89 + .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
  90 + background-color: #eee;
  91 + opacity: 0.9; }
  92 + .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
  93 + background-color: #999;
  94 + height: 11px; }
  95 + .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
  96 + background-color: #eee;
  97 + opacity: 0.9; }
  98 + .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
  99 + background-color: #999;
  100 + width: 11px; }
  101 + .ps-container:hover > .ps-scrollbar-x-rail,
  102 + .ps-container:hover > .ps-scrollbar-y-rail {
  103 + opacity: 0.6; }
  104 + .ps-container:hover > .ps-scrollbar-x-rail:hover {
  105 + background-color: #eee;
  106 + opacity: 0.9; }
  107 + .ps-container:hover > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x {
  108 + background-color: #999; }
  109 + .ps-container:hover > .ps-scrollbar-y-rail:hover {
  110 + background-color: #eee;
  111 + opacity: 0.9; }
  112 + .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y {
  113 + background-color: #999; }
... ...