潘钊 / bsth_control · Commits

Commit 2b57e3b1aaab9e5cd0b55a5c5e18c3a5c49c9eda

Authored by yiming
2 parents 12f37ce6 dfab6eb4
build: skipped

Merge remote-tracking branch 'origin/minhang_2024_04' into minhang_2024_04

Inline Side-by-side
Showing 14 changed files with 2541 additions and 2044 deletions

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

To preserve performance only 14 of 216 files are displayed.

src/main/java/com/bsth/common/SystemParamKeys.java 0 → 100644
  View file @2b57e3b
  1 +package com.bsth.common;
  2 +
  3 +/**
  4 + * @author Hill
  5 + */
  6 +public class SystemParamKeys {
  7 +
  8 + public static final String SPECIAL_ROLES = "special.roles";
  9 +}
src/main/java/com/bsth/controller/oil/CwjyController.java
  View file @2b57e3b
1 -package com.bsth.controller.oil;  
2 -  
3 -  
4 -import java.util.Date;  
5 -import java.util.HashMap;  
6 -import java.util.List;  
7 -import java.util.Map;  
8 -  
9 -import org.springframework.beans.factory.annotation.Autowired;  
10 -import org.springframework.web.bind.annotation.RequestMapping;  
11 -import org.springframework.web.bind.annotation.RequestMethod;  
12 -import org.springframework.web.bind.annotation.RequestParam;  
13 -import org.springframework.web.bind.annotation.RestController;  
14 -  
15 -import com.bsth.common.ResponseCode;  
16 -import com.bsth.controller.BaseController;  
17 -import com.bsth.data.BasicData;  
18 -import com.bsth.entity.Line;  
19 -import com.bsth.entity.oil.Cwjy;  
20 -import com.bsth.entity.oil.Ylxxb;  
21 -import com.bsth.entity.sys.SysUser;  
22 -import com.bsth.security.util.SecurityUtils;  
23 -import com.bsth.service.oil.CwjyService;  
24 -import com.bsth.util.PageObject;  
25 -  
26 -@RestController  
27 -@RequestMapping("cwjy")  
28 -public class CwjyController extends BaseController<Cwjy, Integer>{  
29 - @Autowired  
30 - private CwjyService service;  
31 - @RequestMapping(method = RequestMethod.POST)  
32 - public Map<String, Object> save(Cwjy t){  
33 - SysUser sysUser = SecurityUtils.getCurrentUser();  
34 - t.setCreateDate(new Date());  
35 - t.setXgr(sysUser.getUserName());  
36 - t.setNbbm(t.getNbbm().trim().toUpperCase());  
37 - Line line=BasicData.nbbm2LineMap.get(t.getNbbm());  
38 - t.setLine(line == null?"" : line.getLineCode());  
39 - Map<String, Object> map = new HashMap<>();  
40 - try {  
41 - map=service.save(t);  
42 - }catch (Exception e) {  
43 - // TODO: handle exception  
44 - if(e.getMessage().indexOf("PK_CWJYUK")>0){  
45 - map.put("fage", "存在相同数据,数据已经过滤");  
46 - }  
47 - }  
48 - return map;  
49 - }  
50 -  
51 - @RequestMapping(value = "/checkNbbm",method = RequestMethod.GET)  
52 - public int checkNbbm(Cwjy t){  
53 - return service.checkNbbm(t);  
54 - }  
55 -  
56 - @RequestMapping(value = "/queryList",method = RequestMethod.GET)  
57 - public List<Ylxxb> queryList(@RequestParam Map<String, Object> map){  
58 - List<Ylxxb> pagequery=null;  
59 - map.put("curPage", map.get("page").toString());  
60 - map.put("pageData","10");  
61 - pagequery=service.Pagequery(map);  
62 - return pagequery;  
63 - }  
64 -  
65 - @RequestMapping(value="/bynbbm",method = RequestMethod.GET)  
66 - public Ylxxb bynbbm(@RequestParam Map<String, Object> map){  
67 -  
68 - return service.bynbbm(map);  
69 - }  
70 -  
71 - /**  
72 - *  
73 - * @Title: save  
74 - * @Description: TODO(持久化对象)  
75 - * @param @param t  
76 - * @param @return 设定文件  
77 - * @return Map<String,Object> {status: 1（成功），-1（失败）}  
78 - * @throws  
79 - */  
80 - @RequestMapping(value="/savejzl",method = RequestMethod.POST)  
81 - public Map<String, Object> savejzl(@RequestParam Map<String, Object> map){  
82 - Map<String, Object> maps=new HashMap<>();  
83 - try {  
84 - maps = service.savejzl(map);  
85 - } catch (Exception e) {  
86 - // TODO Auto-generated catch block  
87 - e.printStackTrace();  
88 - }  
89 - return maps;  
90 - }  
91 -  
92 -} 1 +package com.bsth.controller.oil;
  2 +
  3 +
  4 +import java.io.File;
  5 +import java.util.Date;
  6 +import java.util.HashMap;
  7 +import java.util.List;
  8 +import java.util.Map;
  9 +
  10 +import org.springframework.beans.factory.annotation.Autowired;
  11 +import org.springframework.web.bind.annotation.RequestMapping;
  12 +import org.springframework.web.bind.annotation.RequestMethod;
  13 +import org.springframework.web.bind.annotation.RequestParam;
  14 +import org.springframework.web.bind.annotation.RestController;
  15 +import org.springframework.web.multipart.MultipartFile;
  16 +
  17 +import com.bsth.common.ResponseCode;
  18 +import com.bsth.controller.BaseController;
  19 +import com.bsth.data.BasicData;
  20 +import com.bsth.entity.Line;
  21 +import com.bsth.entity.oil.Cwjy;
  22 +import com.bsth.entity.oil.Ylxxb;
  23 +import com.bsth.entity.sys.SysUser;
  24 +import com.bsth.security.util.SecurityUtils;
  25 +import com.bsth.service.oil.CwjyService;
  26 +import com.bsth.util.PageObject;
  27 +import com.google.common.io.Files;
  28 +
  29 +@RestController
  30 +@RequestMapping("cwjy")
  31 +public class CwjyController extends BaseController<Cwjy, Integer>{
  32 + @Autowired
  33 + private CwjyService service;
  34 + @RequestMapping(method = RequestMethod.POST)
  35 + public Map<String, Object> save(Cwjy t){
  36 + SysUser sysUser = SecurityUtils.getCurrentUser();
  37 + t.setCreateDate(new Date());
  38 + t.setXgr(sysUser.getUserName());
  39 + t.setNbbm(t.getNbbm().trim().toUpperCase());
  40 + Line line=BasicData.nbbm2LineMap.get(t.getNbbm());
  41 + t.setLine(line == null?"" : line.getLineCode());
  42 + Map<String, Object> map = new HashMap<>();
  43 + try {
  44 + map=service.save(t);
  45 + }catch (Exception e) {
  46 + // TODO: handle exception
  47 + if(e.getMessage().indexOf("PK_CWJYUK")>0){
  48 + map.put("fage", "存在相同数据,数据已经过滤");
  49 + }
  50 + }
  51 + return map;
  52 + }
  53 +
  54 + @RequestMapping(value = "/checkNbbm",method = RequestMethod.GET)
  55 + public int checkNbbm(Cwjy t){
  56 + return service.checkNbbm(t);
  57 + }
  58 +
  59 + @RequestMapping(value = "/queryList",method = RequestMethod.GET)
  60 + public List<Ylxxb> queryList(@RequestParam Map<String, Object> map){
  61 + List<Ylxxb> pagequery=null;
  62 + map.put("curPage", map.get("page").toString());
  63 + map.put("pageData","10");
  64 + pagequery=service.Pagequery(map);
  65 + return pagequery;
  66 + }
  67 +
  68 + @RequestMapping(value = "/cwjyList",method = RequestMethod.GET)
  69 + public List<Ylxxb> cwjyList(@RequestParam Map<String, Object> map){
  70 + List<Ylxxb> cwjyList=service.cwjyList(map);
  71 + return cwjyList;
  72 + }
  73 +
  74 + @RequestMapping(value="/bynbbm",method = RequestMethod.GET)
  75 + public Ylxxb bynbbm(@RequestParam Map<String, Object> map){
  76 +
  77 + return service.bynbbm(map);
  78 + }
  79 +
  80 + /**
  81 + *
  82 + * @Title: save
  83 + * @Description: TODO(持久化对象)
  84 + * @param @param t
  85 + * @param @return 设定文件
  86 + * @return Map<String,Object> {status: 1（成功），-1（失败）}
  87 + * @throws
  88 + */
  89 + @RequestMapping(value="/savejzl",method = RequestMethod.POST)
  90 + public Map<String, Object> savejzl(@RequestParam Map<String, Object> map){
  91 + Map<String, Object> maps=new HashMap<>();
  92 + try {
  93 + maps = service.savejzl(map);
  94 + } catch (Exception e) {
  95 + // TODO Auto-generated catch block
  96 + e.printStackTrace();
  97 + }
  98 + return maps;
  99 + }
  100 +
  101 + /*
  102 + * 场外加油导入
  103 + */
  104 + @RequestMapping(value = "/uploadFile",method = RequestMethod.POST)
  105 + public String uploadFile(MultipartFile file, String gsbm_, String gsName,
  106 + String fgsbm_, String fgsName) throws Exception{
  107 + Map<String, Object> map = new HashMap<String, Object>();
  108 + File newFile = new File(
  109 + getDataImportClasspath() + File.separator +
  110 + file.getOriginalFilename());
  111 + Files.write(file.getBytes(), newFile);
  112 + String result = service.importExcel(newFile, gsbm_, gsName);
  113 + return "{\"result\":" + "\""+result+"\"}";
  114 + }
  115 +
  116 + public String getDataImportClasspath(){
  117 + return this.getClass().getResource("/").getPath() + "/static/pages/oil";
  118 + }
  119 +
  120 +}
src/main/java/com/bsth/controller/oil/DlbController.java
  View file @2b57e3b
1 -package com.bsth.controller.oil;  
2 -  
3 -import java.text.SimpleDateFormat;  
4 -import java.util.ArrayList;  
5 -import java.util.Date;  
6 -import java.util.HashMap;  
7 -import java.util.Iterator;  
8 -import java.util.List;  
9 -import java.util.Map;  
10 -  
11 -import org.springframework.beans.factory.annotation.Autowired;  
12 -import org.springframework.data.domain.Page;  
13 -import org.springframework.data.domain.PageRequest;  
14 -import org.springframework.data.domain.Sort;  
15 -import org.springframework.data.domain.Sort.Direction;  
16 -import org.springframework.web.bind.annotation.RequestMapping;  
17 -import org.springframework.web.bind.annotation.RequestMethod;  
18 -import org.springframework.web.bind.annotation.RequestParam;  
19 -import org.springframework.web.bind.annotation.RestController;  
20 -import com.bsth.controller.BaseController;  
21 -import com.bsth.entity.oil.Dlb;  
22 -import com.bsth.entity.oil.Ylb;  
23 -import com.bsth.service.oil.DlbService;  
24 -import com.bsth.util.Arith;  
25 -import com.bsth.util.ReportUtils;  
26 -import com.google.common.base.Splitter;  
27 -  
28 -@RestController  
29 -@RequestMapping("dlb")  
30 -public class DlbController extends BaseController<Dlb, Integer>{  
31 - @Autowired  
32 - DlbService service;  
33 - /**  
34 - *  
35 - * @Title: list  
36 - * @Description: TODO(多条件分页查询)  
37 - * @param @param map 查询条件  
38 - * @param @param page 页码  
39 - * @param @param size 每页显示数量  
40 - * @throws  
41 - */  
42 - @RequestMapping(method = RequestMethod.GET)  
43 - public Page<Dlb> list(@RequestParam Map<String, Object> map,  
44 - @RequestParam(defaultValue = "0") int page,  
45 - @RequestParam(defaultValue = "10") int size,  
46 - @RequestParam(defaultValue = "id") String order,  
47 - @RequestParam(defaultValue = "DESC") String direction){  
48 -  
49 - Direction d;  
50 -// map.put("xlbm_like", map.get("xlbm_like").toString().trim());  
51 -// try {  
52 - String rq=map.get("rq").toString();  
53 - if(!(rq=="")){  
54 -//  
55 -// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");  
56 -// Calendar calendar = new GregorianCalendar();  
57 -// calendar.setTime(sdf.parse(rq));  
58 -// calendar.add(calendar.DATE,1);  
59 -// Date date=calendar.getTime();  
60 - map.put("rq_eq", rq);  
61 -// map.put("rq_lt", sdf.format(date));  
62 -// System.out.println(rq);  
63 -// System.out.println(sdf.format(date));  
64 - }  
65 -// } catch (ParseException e) {  
66 -// // TODO Auto-generated catch block  
67 -// e.printStackTrace();  
68 -// }  
69 - if(null != direction && direction.equals("ASC"))  
70 - d = Direction.ASC;  
71 - else  
72 - d = Direction.DESC;  
73 -  
74 - // 允许多个字段排序，order可以写单个字段，也可以写多个字段  
75 - // 多个字段格式：{col1},{col2},{col3},....,{coln}  
76 - // 每个字段的排序方向都是一致，这个以后再看要不要改  
77 - List<String> list = Splitter.on(",").trimResults().splitToList(order);  
78 - return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));  
79 - }  
80 - @RequestMapping(value = "/dlbList",method = RequestMethod.GET)  
81 - public List<Dlb> dlbList(@RequestParam Map<String, Object> map){  
82 - List<Dlb> list=service.listDlb(map);  
83 - return list;  
84 - }  
85 -  
86 -  
87 -  
88 - @RequestMapping(value = "/obtain",method = RequestMethod.GET)  
89 - public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{  
90 - Map<String, Object> list=new HashMap<String, Object>();  
91 - try {  
92 - list = service.obtain(map);  
93 - } catch (Exception e) {  
94 - // TODO Auto-generated catch block  
95 - throw e;  
96 - }  
97 - return list;  
98 - }  
99 -  
100 - /**  
101 - * 保存电量  
102 - * @param map  
103 - * @return  
104 - */  
105 - @RequestMapping(value = "/sort",method = RequestMethod.GET)  
106 - public Map<String, Object> sort(@RequestParam Map<String, Object> map){  
107 - Map<String, Object> list=service.sort(map);  
108 - return list;  
109 - }  
110 -  
111 - /**  
112 - * 核对电量（有加电没里程）  
113 - * @param map  
114 - * @return  
115 - */  
116 - @RequestMapping(value = "/checkDl",method = RequestMethod.GET)  
117 - public Map<String, Object> checkDl(@RequestParam Map<String, Object> map){  
118 - Map<String, Object> list=service.checkDl(map);  
119 - return list;  
120 - }  
121 -  
122 - @RequestMapping(value = "/sumYlb",method = RequestMethod.GET)  
123 - public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){  
124 - Map<String, Object> list=service.sumYlb(map);  
125 - return list;  
126 - }  
127 -  
128 - @RequestMapping(value = "/saveDlbList",method = RequestMethod.POST)  
129 - public Map<String, Object> saveDlbList(@RequestParam Map<String, Object> map){  
130 - Map<String, Object> list=new HashMap<String, Object>();  
131 - try {  
132 - list = service.saveDlbList(map);  
133 - } catch (Exception e) {  
134 - // TODO Auto-generated catch block  
135 - e.printStackTrace();  
136 - }  
137 - return list;  
138 - }  
139 -  
140 -  
141 - @RequestMapping(value = "/listExport",method = RequestMethod.POST)  
142 - public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){  
143 - SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),  
144 - sdfSimple = new SimpleDateFormat("yyyyMMdd");  
145 - List<Iterator<?>> listI = new ArrayList<Iterator<?>>();  
146 - ReportUtils ee = new ReportUtils();  
147 - List<Dlb> dlb= service.listDlb(map);  
148 -// (new CustomerSpecs<Ylb>(map)).iterator();  
149 - List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();  
150 - for (Dlb y : dlb) {  
151 - Map<String, Object> m = new HashMap<String, Object>();  
152 - m.put("rq", y.getRq());  
153 - m.put("gsname",y.getGsname() );  
154 - m.put("fgsname", y.getFgsname());  
155 - m.put("xlname", y.getXlname());  
156 - m.put("nbbm", y.getNbbm());  
157 - m.put("jsy", y.getJsy());  
158 - m.put("name", y.getName());  
159 - m.put("cdl", y.getCdl()<=0?"0":y.getCdl());  
160 - m.put("czcd", y.getCzcd()<=0?"0":y.getCzcd()+"%");  
161 - m.put("jzcd", y.getJzcd()<=0?"0":y.getJzcd()+"%");  
162 - m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());  
163 - m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());  
164 - m.put("hd", y.getHd()<=0?"0":y.getHd());  
165 - String shyy ="无";  
166 - if(y.getShyy()!=null){  
167 - shyy=y.getShyy();  
168 - if(shyy.equals("1")){shyy="票务用电";}  
169 - else if(shyy.equals("2")){shyy="保养用电";}  
170 - else if(shyy.equals("3")){shyy="报废车用电";}  
171 - else if(shyy.equals("4")){shyy="其它用电";}  
172 - else if(shyy.equals("5")){shyy="人保部";}  
173 - else if(shyy.equals("6")){shyy="车队";}  
174 - else if(shyy.equals("7")){shyy="车间(高保)";}  
175 - else if(shyy.equals("8")){shyy="车间(小修)";}  
176 - else{shyy ="无";}  
177 - }  
178 - m.put("ns", y.getNs()<=0?"0":y.getNs());  
179 - m.put("shyy", shyy);  
180 - m.put("sh", y.getSh()<=0?"0":y.getSh());  
181 - m.put("zlc", y.getZlc()<=0?"0":y.getZlc());  
182 - m.put("rdlx", "");  
183 - m.put("bglyh", y.getBglyh());  
184 - m.put("zdh", Arith.add(y.getSh(), y.getHd()));  
185 - resList.add(m);  
186 - }  
187 - try {  
188 - map.put("sheetName", map.get("rq"));  
189 - listI.add(resList.iterator());  
190 - String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";  
191 - ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls",  
192 - path+"export/"+map.get("rq").toString()+ "进出场存电量.xls");  
193 - } catch (Exception e) {  
194 - e.printStackTrace();  
195 - }  
196 -  
197 - return resList;  
198 -  
199 - }  
200 -  
201 -  
202 - @RequestMapping(value = "/checkJsy",method = RequestMethod.GET)  
203 - public String checkJsy(@RequestParam Map<String, Object> map){  
204 - String list=service.checkJsy(map);  
205 - return list;  
206 - }  
207 -  
208 - @RequestMapping(value = "/deleteIds", method = RequestMethod.POST)  
209 - public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {  
210 - Map<String, Object> maps=new HashMap<String, Object>();  
211 - try {  
212 - maps= service.deleteIds(map);  
213 - } catch (Exception e) {  
214 - // TODO Auto-generated catch block  
215 - e.printStackTrace();  
216 - }  
217 - return maps;  
218 - }  
219 -  
220 - @RequestMapping(value = "/saveDlb",method = RequestMethod.POST)  
221 - public Map<String, Object> saveDlb(Dlb t){  
222 -// SysUser user = SecurityUtils.getCurrentUser();  
223 - t.setCreatetime(new Date());  
224 -// Ylb t=new Ylb();  
225 - return service.saveDlb(t);  
226 - }  
227 -  
228 - @RequestMapping(value = "/updateJsy",method = RequestMethod.GET)  
229 - public Map<String, Object> updateJsy(@RequestParam Map<String, Object> map){  
230 - return service.update(map);  
231 - }  
232 -} 1 +package com.bsth.controller.oil;
  2 +
  3 +import java.text.SimpleDateFormat;
  4 +import java.util.ArrayList;
  5 +import java.util.Date;
  6 +import java.util.HashMap;
  7 +import java.util.Iterator;
  8 +import java.util.List;
  9 +import java.util.Map;
  10 +
  11 +import org.springframework.beans.factory.annotation.Autowired;
  12 +import org.springframework.data.domain.Page;
  13 +import org.springframework.data.domain.PageRequest;
  14 +import org.springframework.data.domain.Sort;
  15 +import org.springframework.data.domain.Sort.Direction;
  16 +import org.springframework.web.bind.annotation.RequestMapping;
  17 +import org.springframework.web.bind.annotation.RequestMethod;
  18 +import org.springframework.web.bind.annotation.RequestParam;
  19 +import org.springframework.web.bind.annotation.RestController;
  20 +import com.bsth.controller.BaseController;
  21 +import com.bsth.entity.oil.Dlb;
  22 +import com.bsth.entity.oil.Ylb;
  23 +import com.bsth.service.oil.DlbService;
  24 +import com.bsth.util.Arith;
  25 +import com.bsth.util.ReportUtils;
  26 +import com.google.common.base.Splitter;
  27 +
  28 +@RestController
  29 +@RequestMapping("dlb")
  30 +public class DlbController extends BaseController<Dlb, Integer>{
  31 + @Autowired
  32 + DlbService service;
  33 + /**
  34 + *
  35 + * @Title: list
  36 + * @Description: TODO(多条件分页查询)
  37 + * @param @param map 查询条件
  38 + * @param @param page 页码
  39 + * @param @param size 每页显示数量
  40 + * @throws
  41 + */
  42 + @RequestMapping(method = RequestMethod.GET)
  43 + public Page<Dlb> list(@RequestParam Map<String, Object> map,
  44 + @RequestParam(defaultValue = "0") int page,
  45 + @RequestParam(defaultValue = "10") int size,
  46 + @RequestParam(defaultValue = "id") String order,
  47 + @RequestParam(defaultValue = "DESC") String direction){
  48 +
  49 + Direction d;
  50 +// map.put("xlbm_like", map.get("xlbm_like").toString().trim());
  51 +// try {
  52 + String rq=map.get("rq").toString();
  53 + if(!(rq=="")){
  54 +//
  55 +// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  56 +// Calendar calendar = new GregorianCalendar();
  57 +// calendar.setTime(sdf.parse(rq));
  58 +// calendar.add(calendar.DATE,1);
  59 +// Date date=calendar.getTime();
  60 + map.put("rq_eq", rq);
  61 +// map.put("rq_lt", sdf.format(date));
  62 +// System.out.println(rq);
  63 +// System.out.println(sdf.format(date));
  64 + }
  65 +// } catch (ParseException e) {
  66 +// // TODO Auto-generated catch block
  67 +// e.printStackTrace();
  68 +// }
  69 + if(null != direction && direction.equals("ASC"))
  70 + d = Direction.ASC;
  71 + else
  72 + d = Direction.DESC;
  73 +
  74 + // 允许多个字段排序，order可以写单个字段，也可以写多个字段
  75 + // 多个字段格式：{col1},{col2},{col3},....,{coln}
  76 + // 每个字段的排序方向都是一致，这个以后再看要不要改
  77 + List<String> list = Splitter.on(",").trimResults().splitToList(order);
  78 + return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
  79 + }
  80 + @RequestMapping(value = "/dlbList",method = RequestMethod.GET)
  81 + public List<Dlb> dlbList(@RequestParam Map<String, Object> map){
  82 + List<Dlb> list=service.listDlb(map);
  83 + return list;
  84 + }
  85 +
  86 +
  87 +
  88 + @RequestMapping(value = "/obtain",method = RequestMethod.GET)
  89 + public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{
  90 + Map<String, Object> list=new HashMap<String, Object>();
  91 + try {
  92 + list = service.obtain(map);
  93 + } catch (Exception e) {
  94 + // TODO Auto-generated catch block
  95 + throw e;
  96 + }
  97 + return list;
  98 + }
  99 +
  100 + /**
  101 + * 保存电量
  102 + * @param map
  103 + * @return
  104 + */
  105 + @RequestMapping(value = "/sort",method = RequestMethod.GET)
  106 + public Map<String, Object> sort(@RequestParam Map<String, Object> map){
  107 + Map<String, Object> list=service.sort(map);
  108 + return list;
  109 + }
  110 +
  111 + /**
  112 + * 核对电量（有加电没里程）
  113 + * @param map
  114 + * @return
  115 + */
  116 + @RequestMapping(value = "/checkDl",method = RequestMethod.GET)
  117 + public Map<String, Object> checkDl(@RequestParam Map<String, Object> map){
  118 + Map<String, Object> list=service.checkDl(map);
  119 + return list;
  120 + }
  121 +
  122 + @RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
  123 + public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
  124 + Map<String, Object> list=service.sumYlb(map);
  125 + return list;
  126 + }
  127 +
  128 + @RequestMapping(value = "/saveDlbList",method = RequestMethod.POST)
  129 + public Map<String, Object> saveDlbList(@RequestParam Map<String, Object> map){
  130 + Map<String, Object> list=new HashMap<String, Object>();
  131 + try {
  132 + list = service.saveDlbList(map);
  133 + } catch (Exception e) {
  134 + // TODO Auto-generated catch block
  135 + e.printStackTrace();
  136 + }
  137 + return list;
  138 + }
  139 +
  140 +
  141 + @RequestMapping(value = "/listExport",method = RequestMethod.POST)
  142 + public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
  143 + SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
  144 + sdfSimple = new SimpleDateFormat("yyyyMMdd");
  145 + List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
  146 + ReportUtils ee = new ReportUtils();
  147 + List<Dlb> dlb= service.listDlb(map);
  148 +// (new CustomerSpecs<Ylb>(map)).iterator();
  149 + List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
  150 + for (Dlb y : dlb) {
  151 + Map<String, Object> m = new HashMap<String, Object>();
  152 + m.put("rq", y.getRq());
  153 + m.put("gsname",y.getGsname() );
  154 + m.put("fgsname", y.getFgsname());
  155 + if(y.getLinename()==null){
  156 + m.put("xlname", y.getXlname()==null?"":y.getXlname());
  157 + }else{
  158 + m.put("xlname", y.getLinename());
  159 + }
  160 + m.put("nbbm", y.getNbbm());
  161 + m.put("jsy", y.getJsy());
  162 + m.put("name", y.getName());
  163 + m.put("cdl", y.getCdl()<=0?"0":y.getCdl());
  164 + m.put("czcd", y.getCzcd()<=0?"0":y.getCzcd()+"%");
  165 + m.put("jzcd", y.getJzcd()<=0?"0":y.getJzcd()+"%");
  166 + m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
  167 + m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
  168 + m.put("hd", y.getHd()<=0?"0":y.getHd());
  169 + String shyy ="无";
  170 + if(y.getShyy()!=null){
  171 + shyy=y.getShyy();
  172 + if(shyy.equals("1")){shyy="票务用电";}
  173 + else if(shyy.equals("2")){shyy="保养用电";}
  174 + else if(shyy.equals("3")){shyy="报废车用电";}
  175 + else if(shyy.equals("4")){shyy="其它用电";}
  176 + else if(shyy.equals("5")){shyy="人保部";}
  177 + else if(shyy.equals("6")){shyy="车队";}
  178 + else if(shyy.equals("7")){shyy="车间(高保)";}
  179 + else if(shyy.equals("8")){shyy="车间(小修)";}
  180 + else{shyy ="无";}
  181 + }
  182 + m.put("ns", y.getNs()<=0?"0":y.getNs());
  183 + m.put("shyy", shyy);
  184 + m.put("sh", y.getSh()<=0?"0":y.getSh());
  185 + m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
  186 + m.put("rdlx", "");
  187 + m.put("bglyh", y.getBglyh());
  188 + m.put("zdh", Arith.add(y.getSh(), y.getHd()));
  189 + resList.add(m);
  190 + }
  191 + try {
  192 + map.put("sheetName", map.get("rq"));
  193 + listI.add(resList.iterator());
  194 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  195 + ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls",
  196 + path+"export/"+map.get("rq").toString()+ "进出场存电量.xls");
  197 + } catch (Exception e) {
  198 + e.printStackTrace();
  199 + }
  200 +
  201 + return resList;
  202 +
  203 + }
  204 +
  205 +
  206 + @RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
  207 + public String checkJsy(@RequestParam Map<String, Object> map){
  208 + String list=service.checkJsy(map);
  209 + return list;
  210 + }
  211 +
  212 + @RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
  213 + public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
  214 + Map<String, Object> maps=new HashMap<String, Object>();
  215 + try {
  216 + maps= service.deleteIds(map);
  217 + } catch (Exception e) {
  218 + // TODO Auto-generated catch block
  219 + e.printStackTrace();
  220 + }
  221 + return maps;
  222 + }
  223 +
  224 + @RequestMapping(value = "/saveDlb",method = RequestMethod.POST)
  225 + public Map<String, Object> saveDlb(Dlb t){
  226 +// SysUser user = SecurityUtils.getCurrentUser();
  227 + t.setCreatetime(new Date());
  228 +// Ylb t=new Ylb();
  229 + return service.saveDlb(t);
  230 + }
  231 +
  232 + @RequestMapping(value = "/updateJsy",method = RequestMethod.GET)
  233 + public Map<String, Object> updateJsy(@RequestParam Map<String, Object> map){
  234 + return service.update(map);
  235 + }
  236 +}
src/main/java/com/bsth/controller/oil/JqlController.java 0 → 100644
  View file @2b57e3b
  1 +package com.bsth.controller.oil;
  2 +
  3 +import java.io.File;
  4 +import java.util.HashMap;
  5 +import java.util.Map;
  6 +
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.web.bind.annotation.RequestMapping;
  9 +import org.springframework.web.bind.annotation.RequestMethod;
  10 +import org.springframework.web.bind.annotation.RequestParam;
  11 +import org.springframework.web.bind.annotation.RestController;
  12 +import org.springframework.web.multipart.MultipartFile;
  13 +
  14 +import com.bsth.controller.BaseController;
  15 +import com.bsth.entity.oil.Jql;
  16 +import com.bsth.service.oil.JqlService;
  17 +import com.google.common.io.Files;
  18 +
  19 +@RestController
  20 +@RequestMapping("jql")
  21 +public class JqlController extends BaseController<Jql, Integer> {
  22 +
  23 + @Autowired
  24 + JqlService jqlService;
  25 +
  26 + public String getDataImportClasspath(){
  27 + return this.getClass().getResource("/").getPath() + "/static/pages/hydrogen/jql";
  28 + }
  29 +
  30 + @RequestMapping(value = "/uploadFile",method = RequestMethod.POST)
  31 + public String uploadFile(MultipartFile file, String gsbm_, String gsName,
  32 + String fgsbm_, String fgsName) throws Exception{
  33 + Map<String, Object> map = new HashMap<String, Object>();
  34 + File newFile = new File(
  35 + getDataImportClasspath() + File.separator +
  36 + file.getOriginalFilename());
  37 + Files.write(file.getBytes(), newFile);
  38 + String result = jqlService.importExcel(newFile, gsbm_, gsName, fgsbm_, fgsName);
  39 + return "{\"result\":" + "\""+result+"\"}";
  40 + }
  41 +
  42 + @RequestMapping(value = "/query",method = RequestMethod.GET)
  43 + public Map<String, Object> query(@RequestParam Map<String, Object> map) throws Exception{
  44 + return jqlService.query(map);
  45 + }
  46 +
  47 +}
src/main/java/com/bsth/controller/oil/QlbController.java 0 → 100644
  View file @2b57e3b
  1 +package com.bsth.controller.oil;
  2 +
  3 +import java.text.SimpleDateFormat;
  4 +import java.util.ArrayList;
  5 +import java.util.Date;
  6 +import java.util.HashMap;
  7 +import java.util.Iterator;
  8 +import java.util.List;
  9 +import java.util.Map;
  10 +
  11 +import org.springframework.beans.factory.annotation.Autowired;
  12 +import org.springframework.data.domain.Page;
  13 +import org.springframework.data.domain.PageRequest;
  14 +import org.springframework.data.domain.Sort;
  15 +import org.springframework.data.domain.Sort.Direction;
  16 +import org.springframework.web.bind.annotation.RequestMapping;
  17 +import org.springframework.web.bind.annotation.RequestMethod;
  18 +import org.springframework.web.bind.annotation.RequestParam;
  19 +import org.springframework.web.bind.annotation.RestController;
  20 +import com.bsth.controller.BaseController;
  21 +import com.bsth.entity.oil.Qlb;
  22 +import com.bsth.service.oil.QlbService;
  23 +import com.bsth.util.Arith;
  24 +import com.bsth.util.ReportUtils;
  25 +import com.google.common.base.Splitter;
  26 +
  27 +@RestController
  28 +@RequestMapping("qlb")
  29 +public class QlbController extends BaseController<Qlb, Integer>{
  30 + @Autowired
  31 + QlbService service;
  32 + /**
  33 + *
  34 + * @Title: list
  35 + * @Description: TODO(多条件分页查询)
  36 + * @param @param map 查询条件
  37 + * @param @param page 页码
  38 + * @param @param size 每页显示数量
  39 + * @throws
  40 + */
  41 + @RequestMapping(method = RequestMethod.GET)
  42 + public Page<Qlb> list(@RequestParam Map<String, Object> map,
  43 + @RequestParam(defaultValue = "0") int page,
  44 + @RequestParam(defaultValue = "10") int size,
  45 + @RequestParam(defaultValue = "id") String order,
  46 + @RequestParam(defaultValue = "DESC") String direction){
  47 +
  48 + Direction d;
  49 +// map.put("xlbm_like", map.get("xlbm_like").toString().trim());
  50 +// try {
  51 + String rq=map.get("rq").toString();
  52 + if(!(rq=="")){
  53 +//
  54 +// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  55 +// Calendar calendar = new GregorianCalendar();
  56 +// calendar.setTime(sdf.parse(rq));
  57 +// calendar.add(calendar.DATE,1);
  58 +// Date date=calendar.getTime();
  59 + map.put("rq_eq", rq);
  60 +// map.put("rq_lt", sdf.format(date));
  61 +// System.out.println(rq);
  62 +// System.out.println(sdf.format(date));
  63 + }
  64 +// } catch (ParseException e) {
  65 +// // TODO Auto-generated catch block
  66 +// e.printStackTrace();
  67 +// }
  68 + if(null != direction && direction.equals("ASC"))
  69 + d = Direction.ASC;
  70 + else
  71 + d = Direction.DESC;
  72 +
  73 + // 允许多个字段排序，order可以写单个字段，也可以写多个字段
  74 + // 多个字段格式：{col1},{col2},{col3},....,{coln}
  75 + // 每个字段的排序方向都是一致，这个以后再看要不要改
  76 + List<String> list = Splitter.on(",").trimResults().splitToList(order);
  77 + return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
  78 + }
  79 + @RequestMapping(value = "/qlbList",method = RequestMethod.GET)
  80 + public List<Qlb> qlbList(@RequestParam Map<String, Object> map){
  81 + List<Qlb> list=service.listQlb(map);
  82 + return list;
  83 + }
  84 +
  85 +
  86 +
  87 + @RequestMapping(value = "/obtain",method = RequestMethod.GET)
  88 + public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{
  89 + Map<String, Object> list=new HashMap<String, Object>();
  90 + try {
  91 + list = service.obtain(map);
  92 + } catch (Exception e) {
  93 + // TODO Auto-generated catch block
  94 + throw e;
  95 + }
  96 + return list;
  97 + }
  98 +
  99 + /**
  100 + * 保存氢量
  101 + * @param map
  102 + * @return
  103 + */
  104 + @RequestMapping(value = "/sort",method = RequestMethod.GET)
  105 + public Map<String, Object> sort(@RequestParam Map<String, Object> map){
  106 + Map<String, Object> list=service.sort(map);
  107 + return list;
  108 + }
  109 +
  110 + /**
  111 + * 核对氢量（有加氢没里程）
  112 + * @param map
  113 + * @return
  114 + */
  115 + @RequestMapping(value = "/checkQl",method = RequestMethod.GET)
  116 + public Map<String, Object> checkQl(@RequestParam Map<String, Object> map){
  117 + Map<String, Object> list=service.checkQl(map);
  118 + return list;
  119 + }
  120 +
  121 + @RequestMapping(value = "/sumQlb",method = RequestMethod.GET)
  122 + public Map<String, Object> sumQlb(@RequestParam Map<String, Object> map){
  123 + Map<String, Object> list=service.sumQlb(map);
  124 + return list;
  125 + }
  126 +
  127 + @RequestMapping(value = "/saveQlbList",method = RequestMethod.POST)
  128 + public Map<String, Object> saveQlbList(@RequestParam Map<String, Object> map){
  129 + Map<String, Object> list=new HashMap<String, Object>();
  130 + try {
  131 + list = service.saveQlbList(map);
  132 + } catch (Exception e) {
  133 + // TODO Auto-generated catch block
  134 + e.printStackTrace();
  135 + }
  136 + return list;
  137 + }
  138 +
  139 +
  140 + @RequestMapping(value = "/listExport",method = RequestMethod.POST)
  141 + public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
  142 + SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
  143 + sdfSimple = new SimpleDateFormat("yyyyMMdd");
  144 + List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
  145 + ReportUtils ee = new ReportUtils();
  146 + List<Qlb> qlb = service.listQlb(map);
  147 +// (new CustomerSpecs<Ylb>(map)).iterator();
  148 + List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
  149 + for (Qlb y : qlb) {
  150 + Map<String, Object> m = new HashMap<String, Object>();
  151 + m.put("rq", y.getRq());
  152 + m.put("gsname",y.getGsname() );
  153 + m.put("fgsname", y.getFgsname());
  154 + if(y.getLinename()==null){
  155 + m.put("xlname", y.getXlname()==null?"":y.getXlname());
  156 + }else{
  157 + m.put("xlname", y.getLinename());
  158 + }
  159 + m.put("nbbm", y.getNbbm());
  160 + m.put("jsy", y.getJsy());
  161 + m.put("name", y.getName());
  162 + m.put("jql", y.getJql()<=0?"0":y.getJql());
  163 + m.put("czcl", y.getCzcl()<=0?"0":y.getCzcl()+"%");
  164 + m.put("jzcl", y.getJzcl()<=0?"0":y.getJzcl()+"%");
  165 + m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
  166 + m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
  167 + m.put("hn", y.getHn()<=0?"0":y.getHn());
  168 + String shyy ="无";
  169 + if(y.getShyy()!=null){
  170 + shyy=y.getShyy();
  171 + if(shyy.equals("1")){shyy="票务用";}
  172 + else if(shyy.equals("2")){shyy="保养用";}
  173 + else if(shyy.equals("3")){shyy="报废车用";}
  174 + else if(shyy.equals("4")){shyy="其它用";}
  175 + else if(shyy.equals("5")){shyy="人保部";}
  176 + else if(shyy.equals("6")){shyy="车队";}
  177 + else if(shyy.equals("7")){shyy="车间(高保)";}
  178 + else if(shyy.equals("8")){shyy="车间(小修)";}
  179 + else{shyy ="无";}
  180 + }
  181 + m.put("ns", y.getNs()<=0?"0":y.getNs());
  182 + m.put("shyy", shyy);
  183 + m.put("sh", y.getSh()<=0?"0":y.getSh());
  184 + m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
  185 + m.put("rdlx", "");
  186 + m.put("bglnh", y.getBglhn());
  187 + m.put("znh", Arith.add(y.getSh(), y.getHn()));
  188 + resList.add(m);
  189 + }
  190 + try {
  191 + map.put("sheetName", map.get("rq"));
  192 + listI.add(resList.iterator());
  193 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  194 + ee.excelReplace(listI, new Object[] { map }, path+"mould/listQl.xls",
  195 + path+"export/"+map.get("rq").toString()+ "进出场存氢量.xls");
  196 + } catch (Exception e) {
  197 + e.printStackTrace();
  198 + }
  199 +
  200 + return resList;
  201 +
  202 + }
  203 +
  204 +
  205 + @RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
  206 + public String checkJsy(@RequestParam Map<String, Object> map){
  207 + String list=service.checkJsy(map);
  208 + return list;
  209 + }
  210 +
  211 + @RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
  212 + public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
  213 + Map<String, Object> maps=new HashMap<String, Object>();
  214 + try {
  215 + maps= service.deleteIds(map);
  216 + } catch (Exception e) {
  217 + // TODO Auto-generated catch block
  218 + e.printStackTrace();
  219 + }
  220 + return maps;
  221 + }
  222 +
  223 + @RequestMapping(value = "/saveQlb",method = RequestMethod.POST)
  224 + public Map<String, Object> saveQlb(Qlb t){
  225 +// SysUser user = SecurityUtils.getCurrentUser();
  226 + t.setCreatetime(new Date());
  227 +// Ylb t=new Ylb();
  228 + return service.saveQlb(t);
  229 + }
  230 +
  231 + @RequestMapping(value = "/updateJsy",method = RequestMethod.GET)
  232 + public Map<String, Object> updateJsy(@RequestParam Map<String, Object> map){
  233 + return service.update(map);
  234 + }
  235 +}
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @2b57e3b
1 -package com.bsth.controller.oil;  
2 -  
3 -import java.text.ParseException;  
4 -import java.text.SimpleDateFormat;  
5 -import java.util.ArrayList;  
6 -import java.util.Calendar;  
7 -import java.util.Date;  
8 -import java.util.GregorianCalendar;  
9 -import java.util.HashMap;  
10 -import java.util.Iterator;  
11 -import java.util.List;  
12 -import java.util.Map;  
13 -  
14 -import javax.servlet.http.HttpServletRequest;  
15 -  
16 -import org.springframework.beans.factory.annotation.Autowired;  
17 -import org.springframework.data.domain.Page;  
18 -import org.springframework.data.domain.PageRequest;  
19 -import org.springframework.data.domain.Sort;  
20 -import org.springframework.data.domain.Sort.Direction;  
21 -import org.springframework.web.bind.annotation.PathVariable;  
22 -import org.springframework.web.bind.annotation.RequestMapping;  
23 -import org.springframework.web.bind.annotation.RequestMethod;  
24 -import org.springframework.web.bind.annotation.RequestParam;  
25 -import org.springframework.web.bind.annotation.RestController;  
26 -  
27 -import com.bsth.controller.BaseController;  
28 -import com.bsth.entity.oil.Ylb;  
29 -import com.bsth.entity.sys.SysUser;  
30 -import com.bsth.security.util.SecurityUtils;  
31 -import com.bsth.service.oil.YlbService;  
32 -import com.bsth.util.Arith;  
33 -import com.bsth.util.ReportUtils;  
34 -import com.google.common.base.Splitter;  
35 -  
36 -@RestController  
37 -@RequestMapping("ylb")  
38 -public class YlbController extends BaseController<Ylb, Integer>{  
39 - @Autowired  
40 - YlbService ylbService;  
41 -  
42 - @RequestMapping(value = "/saveYlb",method = RequestMethod.POST)  
43 - public Map<String, Object> saveYlb(Ylb t){  
44 -// SysUser user = SecurityUtils.getCurrentUser();  
45 - t.setCreatetime(new Date());  
46 -// Ylb t=new Ylb();  
47 - return ylbService.saveYlb(t);  
48 - }  
49 -  
50 - @RequestMapping(value = "/updateJsy",method = RequestMethod.GET)  
51 - public Map<String, Object> updateJsy(@RequestParam Map<String, Object> map){  
52 - return ylbService.update(map);  
53 - }  
54 -  
55 -  
56 - /**  
57 - * 把加油（YLXXB）的数据加入  
58 - * @param map  
59 - * @return  
60 - */  
61 - @RequestMapping(value = "/obtain",method = RequestMethod.GET)  
62 - public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{  
63 - Map<String, Object> list =new HashMap<String, Object>();  
64 - try {  
65 -  
66 - list = ylbService.obtain(map);  
67 - } catch (Exception e) {  
68 - // TODO Auto-generated catch block  
69 - throw e;  
70 - }  
71 - System.out.println();  
72 - return list;  
73 - }  
74 -  
75 -  
76 - @RequestMapping(value = "/saveYlbList",method = RequestMethod.POST)  
77 - public Map<String, Object> saveYlbList(@RequestParam Map<String, Object> map){  
78 - Map<String, Object> list=new HashMap<String, Object>();  
79 - try {  
80 - list = ylbService.saveYlbList(map);  
81 - } catch (Exception e) {  
82 - // TODO Auto-generated catch block  
83 - e.printStackTrace();  
84 - }  
85 - return list;  
86 - }  
87 - /**  
88 - * 拆分油量  
89 - * @param map  
90 - * @return  
91 - */  
92 - @RequestMapping(value = "/sort",method = RequestMethod.POST)  
93 - public Map<String, Object> sort(@RequestParam Map<String, Object> map){  
94 - Map<String, Object> list=new HashMap<String, Object>();  
95 - try {  
96 - list=ylbService.sort(map);  
97 - } catch (Exception e) {  
98 - // TODO: handle exception  
99 - }  
100 - return list;  
101 - }  
102 -  
103 - /**  
104 - * 进场油量等于出场油量  
105 - * @param map  
106 - * @return  
107 - */  
108 - @RequestMapping(value = "/outAndIn",method = RequestMethod.GET)  
109 - public Map<String, Object> outAndIn(@RequestParam Map<String, Object> map) throws Exception{  
110 - Map<String, Object> list=new HashMap<String, Object>();  
111 - try {  
112 -  
113 - list=ylbService.outAndIn(map);  
114 - } catch (Exception e) {  
115 - // TODO: handle exception  
116 - }  
117 -  
118 - return list;  
119 - }  
120 -  
121 - /**  
122 - * 核对油量（有加油没里程）  
123 - * @param map  
124 - * @return  
125 - */  
126 - @RequestMapping(value = "/checkYl",method = RequestMethod.GET)  
127 - public Map<String, Object> checkYl(@RequestParam Map<String, Object> map){  
128 - Map<String, Object> list=new HashMap<String, Object>();  
129 - try {  
130 - list=ylbService.checkYl(map);  
131 - } catch (Exception e) {  
132 - // TODO: handle exception  
133 - }  
134 - return list;  
135 - }  
136 -  
137 - /**  
138 - *  
139 - * @Title: list  
140 - * @Description: TODO(多条件分页查询)  
141 - * @param @param map 查询条件  
142 - * @param @param page 页码  
143 - * @param @param size 每页显示数量  
144 - * @throws  
145 - */  
146 - @RequestMapping(method = RequestMethod.GET)  
147 - public Page<Ylb> list(@RequestParam Map<String, Object> map,  
148 - @RequestParam(defaultValue = "0") int page,  
149 - @RequestParam(defaultValue = "10") int size,  
150 - @RequestParam(defaultValue = "id") String order,  
151 - @RequestParam(defaultValue = "DESC") String direction){  
152 -  
153 - Direction d;  
154 - map.put("xlbm_like", map.get("xlbm_like").toString().trim());  
155 - String rq=map.get("rq").toString();  
156 - int lx=Integer.parseInt(map.get("sxtj").toString().trim());  
157 - if(lx>0){  
158 - map.put("nbbm_in", ylbService.checkNbmmNum(rq, map.get("ssgsdm_like").toString(),  
159 - map.get("fgsdm_like").toString(), map.get("xlbm_like").toString(),  
160 - map.get("nbbm_eq").toString(),lx));  
161 - }  
162 -// try {  
163 -  
164 - if(!(rq=="")){  
165 -//  
166 -// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");  
167 -// Calendar calendar = new GregorianCalendar();  
168 -// calendar.setTime(sdf.parse(rq));  
169 -// calendar.add(calendar.DATE,1);  
170 -// Date date=calendar.getTime();  
171 - map.put("rq_eq", rq);  
172 -// map.put("rq_lt", sdf.format(date));  
173 -// System.out.println(rq);  
174 -// System.out.println(sdf.format(date));  
175 - }  
176 -// } catch (ParseException e) {  
177 -// // TODO Auto-generated catch block  
178 -// e.printStackTrace();  
179 -// }  
180 - if(null != direction && direction.equals("ASC"))  
181 - d = Direction.ASC;  
182 - else  
183 - d = Direction.DESC;  
184 -  
185 - // 允许多个字段排序，order可以写单个字段，也可以写多个字段  
186 - // 多个字段格式：{col1},{col2},{col3},....,{coln}  
187 - // 每个字段的排序方向都是一致，这个以后再看要不要改  
188 - List<String> list = Splitter.on(",").trimResults().splitToList(order);  
189 - return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));  
190 - }  
191 -  
192 -  
193 -  
194 -  
195 - /**  
196 - *  
197 - * @Title: list  
198 - * @Description: TODO(多条件分页查询)  
199 - * @param @param map 查询条件  
200 - * @param @param page 页码  
201 - * @param @param size 每页显示数量  
202 - * @throws  
203 - */  
204 - @RequestMapping(value = "/ylbList",method = RequestMethod.GET)  
205 - public List<Ylb> ylbList(@RequestParam Map<String, Object> map){  
206 - List<Ylb> ylbList=ylbService.listYlb(map);  
207 - return ylbList;  
208 - }  
209 -  
210 - @RequestMapping(value = "/deleteIds", method = RequestMethod.POST)  
211 - public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {  
212 - Map<String, Object> maps=new HashMap<String, Object>();  
213 - try {  
214 - maps= ylbService.deleteIds(map);  
215 - } catch (Exception e) {  
216 - // TODO Auto-generated catch block  
217 - e.printStackTrace();  
218 - }  
219 - return maps;  
220 - }  
221 - @RequestMapping(value="/oilListMonth")  
222 - public List<Map<String, Object>> oilListMonth(@RequestParam Map<String, Object> map){  
223 - return ylbService.oilListMonth(map);  
224 - }  
225 -  
226 - @RequestMapping(value = "/checkJsy",method = RequestMethod.GET)  
227 - public String checkJsy(@RequestParam Map<String, Object> map){  
228 - String list=ylbService.checkJsy(map);  
229 - return list;  
230 - }  
231 -  
232 - @RequestMapping(value = "/checkDate",method = RequestMethod.GET)  
233 - public String checkDate(@RequestParam Map<String, Object> map){  
234 - String list=ylbService.checkDate(map);  
235 - return list;  
236 - }  
237 -  
238 - @RequestMapping(value = "/sumYlb",method = RequestMethod.GET)  
239 - public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){  
240 - Map<String, Object> list=ylbService.sumYlb(map);  
241 - return list;  
242 - }  
243 -  
244 - @RequestMapping(value = "/listExport",method = RequestMethod.POST)  
245 - public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){  
246 - SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),  
247 - sdfSimple = new SimpleDateFormat("yyyyMMdd");  
248 - List<Iterator<?>> listI = new ArrayList<Iterator<?>>();  
249 - ReportUtils ee = new ReportUtils();  
250 - List<Ylb> ylb= ylbService.listYlb(map);  
251 -// (new CustomerSpecs<Ylb>(map)).iterator();  
252 - List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();  
253 - for (Ylb y : ylb) {  
254 - Map<String, Object> m = new HashMap<String, Object>();  
255 - m.put("rq", sdfMonth.format(y.getRq()));  
256 - m.put("gsname",y.getGsname() );  
257 - m.put("fgsname", y.getFgsname());  
258 - m.put("xlname", y.getXlname()==null?"":y.getXlname());  
259 - m.put("nbbm", y.getNbbm());  
260 - m.put("jsy", y.getJsy());  
261 - m.put("name", y.getName());  
262 - m.put("jzl", y.getJzl()<=0?"0":y.getJzl());  
263 - m.put("czlc", "0");  
264 - m.put("jzlc", "0");  
265 - m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl());  
266 - m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl());  
267 - m.put("yh", y.getYh()<=0?"0":y.getYh());  
268 - String rylx="";  
269 - if(y.getRylx()!=null){  
270 - if(y.getRylx().equals("0")){rylx="0号柴油";}  
271 - if(y.getRylx().equals("1")){rylx="负10号柴油";}  
272 - }  
273 - m.put("rylx", rylx);  
274 - m.put("ns", y.getNs()==null?"0":y.getNs());  
275 - String shyy ="无";  
276 - if(y.getShyy()!=null){  
277 - shyy=y.getShyy();  
278 - if(shyy.equals("1")){shyy="票务用油";}  
279 - else if(shyy.equals("2")){shyy="保养用油";}  
280 - else if(shyy.equals("3")){shyy="报废车用油";}  
281 - else if(shyy.equals("4")){shyy="其它用油";}  
282 - else if(shyy.equals("5")){shyy="人保部";}  
283 - else if(shyy.equals("6")){shyy="车队";}  
284 - else if(shyy.equals("7")){shyy="车间(高保)";}  
285 - else if(shyy.equals("8")){shyy="车间(小修)";}  
286 - else{shyy ="无";}  
287 - }  
288 - m.put("shyy", shyy);  
289 - m.put("sh", y.getSh()<=0?"0":y.getSh());  
290 - m.put("zlc", y.getZlc()<=0?"0":y.getZlc());  
291 - m.put("bglyh", y.getBglyh());  
292 - m.put("zyh", Arith.add(y.getSh(), y.getYh()));  
293 - resList.add(m);  
294 - }  
295 - try {  
296 - map.put("sheetName", map.get("rq"));  
297 - listI.add(resList.iterator());  
298 - String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";  
299 - ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",  
300 - path+"export/"+map.get("rq").toString()+ "进出场存油量.xls");  
301 - } catch (Exception e) {  
302 - e.printStackTrace();  
303 - }  
304 -  
305 - return resList;  
306 -  
307 - }  
308 -  
309 - /*  
310 - * 历史修改行车路单后重新统计油量信息 (传参：line --线路编码 date --日期)  
311 - */  
312 -  
313 - @RequestMapping(value = "/updateHistory",method = RequestMethod.POST)  
314 - public Map<String, Object> updateHistory(@RequestParam Map<String, Object> map) throws Exception{  
315 - Map<String, Object> list =new HashMap<String, Object>();  
316 - try {  
317 - list = ylbService.updateHistory(map);  
318 - } catch (Exception e) {  
319 - // TODO Auto-generated catch block  
320 - throw e;  
321 - }  
322 - return list;  
323 - }  
324 -  
325 -  
326 -} 1 +package com.bsth.controller.oil;
  2 +
  3 +import java.text.ParseException;
  4 +import java.text.SimpleDateFormat;
  5 +import java.util.ArrayList;
  6 +import java.util.Calendar;
  7 +import java.util.Date;
  8 +import java.util.GregorianCalendar;
  9 +import java.util.HashMap;
  10 +import java.util.Iterator;
  11 +import java.util.List;
  12 +import java.util.Map;
  13 +
  14 +import javax.servlet.http.HttpServletRequest;
  15 +
  16 +import org.springframework.beans.factory.annotation.Autowired;
  17 +import org.springframework.data.domain.Page;
  18 +import org.springframework.data.domain.PageRequest;
  19 +import org.springframework.data.domain.Sort;
  20 +import org.springframework.data.domain.Sort.Direction;
  21 +import org.springframework.web.bind.annotation.PathVariable;
  22 +import org.springframework.web.bind.annotation.RequestMapping;
  23 +import org.springframework.web.bind.annotation.RequestMethod;
  24 +import org.springframework.web.bind.annotation.RequestParam;
  25 +import org.springframework.web.bind.annotation.RestController;
  26 +
  27 +import com.bsth.controller.BaseController;
  28 +import com.bsth.entity.oil.Ylb;
  29 +import com.bsth.entity.sys.Dictionary;
  30 +import com.bsth.entity.sys.SysUser;
  31 +import com.bsth.security.util.SecurityUtils;
  32 +import com.bsth.service.oil.YlbService;
  33 +import com.bsth.service.sys.DictionaryService;
  34 +import com.bsth.util.Arith;
  35 +import com.bsth.util.ReportUtils;
  36 +import com.google.common.base.Splitter;
  37 +
  38 +@RestController
  39 +@RequestMapping("ylb")
  40 +public class YlbController extends BaseController<Ylb, Integer>{
  41 + @Autowired
  42 + YlbService ylbService;
  43 + @Autowired
  44 + DictionaryService dictionaryService;
  45 + @RequestMapping(value = "/saveYlb",method = RequestMethod.POST)
  46 + public Map<String, Object> saveYlb(Ylb t){
  47 +// SysUser user = SecurityUtils.getCurrentUser();
  48 + t.setCreatetime(new Date());
  49 +// Ylb t=new Ylb();
  50 + return ylbService.saveYlb(t);
  51 + }
  52 +
  53 + @RequestMapping(value = "/updateJsy",method = RequestMethod.GET)
  54 + public Map<String, Object> updateJsy(@RequestParam Map<String, Object> map){
  55 + return ylbService.update(map);
  56 + }
  57 +
  58 +
  59 + /**
  60 + * 把加油（YLXXB）的数据加入
  61 + * @param map
  62 + * @return
  63 + */
  64 + @RequestMapping(value = "/obtain",method = RequestMethod.GET)
  65 + public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{
  66 + Map<String, Object> list =new HashMap<String, Object>();
  67 + try {
  68 +
  69 + list = ylbService.obtain(map);
  70 + } catch (Exception e) {
  71 + // TODO Auto-generated catch block
  72 + throw e;
  73 + }
  74 + System.out.println();
  75 + return list;
  76 + }
  77 +
  78 +
  79 + @RequestMapping(value = "/saveYlbList",method = RequestMethod.POST)
  80 + public Map<String, Object> saveYlbList(@RequestParam Map<String, Object> map){
  81 + Map<String, Object> list=new HashMap<String, Object>();
  82 + try {
  83 + list = ylbService.saveYlbList(map);
  84 + } catch (Exception e) {
  85 + // TODO Auto-generated catch block
  86 + e.printStackTrace();
  87 + }
  88 + return list;
  89 + }
  90 + /**
  91 + * 拆分油量
  92 + * @param map
  93 + * @return
  94 + */
  95 + @RequestMapping(value = "/sort",method = RequestMethod.POST)
  96 + public Map<String, Object> sort(@RequestParam Map<String, Object> map){
  97 + Map<String, Object> list=new HashMap<String, Object>();
  98 + try {
  99 + list=ylbService.sort(map);
  100 + } catch (Exception e) {
  101 + // TODO: handle exception
  102 + }
  103 + return list;
  104 + }
  105 +
  106 + /**
  107 + * 进场油量等于出场油量
  108 + * @param map
  109 + * @return
  110 + */
  111 + @RequestMapping(value = "/outAndIn",method = RequestMethod.GET)
  112 + public Map<String, Object> outAndIn(@RequestParam Map<String, Object> map) throws Exception{
  113 + Map<String, Object> list=new HashMap<String, Object>();
  114 + try {
  115 +
  116 + list=ylbService.outAndIn(map);
  117 + } catch (Exception e) {
  118 + // TODO: handle exception
  119 + }
  120 +
  121 + return list;
  122 + }
  123 +
  124 + /**
  125 + * 核对油量（有加油没里程）
  126 + * @param map
  127 + * @return
  128 + */
  129 + @RequestMapping(value = "/checkYl",method = RequestMethod.GET)
  130 + public Map<String, Object> checkYl(@RequestParam Map<String, Object> map){
  131 + Map<String, Object> list=new HashMap<String, Object>();
  132 + try {
  133 + list=ylbService.checkYl(map);
  134 + } catch (Exception e) {
  135 + // TODO: handle exception
  136 + }
  137 + return list;
  138 + }
  139 +
  140 + /**
  141 + *
  142 + * @Title: list
  143 + * @Description: TODO(多条件分页查询)
  144 + * @param @param map 查询条件
  145 + * @param @param page 页码
  146 + * @param @param size 每页显示数量
  147 + * @throws
  148 + */
  149 + @RequestMapping(method = RequestMethod.GET)
  150 + public Page<Ylb> list(@RequestParam Map<String, Object> map,
  151 + @RequestParam(defaultValue = "0") int page,
  152 + @RequestParam(defaultValue = "10") int size,
  153 + @RequestParam(defaultValue = "id") String order,
  154 + @RequestParam(defaultValue = "DESC") String direction){
  155 +
  156 + Direction d;
  157 + map.put("xlbm_like", map.get("xlbm_like").toString().trim());
  158 + String rq=map.get("rq").toString();
  159 + int lx=Integer.parseInt(map.get("sxtj").toString().trim());
  160 + if(lx>0){
  161 + map.put("nbbm_in", ylbService.checkNbmmNum(rq, map.get("ssgsdm_like").toString(),
  162 + map.get("fgsdm_like").toString(), map.get("xlbm_like").toString(),
  163 + map.get("nbbm_eq").toString(),lx));
  164 + }
  165 +// try {
  166 +
  167 + if(!(rq=="")){
  168 +//
  169 +// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  170 +// Calendar calendar = new GregorianCalendar();
  171 +// calendar.setTime(sdf.parse(rq));
  172 +// calendar.add(calendar.DATE,1);
  173 +// Date date=calendar.getTime();
  174 + map.put("rq_eq", rq);
  175 +// map.put("rq_lt", sdf.format(date));
  176 +// System.out.println(rq);
  177 +// System.out.println(sdf.format(date));
  178 + }
  179 +// } catch (ParseException e) {
  180 +// // TODO Auto-generated catch block
  181 +// e.printStackTrace();
  182 +// }
  183 + if(null != direction && direction.equals("ASC"))
  184 + d = Direction.ASC;
  185 + else
  186 + d = Direction.DESC;
  187 +
  188 + // 允许多个字段排序，order可以写单个字段，也可以写多个字段
  189 + // 多个字段格式：{col1},{col2},{col3},....,{coln}
  190 + // 每个字段的排序方向都是一致，这个以后再看要不要改
  191 + List<String> list = Splitter.on(",").trimResults().splitToList(order);
  192 + return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
  193 + }
  194 +
  195 +
  196 +
  197 +
  198 + /**
  199 + *
  200 + * @Title: list
  201 + * @Description: TODO(多条件分页查询)
  202 + * @param @param map 查询条件
  203 + * @param @param page 页码
  204 + * @param @param size 每页显示数量
  205 + * @throws
  206 + */
  207 + @RequestMapping(value = "/ylbList",method = RequestMethod.GET)
  208 + public List<Ylb> ylbList(@RequestParam Map<String, Object> map){
  209 + List<Ylb> ylbList=ylbService.listYlb(map);
  210 + return ylbList;
  211 + }
  212 +
  213 + @RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
  214 + public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
  215 + Map<String, Object> maps=new HashMap<String, Object>();
  216 + try {
  217 + maps= ylbService.deleteIds(map);
  218 + } catch (Exception e) {
  219 + // TODO Auto-generated catch block
  220 + e.printStackTrace();
  221 + }
  222 + return maps;
  223 + }
  224 + @RequestMapping(value="/oilListMonth")
  225 + public List<Map<String, Object>> oilListMonth(@RequestParam Map<String, Object> map){
  226 + return ylbService.oilListMonth(map);
  227 + }
  228 +
  229 + @RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
  230 + public String checkJsy(@RequestParam Map<String, Object> map){
  231 + String list=ylbService.checkJsy(map);
  232 + return list;
  233 + }
  234 +
  235 + @RequestMapping(value = "/checkDate",method = RequestMethod.GET)
  236 + public String checkDate(@RequestParam Map<String, Object> map){
  237 + String result=ylbService.checkDate(map);
  238 + return result;
  239 + }
  240 +
  241 + @RequestMapping(value = "/getModifyRights",method = RequestMethod.GET)
  242 + public Map<String, Object> getModifyRights(@RequestParam Map<String, Object> map){
  243 + String result=ylbService.getModifyRights();
  244 + Map<String, Object> resMap = new HashMap<String, Object>();
  245 + resMap.put("text", result);
  246 + return resMap;
  247 + }
  248 +
  249 + @RequestMapping(value = "/modifyRightsChange",method = RequestMethod.GET)
  250 + public Map<String, Object> modifyRightsChange(@RequestParam Map<String, Object> map){
  251 + String result=ylbService.modifyRightsChange();
  252 + Map<String, Object> resMap = new HashMap<String, Object>();
  253 + resMap.put("text", result);
  254 + return resMap;
  255 + }
  256 +
  257 + @RequestMapping(value = "/getModifyRightsPj",method = RequestMethod.GET)
  258 + public Map<String, Object> getModifyRightsPj(@RequestParam Map<String, Object> map){
  259 + String result=ylbService.getModifyRightsPj();
  260 + Map<String, Object> resMap = new HashMap<String, Object>();
  261 + resMap.put("text", result);
  262 + return resMap;
  263 + }
  264 +
  265 + @RequestMapping(value = "/modifyRightsChangePj",method = RequestMethod.GET)
  266 + public Map<String, Object> modifyRightsChangePj(@RequestParam Map<String, Object> map){
  267 + String result=ylbService.modifyRightsChangePj();
  268 + Map<String, Object> resMap = new HashMap<String, Object>();
  269 + resMap.put("text", result);
  270 + return resMap;
  271 + }
  272 +
  273 + @RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
  274 + public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
  275 + Map<String, Object> list=ylbService.sumYlb(map);
  276 + return list;
  277 + }
  278 +
  279 + @RequestMapping(value = "/listExport",method = RequestMethod.POST)
  280 + public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){
  281 + SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
  282 + sdfSimple = new SimpleDateFormat("yyyyMMdd");
  283 + Map<String, Object> dMap=new HashMap<>();
  284 + dMap.put("dGroup_eq", "oilType");
  285 + Iterator<Dictionary> it= dictionaryService.list(dMap).iterator();
  286 + while (it.hasNext()) {
  287 + Dictionary d=it.next();
  288 + dMap.put(d.getdCode(), d.getdName());
  289 + }
  290 +
  291 + List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
  292 + ReportUtils ee = new ReportUtils();
  293 + List<Ylb> ylb= ylbService.listYlb(map);
  294 +
  295 +// (new CustomerSpecs<Ylb>(map)).iterator();
  296 + List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
  297 + for (Ylb y : ylb) {
  298 + Map<String, Object> m = new HashMap<String, Object>();
  299 + m.put("rq", sdfMonth.format(y.getRq()));
  300 + m.put("gsname",y.getGsname() );
  301 + m.put("fgsname", y.getFgsname());
  302 + if(y.getLinename()==null){
  303 + m.put("xlname", y.getXlname()==null?"":y.getXlname());
  304 + }else{
  305 + m.put("xlname", y.getLinename());
  306 + }
  307 + m.put("nbbm", y.getNbbm());
  308 + m.put("jsy", y.getJsy());
  309 + m.put("name", y.getName());
  310 + m.put("jzl", y.getJzl()<=0?"0":y.getJzl());
  311 + m.put("czlc", "0");
  312 + m.put("jzlc", "0");
  313 + m.put("czyl", y.getCzyl()<=0?"0":y.getCzyl());
  314 + m.put("jzyl", y.getJzyl()<=0?"0":y.getJzyl());
  315 + m.put("yh", y.getYh()<=0?"0":y.getYh());
  316 + String rylx="";
  317 + if(y.getRylx()!=null){
  318 + /*if(y.getRylx().equals("0")){rylx="0号柴油";}
  319 + if(y.getRylx().equals("1")){rylx="负10号柴油";}*/
  320 + if(dMap.get(y.getRylx())==null){
  321 + rylx="";
  322 + }else{
  323 + rylx=dMap.get(y.getRylx()).toString();
  324 + }
  325 + }
  326 + m.put("rylx", rylx);
  327 + m.put("ns", y.getNs()==null?"0":y.getNs());
  328 + String shyy ="无";
  329 + if(y.getShyy()!=null){
  330 + shyy=y.getShyy();
  331 + if(shyy.equals("1")){shyy="票务用油";}
  332 + else if(shyy.equals("2")){shyy="保养用油";}
  333 + else if(shyy.equals("3")){shyy="报废车用油";}
  334 + else if(shyy.equals("4")){shyy="其它用油";}
  335 + else if(shyy.equals("5")){shyy="人保部";}
  336 + else if(shyy.equals("6")){shyy="车队";}
  337 + else if(shyy.equals("7")){shyy="车间(高保)";}
  338 + else if(shyy.equals("8")){shyy="车间(小修)";}
  339 + else{shyy ="无";}
  340 + }
  341 + m.put("shyy", shyy);
  342 + m.put("sh", y.getSh()<=0?"0":y.getSh());
  343 + m.put("zlc", y.getZlc()<=0?"0":y.getZlc());
  344 + m.put("bglyh", y.getBglyh());
  345 + m.put("zyh", Arith.add(y.getSh(), y.getYh()));
  346 + resList.add(m);
  347 + }
  348 + try {
  349 + map.put("sheetName", map.get("rq"));
  350 + listI.add(resList.iterator());
  351 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  352 + ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
  353 + path+"export/"+map.get("rq").toString()+ "进出场存油量.xls");
  354 + } catch (Exception e) {
  355 + e.printStackTrace();
  356 + }
  357 +
  358 + return resList;
  359 +
  360 + }
  361 +
  362 + /*
  363 + * 历史修改行车路单后重新统计油量信息 (传参：line --线路编码 date --日期)
  364 + */
  365 +
  366 + @RequestMapping(value = "/updateHistory",method = RequestMethod.POST)
  367 + public Map<String, Object> updateHistory(@RequestParam Map<String, Object> map) throws Exception{
  368 + Map<String, Object> list =new HashMap<String, Object>();
  369 + try {
  370 + list = ylbService.updateHistory(map);
  371 + } catch (Exception e) {
  372 + // TODO Auto-generated catch block
  373 + throw e;
  374 + }
  375 + return list;
  376 + }
  377 +
  378 +
  379 +}
src/main/java/com/bsth/data/BasicData.java
  View file @2b57e3b
@@ -55,6 +55,11 @@ public class BasicData { @@ -55,6 +55,11 @@ public class BasicData {
55 //线路编码和名称对照 55 //线路编码和名称对照
56 public static Map<String, String> lineCode2NameMap; 56 public static Map<String, String> lineCode2NameMap;
57 57
  58 + //名称和线路编码对照
  59 + public static Map<String, String> lineName2CodeMap;
  60 +
  61 + public static Map<String, String> lineCodeAllNameMap;
  62 +
58 //停车场 63 //停车场
59 public static List<String> parkCodeList; 64 public static List<String> parkCodeList;
60 65
@@ -277,6 +282,7 @@ public class BasicData { @@ -277,6 +282,7 @@ public class BasicData {
277 Line line; 282 Line line;
278 BiMap<Integer, String> biMap = HashBiMap.create(); 283 BiMap<Integer, String> biMap = HashBiMap.create();
279 Map<String, String> code2name = new HashMap<>(); 284 Map<String, String> code2name = new HashMap<>();
  285 + Map<String, String> name2code = new HashMap<>();
280 Map<Integer, String> id2SHcode = new HashMap<Integer, String>(); 286 Map<Integer, String> id2SHcode = new HashMap<Integer, String>();
281 Map<String, String> code2SHcode = new HashMap<String, String>(); 287 Map<String, String> code2SHcode = new HashMap<String, String>();
282 Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>(); 288 Map<String, Integer> tempStationName2YgcNumber = new HashMap<String, Integer>();
@@ -310,6 +316,7 @@ public class BasicData { @@ -310,6 +316,7 @@ public class BasicData {
310 line = iterator.next(); 316 line = iterator.next();
311 biMap.put(line.getId(), line.getLineCode()); 317 biMap.put(line.getId(), line.getLineCode());
312 code2name.put(line.getLineCode(), line.getName()); 318 code2name.put(line.getLineCode(), line.getName());
  319 + name2code.put(line.getName(), line.getLineCode());
313 id2SHcode.put(line.getId(), line.getShanghaiLinecode()); 320 id2SHcode.put(line.getId(), line.getShanghaiLinecode());
314 code2SHcode.put(line.getLineCode(), line.getShanghaiLinecode()); 321 code2SHcode.put(line.getLineCode(), line.getShanghaiLinecode());
315 } 322 }
@@ -320,9 +327,18 @@ public class BasicData { @@ -320,9 +327,18 @@ public class BasicData {
320 327
321 lineId2CodeMap = biMap; 328 lineId2CodeMap = biMap;
322 lineCode2NameMap = code2name; 329 lineCode2NameMap = code2name;
  330 + lineName2CodeMap = name2code;
323 lineId2ShangHaiCodeMap = id2SHcode; 331 lineId2ShangHaiCodeMap = id2SHcode;
324 lineCode2ShangHaiCodeMap = code2SHcode; 332 lineCode2ShangHaiCodeMap = code2SHcode;
325 stationName2YgcNumber = tempStationName2YgcNumber; 333 stationName2YgcNumber = tempStationName2YgcNumber;
  334 +
  335 + Map<String, String> code2nameAll = new HashMap<>();
  336 + Iterator<Line> iteratorAll = lineRepository.findAll().iterator();
  337 + while (iteratorAll.hasNext()) {
  338 + line = iteratorAll.next();
  339 + code2nameAll.put(line.getLineCode(), line.getName());
  340 + }
  341 + lineCodeAllNameMap=code2nameAll;
326 } 342 }
327 343
328 /** 344 /**
src/main/java/com/bsth/entity/Cars.java
  View file @2b57e3b
1 -package com.bsth.entity;  
2 -  
3 -import com.bsth.entity.schedule.BEntity;  
4 -import com.fasterxml.jackson.annotation.JsonIgnoreProperties;  
5 -import org.hibernate.annotations.Formula;  
6 -  
7 -import javax.persistence.*;  
8 -import java.io.Serializable;  
9 -import java.util.Date;  
10 -  
11 -/**  
12 - *  
13 - * @ClassName : Cars(车实体类)  
14 - *  
15 - * @Author : bsth@lq  
16 - *  
17 - * @Description : TODO(车辆基本信息)  
18 - *  
19 - * @Data : 2016-04-27  
20 - *  
21 - * @Version 公交调度系统BS版 0.1  
22 - *  
23 - */  
24 -  
25 -@Entity  
26 -@Table(name = "bsth_c_cars")  
27 -@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})  
28 -public class Cars extends BEntity implements Serializable {  
29 -  
30 - /** 主键Id */  
31 - @Id  
32 - @GeneratedValue  
33 - private Integer id;  
34 -  
35 - /** 自编号/内部编号 */  
36 - @Column(nullable = false, length = 20, unique = true)  
37 - private String insideCode;  
38 -  
39 - // 公司、分公司暂时不用关联实体  
40 - /** 公司代码 */  
41 - @Column(nullable = false)  
42 - private String businessCode;  
43 - /** 公司名称 */  
44 - @Column(nullable = false)  
45 - private String company;  
46 - /** 分公司编码 */  
47 - private String brancheCompanyCode;  
48 - /** 分公司 */  
49 - private String brancheCompany;  
50 -  
51 - /** 组合公司分公司编码 */  
52 - @Formula(" concat(business_code, '_', branche_company_code) ")  
53 - private String cgsbm;  
54 -  
55 - /** 车辆编码（TODO：在原系统里没有，这里暂时留着） */  
56 - @Column(nullable = false)  
57 - private String carCode;  
58 - /** 车牌号 */  
59 - @Column(nullable = false)  
60 - private String carPlate;  
61 - /** 供应商名称 */  
62 - @Column(nullable = false)  
63 - private String supplierName;  
64 - /** 设备终端号 */  
65 - @Column(nullable = false)  
66 - private String equipmentCode;  
67 -  
68 - // 以下信息来自总公司的业务系统，可能需要调用相关接口  
69 - /** 车型类别 */  
70 - private String carClass ;  
71 - /** 技术速度 */  
72 - private Double speed;  
73 - /** 座位数 */  
74 - private Integer carSeatnNumber;  
75 - /** 载客标准 */  
76 - private String carStandard;  
77 - /** 标准油耗(开空调) */  
78 - private Double kburnStandard;  
79 - /** 标准油耗(关空调) */  
80 - private Double gburnStandard;  
81 - /** 报废号 */  
82 - private String scrapCode;  
83 - /** 报废日期 */  
84 - private Date scrapDate;  
85 - /** 厂牌型号1 */  
86 - private String makeCodeOne;  
87 - /** 厂牌型号2 */  
88 - private String makeCodeTwo;  
89 - /** 车辆等级标准 */  
90 - private String carGride;  
91 - /** 出厂排放标准 */  
92 - private String emissionsStandard;  
93 - /** 发动机号码1 */  
94 - private String engineCodeOne;  
95 - /** 发动机号码2 */  
96 - private String engineCodeTwo;  
97 - /** 车架号码1 */  
98 - private String carNumberOne;  
99 - /** 车架号码2 */  
100 - private String carNumberTwo;  
101 - /** 启用日期（2008-10-10）*/  
102 - private Date openDate;  
103 - /** 取消日期 */  
104 - private Date closeDate;  
105 -  
106 - /** 是否空调车 */  
107 - @Column(nullable = true)  
108 - private Boolean hvacCar;  
109 - /** 有无人售票 */  
110 - @Column(nullable = true)  
111 - private Boolean ticketType;  
112 - /** 是否有LED服务屏 */  
113 - @Column(nullable = true)  
114 - private Boolean ledScreen;  
115 - /** 是否有TV视频 */  
116 - @Column(nullable = true)  
117 - private Boolean tvVideoType;  
118 -  
119 - /** 车辆类型 */  
120 - private String carType;  
121 - /** 是否机动车（机动车类型选择）*/  
122 - private String vehicleStats;  
123 - /** 营运状态 */  
124 - private String operatorsState;  
125 - /** 营运证编码 */  
126 - private String serviceNo;  
127 - /** 是否电车（TODO：在原系统里没有，这里暂时留着） */  
128 - private Boolean sfdc;  
129 - /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */  
130 - private Boolean sfmix;  
131 - /** 备注/描述 */  
132 - private String descriptions;  
133 -  
134 - /** 车辆序号（TODO：在原系统里没有，这里暂时留着） */  
135 - private String carOrdinal;  
136 - /** 视频编号 */  
137 - private String videoCode;  
138 - /** 是否报废 */  
139 - @Column(nullable = true)  
140 - private Boolean scrapState;  
141 - /** 是否切换（TODO：在原系统里没有，这里暂时留着）*/  
142 - private Integer isSwitch;  
143 - /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */  
144 - private String xlmc;  
145 -  
146 - public Cars() {}  
147 -  
148 - public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {  
149 - if (id != null) {  
150 - this.id = Integer.valueOf(id.toString());  
151 - }  
152 - if (nbbh != null) {  
153 - this.insideCode = nbbh.toString();  
154 - }  
155 - if (clbh != null) {  
156 - this.carCode = clbh.toString();  
157 - }  
158 - if (cph != null) {  
159 - this.carPlate = cph.toString();  
160 - }  
161 - if (sbbh != null) {  
162 - this.equipmentCode = sbbh.toString();  
163 - }  
164 - }  
165 -  
166 - public String getServiceNo() {  
167 - return serviceNo;  
168 - }  
169 -  
170 - public void setServiceNo(String serviceNo) {  
171 - this.serviceNo = serviceNo;  
172 - }  
173 -  
174 - public Integer getId() {  
175 - return id;  
176 - }  
177 -  
178 - public void setId(Integer id) {  
179 - this.id = id;  
180 - }  
181 -  
182 - public String getInsideCode() {  
183 - return insideCode;  
184 - }  
185 -  
186 - public void setInsideCode(String insideCode) {  
187 - this.insideCode = insideCode;  
188 - }  
189 -  
190 - public String getBusinessCode() {  
191 - return businessCode;  
192 - }  
193 -  
194 - public void setBusinessCode(String businessCode) {  
195 - this.businessCode = businessCode;  
196 - }  
197 -  
198 - public String getCompany() {  
199 - return company;  
200 - }  
201 -  
202 - public void setCompany(String company) {  
203 - this.company = company;  
204 - }  
205 -  
206 - public String getBrancheCompanyCode() {  
207 - return brancheCompanyCode;  
208 - }  
209 -  
210 - public void setBrancheCompanyCode(String brancheCompanyCode) {  
211 - this.brancheCompanyCode = brancheCompanyCode;  
212 - }  
213 -  
214 - public String getBrancheCompany() {  
215 - return brancheCompany;  
216 - }  
217 -  
218 - public void setBrancheCompany(String brancheCompany) {  
219 - this.brancheCompany = brancheCompany;  
220 - }  
221 -  
222 - public String getCarCode() {  
223 - return carCode;  
224 - }  
225 -  
226 - public void setCarCode(String carCode) {  
227 - this.carCode = carCode;  
228 - }  
229 -  
230 - public String getCarPlate() {  
231 - return carPlate;  
232 - }  
233 -  
234 - public void setCarPlate(String carPlate) {  
235 - this.carPlate = carPlate;  
236 - }  
237 -  
238 - public String getSupplierName() {  
239 - return supplierName;  
240 - }  
241 -  
242 - public void setSupplierName(String supplierName) {  
243 - this.supplierName = supplierName;  
244 - }  
245 -  
246 - public String getEquipmentCode() {  
247 - return equipmentCode;  
248 - }  
249 -  
250 - public void setEquipmentCode(String equipmentCode) {  
251 - this.equipmentCode = equipmentCode;  
252 - }  
253 -  
254 - public String getCarClass() {  
255 - return carClass;  
256 - }  
257 -  
258 - public void setCarClass(String carClass) {  
259 - this.carClass = carClass;  
260 - }  
261 -  
262 - public Double getSpeed() {  
263 - return speed;  
264 - }  
265 -  
266 - public void setSpeed(Double speed) {  
267 - this.speed = speed;  
268 - }  
269 -  
270 - public Integer getCarSeatnNumber() {  
271 - return carSeatnNumber;  
272 - }  
273 -  
274 - public void setCarSeatnNumber(Integer carSeatnNumber) {  
275 - this.carSeatnNumber = carSeatnNumber;  
276 - }  
277 -  
278 - public String getCarStandard() {  
279 - return carStandard;  
280 - }  
281 -  
282 - public void setCarStandard(String carStandard) {  
283 - this.carStandard = carStandard;  
284 - }  
285 -  
286 - public Double getKburnStandard() {  
287 - return kburnStandard;  
288 - }  
289 -  
290 - public void setKburnStandard(Double kburnStandard) {  
291 - this.kburnStandard = kburnStandard;  
292 - }  
293 -  
294 - public Double getGburnStandard() {  
295 - return gburnStandard;  
296 - }  
297 -  
298 - public void setGburnStandard(Double gburnStandard) {  
299 - this.gburnStandard = gburnStandard;  
300 - }  
301 -  
302 - public String getScrapCode() {  
303 - return scrapCode;  
304 - }  
305 -  
306 - public void setScrapCode(String scrapCode) {  
307 - this.scrapCode = scrapCode;  
308 - }  
309 -  
310 - public Date getScrapDate() {  
311 - return scrapDate;  
312 - }  
313 -  
314 - public void setScrapDate(Date scrapDate) {  
315 - this.scrapDate = scrapDate;  
316 - }  
317 -  
318 - public String getMakeCodeOne() {  
319 - return makeCodeOne;  
320 - }  
321 -  
322 - public void setMakeCodeOne(String makeCodeOne) {  
323 - this.makeCodeOne = makeCodeOne;  
324 - }  
325 -  
326 - public String getMakeCodeTwo() {  
327 - return makeCodeTwo;  
328 - }  
329 -  
330 - public void setMakeCodeTwo(String makeCodeTwo) {  
331 - this.makeCodeTwo = makeCodeTwo;  
332 - }  
333 -  
334 - public String getCarGride() {  
335 - return carGride;  
336 - }  
337 -  
338 - public void setCarGride(String carGride) {  
339 - this.carGride = carGride;  
340 - }  
341 -  
342 - public String getEmissionsStandard() {  
343 - return emissionsStandard;  
344 - }  
345 -  
346 - public void setEmissionsStandard(String emissionsStandard) {  
347 - this.emissionsStandard = emissionsStandard;  
348 - }  
349 -  
350 - public String getEngineCodeOne() {  
351 - return engineCodeOne;  
352 - }  
353 -  
354 - public void setEngineCodeOne(String engineCodeOne) {  
355 - this.engineCodeOne = engineCodeOne;  
356 - }  
357 -  
358 - public String getEngineCodeTwo() {  
359 - return engineCodeTwo;  
360 - }  
361 -  
362 - public void setEngineCodeTwo(String engineCodeTwo) {  
363 - this.engineCodeTwo = engineCodeTwo;  
364 - }  
365 -  
366 - public String getCarNumberOne() {  
367 - return carNumberOne;  
368 - }  
369 -  
370 - public void setCarNumberOne(String carNumberOne) {  
371 - this.carNumberOne = carNumberOne;  
372 - }  
373 -  
374 - public String getCarNumberTwo() {  
375 - return carNumberTwo;  
376 - }  
377 -  
378 - public void setCarNumberTwo(String carNumberTwo) {  
379 - this.carNumberTwo = carNumberTwo;  
380 - }  
381 -  
382 - public Date getOpenDate() {  
383 - return openDate;  
384 - }  
385 -  
386 - public void setOpenDate(Date openDate) {  
387 - this.openDate = openDate;  
388 - }  
389 -  
390 - public Date getCloseDate() {  
391 - return closeDate;  
392 - }  
393 -  
394 - public void setCloseDate(Date closeDate) {  
395 - this.closeDate = closeDate;  
396 - }  
397 -  
398 - public Boolean getHvacCar() {  
399 - return hvacCar;  
400 - }  
401 -  
402 - public void setHvacCar(Boolean hvacCar) {  
403 - this.hvacCar = hvacCar;  
404 - }  
405 -  
406 - public Boolean getTicketType() {  
407 - return ticketType;  
408 - }  
409 -  
410 - public void setTicketType(Boolean ticketType) {  
411 - this.ticketType = ticketType;  
412 - }  
413 -  
414 - public Boolean getLedScreen() {  
415 - return ledScreen;  
416 - }  
417 -  
418 - public void setLedScreen(Boolean ledScreen) {  
419 - this.ledScreen = ledScreen;  
420 - }  
421 -  
422 - public Boolean getTvVideoType() {  
423 - return tvVideoType;  
424 - }  
425 -  
426 - public void setTvVideoType(Boolean tvVideoType) {  
427 - this.tvVideoType = tvVideoType;  
428 - }  
429 -  
430 - public String getCarType() {  
431 - return carType;  
432 - }  
433 -  
434 - public void setCarType(String carType) {  
435 - this.carType = carType;  
436 - }  
437 -  
438 - public String getVehicleStats() {  
439 - return vehicleStats;  
440 - }  
441 -  
442 - public void setVehicleStats(String vehicleStats) {  
443 - this.vehicleStats = vehicleStats;  
444 - }  
445 -  
446 - public String getOperatorsState() {  
447 - return operatorsState;  
448 - }  
449 -  
450 - public void setOperatorsState(String operatorsState) {  
451 - this.operatorsState = operatorsState;  
452 - }  
453 -  
454 - public Boolean getSfdc() {  
455 - return sfdc;  
456 - }  
457 -  
458 - public void setSfdc(Boolean sfdc) {  
459 - this.sfdc = sfdc;  
460 - }  
461 -  
462 - public String getDescriptions() {  
463 - return descriptions;  
464 - }  
465 -  
466 - public void setDescriptions(String descriptions) {  
467 - this.descriptions = descriptions;  
468 - }  
469 -  
470 - public String getCarOrdinal() {  
471 - return carOrdinal;  
472 - }  
473 -  
474 - public void setCarOrdinal(String carOrdinal) {  
475 - this.carOrdinal = carOrdinal;  
476 - }  
477 -  
478 - public String getVideoCode() {  
479 - return videoCode;  
480 - }  
481 -  
482 - public void setVideoCode(String videoCode) {  
483 - this.videoCode = videoCode;  
484 - }  
485 -  
486 - public Boolean getScrapState() {  
487 - return scrapState;  
488 - }  
489 -  
490 - public void setScrapState(Boolean scrapState) {  
491 - this.scrapState = scrapState;  
492 - }  
493 -  
494 - public Integer getIsSwitch() {  
495 - return isSwitch;  
496 - }  
497 -  
498 - public void setIsSwitch(Integer isSwitch) {  
499 - this.isSwitch = isSwitch;  
500 - }  
501 -  
502 - public String getXlmc() {  
503 - return xlmc;  
504 - }  
505 -  
506 - public void setXlmc(String xlmc) {  
507 - this.xlmc = xlmc;  
508 - }  
509 -  
510 - public String getCgsbm() {  
511 - return cgsbm;  
512 - }  
513 -  
514 - public void setCgsbm(String cgsbm) {  
515 - this.cgsbm = cgsbm;  
516 - }  
517 -  
518 - public Boolean getSfmix() {  
519 - return sfmix;  
520 - }  
521 -  
522 - public void setSfmix(Boolean sfmix) {  
523 - this.sfmix = sfmix;  
524 - }  
525 -} 1 +package com.bsth.entity;
  2 +
  3 +import com.bsth.entity.schedule.BEntity;
  4 +import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  5 +import org.hibernate.annotations.Formula;
  6 +
  7 +import javax.persistence.*;
  8 +import java.io.Serializable;
  9 +import java.util.Date;
  10 +
  11 +/**
  12 + *
  13 + * @ClassName : Cars(车实体类)
  14 + *
  15 + * @Author : bsth@lq
  16 + *
  17 + * @Description : TODO(车辆基本信息)
  18 + *
  19 + * @Data : 2016-04-27
  20 + *
  21 + * @Version 公交调度系统BS版 0.1
  22 + *
  23 + */
  24 +
  25 +@Entity
  26 +@Table(name = "bsth_c_cars")
  27 +@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
  28 +public class Cars extends BEntity implements Serializable {
  29 +
  30 + /** 主键Id */
  31 + @Id
  32 + @GeneratedValue
  33 + private Integer id;
  34 +
  35 + /** 自编号/内部编号 */
  36 + @Column(nullable = false, length = 20, unique = true)
  37 + private String insideCode;
  38 +
  39 + // 公司、分公司暂时不用关联实体
  40 + /** 公司代码 */
  41 + @Column(nullable = false)
  42 + private String businessCode;
  43 + /** 公司名称 */
  44 + @Column(nullable = false)
  45 + private String company;
  46 + /** 分公司编码 */
  47 + private String brancheCompanyCode;
  48 + /** 分公司 */
  49 + private String brancheCompany;
  50 +
  51 + /** 组合公司分公司编码 */
  52 + @Formula(" concat(business_code, '_', branche_company_code) ")
  53 + private String cgsbm;
  54 +
  55 + /** 车辆编码（TODO：在原系统里没有，这里暂时留着） */
  56 + @Column(nullable = false)
  57 + private String carCode;
  58 + /** 车牌号 */
  59 + @Column(nullable = false)
  60 + private String carPlate;
  61 + /** 供应商名称 */
  62 + @Column(nullable = false)
  63 + private String supplierName;
  64 + /** 设备终端号 */
  65 + @Column(nullable = false)
  66 + private String equipmentCode;
  67 +
  68 + // 以下信息来自总公司的业务系统，可能需要调用相关接口
  69 + /** 车型类别 */
  70 + private String carClass ;
  71 + /** 技术速度 */
  72 + private Double speed;
  73 + /** 座位数 */
  74 + private Integer carSeatnNumber;
  75 + /** 载客标准 */
  76 + private String carStandard;
  77 + /** 标准油耗(开空调) */
  78 + private Double kburnStandard;
  79 + /** 标准油耗(关空调) */
  80 + private Double gburnStandard;
  81 + /** 报废号 */
  82 + private String scrapCode;
  83 + /** 报废日期 */
  84 + private Date scrapDate;
  85 + /** 厂牌型号1 */
  86 + private String makeCodeOne;
  87 + /** 厂牌型号2 */
  88 + private String makeCodeTwo;
  89 + /** 车辆等级标准 */
  90 + private String carGride;
  91 + /** 出厂排放标准 */
  92 + private String emissionsStandard;
  93 + /** 发动机号码1 */
  94 + private String engineCodeOne;
  95 + /** 发动机号码2 */
  96 + private String engineCodeTwo;
  97 + /** 车架号码1 */
  98 + private String carNumberOne;
  99 + /** 车架号码2 */
  100 + private String carNumberTwo;
  101 + /** 启用日期（2008-10-10）*/
  102 + private Date openDate;
  103 + /** 取消日期 */
  104 + private Date closeDate;
  105 +
  106 + /** 是否空调车 */
  107 + @Column(nullable = true)
  108 + private Boolean hvacCar;
  109 + /** 有无人售票 */
  110 + @Column(nullable = true)
  111 + private Boolean ticketType;
  112 + /** 是否有LED服务屏 */
  113 + @Column(nullable = true)
  114 + private Boolean ledScreen;
  115 + /** 是否有TV视频 */
  116 + @Column(nullable = true)
  117 + private Boolean tvVideoType;
  118 +
  119 + /** 车辆类型 */
  120 + private String carType;
  121 + /** 是否机动车（机动车类型选择）*/
  122 + private String vehicleStats;
  123 + /** 营运状态 */
  124 + private String operatorsState;
  125 + /** 营运证编码 */
  126 + private String serviceNo;
  127 + /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
  128 + private Boolean sfdc;
  129 + /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
  130 + private Boolean sfmix;
  131 + /** 是否氢能源车 */
  132 + private Boolean hydrogen;
  133 + /** 备注/描述 */
  134 + private String descriptions;
  135 +
  136 + /** 车辆序号（TODO：在原系统里没有，这里暂时留着） */
  137 + private String carOrdinal;
  138 + /** 视频编号 */
  139 + private String videoCode;
  140 + /** 是否报废 */
  141 + @Column(nullable = true)
  142 + private Boolean scrapState;
  143 + /** 是否切换（TODO：在原系统里没有，这里暂时留着）*/
  144 + private Integer isSwitch;
  145 + /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
  146 + private String xlmc;
  147 +
  148 + public Cars() {}
  149 +
  150 + public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
  151 + if (id != null) {
  152 + this.id = Integer.valueOf(id.toString());
  153 + }
  154 + if (nbbh != null) {
  155 + this.insideCode = nbbh.toString();
  156 + }
  157 + if (clbh != null) {
  158 + this.carCode = clbh.toString();
  159 + }
  160 + if (cph != null) {
  161 + this.carPlate = cph.toString();
  162 + }
  163 + if (sbbh != null) {
  164 + this.equipmentCode = sbbh.toString();
  165 + }
  166 + }
  167 +
  168 + public String getServiceNo() {
  169 + return serviceNo;
  170 + }
  171 +
  172 + public void setServiceNo(String serviceNo) {
  173 + this.serviceNo = serviceNo;
  174 + }
  175 +
  176 + public Integer getId() {
  177 + return id;
  178 + }
  179 +
  180 + public void setId(Integer id) {
  181 + this.id = id;
  182 + }
  183 +
  184 + public String getInsideCode() {
  185 + return insideCode;
  186 + }
  187 +
  188 + public void setInsideCode(String insideCode) {
  189 + this.insideCode = insideCode;
  190 + }
  191 +
  192 + public String getBusinessCode() {
  193 + return businessCode;
  194 + }
  195 +
  196 + public void setBusinessCode(String businessCode) {
  197 + this.businessCode = businessCode;
  198 + }
  199 +
  200 + public String getCompany() {
  201 + return company;
  202 + }
  203 +
  204 + public void setCompany(String company) {
  205 + this.company = company;
  206 + }
  207 +
  208 + public String getBrancheCompanyCode() {
  209 + return brancheCompanyCode;
  210 + }
  211 +
  212 + public void setBrancheCompanyCode(String brancheCompanyCode) {
  213 + this.brancheCompanyCode = brancheCompanyCode;
  214 + }
  215 +
  216 + public String getBrancheCompany() {
  217 + return brancheCompany;
  218 + }
  219 +
  220 + public void setBrancheCompany(String brancheCompany) {
  221 + this.brancheCompany = brancheCompany;
  222 + }
  223 +
  224 + public String getCarCode() {
  225 + return carCode;
  226 + }
  227 +
  228 + public void setCarCode(String carCode) {
  229 + this.carCode = carCode;
  230 + }
  231 +
  232 + public String getCarPlate() {
  233 + return carPlate;
  234 + }
  235 +
  236 + public void setCarPlate(String carPlate) {
  237 + this.carPlate = carPlate;
  238 + }
  239 +
  240 + public String getSupplierName() {
  241 + return supplierName;
  242 + }
  243 +
  244 + public void setSupplierName(String supplierName) {
  245 + this.supplierName = supplierName;
  246 + }
  247 +
  248 + public String getEquipmentCode() {
  249 + return equipmentCode;
  250 + }
  251 +
  252 + public void setEquipmentCode(String equipmentCode) {
  253 + this.equipmentCode = equipmentCode;
  254 + }
  255 +
  256 + public String getCarClass() {
  257 + return carClass;
  258 + }
  259 +
  260 + public void setCarClass(String carClass) {
  261 + this.carClass = carClass;
  262 + }
  263 +
  264 + public Double getSpeed() {
  265 + return speed;
  266 + }
  267 +
  268 + public void setSpeed(Double speed) {
  269 + this.speed = speed;
  270 + }
  271 +
  272 + public Integer getCarSeatnNumber() {
  273 + return carSeatnNumber;
  274 + }
  275 +
  276 + public void setCarSeatnNumber(Integer carSeatnNumber) {
  277 + this.carSeatnNumber = carSeatnNumber;
  278 + }
  279 +
  280 + public String getCarStandard() {
  281 + return carStandard;
  282 + }
  283 +
  284 + public void setCarStandard(String carStandard) {
  285 + this.carStandard = carStandard;
  286 + }
  287 +
  288 + public Double getKburnStandard() {
  289 + return kburnStandard;
  290 + }
  291 +
  292 + public void setKburnStandard(Double kburnStandard) {
  293 + this.kburnStandard = kburnStandard;
  294 + }
  295 +
  296 + public Double getGburnStandard() {
  297 + return gburnStandard;
  298 + }
  299 +
  300 + public void setGburnStandard(Double gburnStandard) {
  301 + this.gburnStandard = gburnStandard;
  302 + }
  303 +
  304 + public String getScrapCode() {
  305 + return scrapCode;
  306 + }
  307 +
  308 + public void setScrapCode(String scrapCode) {
  309 + this.scrapCode = scrapCode;
  310 + }
  311 +
  312 + public Date getScrapDate() {
  313 + return scrapDate;
  314 + }
  315 +
  316 + public void setScrapDate(Date scrapDate) {
  317 + this.scrapDate = scrapDate;
  318 + }
  319 +
  320 + public String getMakeCodeOne() {
  321 + return makeCodeOne;
  322 + }
  323 +
  324 + public void setMakeCodeOne(String makeCodeOne) {
  325 + this.makeCodeOne = makeCodeOne;
  326 + }
  327 +
  328 + public String getMakeCodeTwo() {
  329 + return makeCodeTwo;
  330 + }
  331 +
  332 + public void setMakeCodeTwo(String makeCodeTwo) {
  333 + this.makeCodeTwo = makeCodeTwo;
  334 + }
  335 +
  336 + public String getCarGride() {
  337 + return carGride;
  338 + }
  339 +
  340 + public void setCarGride(String carGride) {
  341 + this.carGride = carGride;
  342 + }
  343 +
  344 + public String getEmissionsStandard() {
  345 + return emissionsStandard;
  346 + }
  347 +
  348 + public void setEmissionsStandard(String emissionsStandard) {
  349 + this.emissionsStandard = emissionsStandard;
  350 + }
  351 +
  352 + public String getEngineCodeOne() {
  353 + return engineCodeOne;
  354 + }
  355 +
  356 + public void setEngineCodeOne(String engineCodeOne) {
  357 + this.engineCodeOne = engineCodeOne;
  358 + }
  359 +
  360 + public String getEngineCodeTwo() {
  361 + return engineCodeTwo;
  362 + }
  363 +
  364 + public void setEngineCodeTwo(String engineCodeTwo) {
  365 + this.engineCodeTwo = engineCodeTwo;
  366 + }
  367 +
  368 + public String getCarNumberOne() {
  369 + return carNumberOne;
  370 + }
  371 +
  372 + public void setCarNumberOne(String carNumberOne) {
  373 + this.carNumberOne = carNumberOne;
  374 + }
  375 +
  376 + public String getCarNumberTwo() {
  377 + return carNumberTwo;
  378 + }
  379 +
  380 + public void setCarNumberTwo(String carNumberTwo) {
  381 + this.carNumberTwo = carNumberTwo;
  382 + }
  383 +
  384 + public Date getOpenDate() {
  385 + return openDate;
  386 + }
  387 +
  388 + public void setOpenDate(Date openDate) {
  389 + this.openDate = openDate;
  390 + }
  391 +
  392 + public Date getCloseDate() {
  393 + return closeDate;
  394 + }
  395 +
  396 + public void setCloseDate(Date closeDate) {
  397 + this.closeDate = closeDate;
  398 + }
  399 +
  400 + public Boolean getHvacCar() {
  401 + return hvacCar;
  402 + }
  403 +
  404 + public void setHvacCar(Boolean hvacCar) {
  405 + this.hvacCar = hvacCar;
  406 + }
  407 +
  408 + public Boolean getTicketType() {
  409 + return ticketType;
  410 + }
  411 +
  412 + public void setTicketType(Boolean ticketType) {
  413 + this.ticketType = ticketType;
  414 + }
  415 +
  416 + public Boolean getLedScreen() {
  417 + return ledScreen;
  418 + }
  419 +
  420 + public void setLedScreen(Boolean ledScreen) {
  421 + this.ledScreen = ledScreen;
  422 + }
  423 +
  424 + public Boolean getTvVideoType() {
  425 + return tvVideoType;
  426 + }
  427 +
  428 + public void setTvVideoType(Boolean tvVideoType) {
  429 + this.tvVideoType = tvVideoType;
  430 + }
  431 +
  432 + public String getCarType() {
  433 + return carType;
  434 + }
  435 +
  436 + public void setCarType(String carType) {
  437 + this.carType = carType;
  438 + }
  439 +
  440 + public String getVehicleStats() {
  441 + return vehicleStats;
  442 + }
  443 +
  444 + public void setVehicleStats(String vehicleStats) {
  445 + this.vehicleStats = vehicleStats;
  446 + }
  447 +
  448 + public String getOperatorsState() {
  449 + return operatorsState;
  450 + }
  451 +
  452 + public void setOperatorsState(String operatorsState) {
  453 + this.operatorsState = operatorsState;
  454 + }
  455 +
  456 + public Boolean getSfdc() {
  457 + return sfdc;
  458 + }
  459 +
  460 + public void setSfdc(Boolean sfdc) {
  461 + this.sfdc = sfdc;
  462 + }
  463 +
  464 + public String getDescriptions() {
  465 + return descriptions;
  466 + }
  467 +
  468 + public void setDescriptions(String descriptions) {
  469 + this.descriptions = descriptions;
  470 + }
  471 +
  472 + public String getCarOrdinal() {
  473 + return carOrdinal;
  474 + }
  475 +
  476 + public void setCarOrdinal(String carOrdinal) {
  477 + this.carOrdinal = carOrdinal;
  478 + }
  479 +
  480 + public String getVideoCode() {
  481 + return videoCode;
  482 + }
  483 +
  484 + public void setVideoCode(String videoCode) {
  485 + this.videoCode = videoCode;
  486 + }
  487 +
  488 + public Boolean getScrapState() {
  489 + return scrapState;
  490 + }
  491 +
  492 + public void setScrapState(Boolean scrapState) {
  493 + this.scrapState = scrapState;
  494 + }
  495 +
  496 + public Integer getIsSwitch() {
  497 + return isSwitch;
  498 + }
  499 +
  500 + public void setIsSwitch(Integer isSwitch) {
  501 + this.isSwitch = isSwitch;
  502 + }
  503 +
  504 + public String getXlmc() {
  505 + return xlmc;
  506 + }
  507 +
  508 + public void setXlmc(String xlmc) {
  509 + this.xlmc = xlmc;
  510 + }
  511 +
  512 + public String getCgsbm() {
  513 + return cgsbm;
  514 + }
  515 +
  516 + public void setCgsbm(String cgsbm) {
  517 + this.cgsbm = cgsbm;
  518 + }
  519 +
  520 + public Boolean getSfmix() {
  521 + return sfmix;
  522 + }
  523 +
  524 + public void setSfmix(Boolean sfmix) {
  525 + this.sfmix = sfmix;
  526 + }
  527 +
  528 + public Boolean getHydrogen() {
  529 + return hydrogen;
  530 + }
  531 +
  532 + public void setHydrogen(Boolean hydrogen) {
  533 + this.hydrogen = hydrogen;
  534 + }
  535 +}
src/main/java/com/bsth/entity/oil/Cdl.java
  View file @2b57e3b
1 -package com.bsth.entity.oil;  
2 -  
3 -import java.util.Date;  
4 -  
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient;  
10 -  
11 -import com.bsth.data.BasicData;  
12 -  
13 -@Entity  
14 -@Table(name = "bsth_c_cdl")  
15 -public class Cdl {  
16 - @Id  
17 - @GeneratedValue  
18 - private Integer id;  
19 -  
20 - private String nbbm;  
21 -  
22 - //存电量  
23 - private Double cdl;  
24 -  
25 - private Date updatetime;  
26 -  
27 - //恒定存电  
28 - private Double clcd;  
29 - //公司代码  
30 - private String gsdm;  
31 -  
32 - @Transient  
33 - private String gsname;  
34 -  
35 - @Transient  
36 - private String fgsname;  
37 -  
38 - //分公司代码  
39 - private String fgsdm;  
40 -  
41 - public Integer getId() {  
42 - return id;  
43 - }  
44 -  
45 - public void setId(Integer id) {  
46 - this.id = id;  
47 - }  
48 -  
49 - public String getNbbm() {  
50 - return nbbm;  
51 - }  
52 -  
53 - public void setNbbm(String nbbm) {  
54 - this.nbbm = nbbm;  
55 - }  
56 -  
57 -  
58 - public Double getCdl() {  
59 - return cdl;  
60 - }  
61 -  
62 - public void setCdl(Double cdl) {  
63 - this.cdl = cdl;  
64 - }  
65 -  
66 - public Double getClcd() {  
67 - return clcd;  
68 - }  
69 -  
70 - public void setClcd(Double clcd) {  
71 - this.clcd = clcd;  
72 - }  
73 -  
74 - public Date getUpdatetime() {  
75 - return updatetime;  
76 - }  
77 -  
78 - public void setUpdatetime(Date updatetime) {  
79 - this.updatetime = updatetime;  
80 - }  
81 -  
82 -  
83 - public String getGsdm(){  
84 - return gsdm;  
85 - }  
86 -  
87 - public void setGsdm(String gsdm){  
88 - this.gsdm=gsdm;  
89 - }  
90 -  
91 - public String getFgsdm() {  
92 - return fgsdm;  
93 - }  
94 -  
95 - public void setFgsdm(String fgsdm) {  
96 - this.fgsdm = fgsdm;  
97 - }  
98 -  
99 - public String getGsname() {  
100 - return BasicData.businessCodeNameMap.get(this.gsdm);  
101 - }  
102 -  
103 - public void setGsname(String gsname) {  
104 - this.gsname = gsname;  
105 - }  
106 -  
107 - public String getFgsname() {  
108 - return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);  
109 - }  
110 -  
111 - public void setFgsname(String fgsname) {  
112 - this.fgsname = fgsname;  
113 - }  
114 -  
115 -  
116 -} 1 +package com.bsth.entity.oil;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.*;
  6 +
  7 +import com.bsth.data.BasicData;
  8 +
  9 +@Entity
  10 +@Table(name = "bsth_c_cdl")
  11 +public class Cdl {
  12 + @Id
  13 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  14 + private Integer id;
  15 +
  16 + private String nbbm;
  17 +
  18 + //存电量
  19 + private Double cdl;
  20 +
  21 + private Date updatetime;
  22 +
  23 + //恒定存电
  24 + private Double clcd;
  25 + //公司代码
  26 + private String gsdm;
  27 +
  28 + @Transient
  29 + private String gsname;
  30 +
  31 + @Transient
  32 + private String fgsname;
  33 +
  34 + //分公司代码
  35 + private String fgsdm;
  36 +
  37 + public Integer getId() {
  38 + return id;
  39 + }
  40 +
  41 + public void setId(Integer id) {
  42 + this.id = id;
  43 + }
  44 +
  45 + public String getNbbm() {
  46 + return nbbm;
  47 + }
  48 +
  49 + public void setNbbm(String nbbm) {
  50 + this.nbbm = nbbm;
  51 + }
  52 +
  53 +
  54 + public Double getCdl() {
  55 + return cdl;
  56 + }
  57 +
  58 + public void setCdl(Double cdl) {
  59 + this.cdl = cdl;
  60 + }
  61 +
  62 + public Double getClcd() {
  63 + return clcd;
  64 + }
  65 +
  66 + public void setClcd(Double clcd) {
  67 + this.clcd = clcd;
  68 + }
  69 +
  70 + public Date getUpdatetime() {
  71 + return updatetime;
  72 + }
  73 +
  74 + public void setUpdatetime(Date updatetime) {
  75 + this.updatetime = updatetime;
  76 + }
  77 +
  78 +
  79 + public String getGsdm(){
  80 + return gsdm;
  81 + }
  82 +
  83 + public void setGsdm(String gsdm){
  84 + this.gsdm=gsdm;
  85 + }
  86 +
  87 + public String getFgsdm() {
  88 + return fgsdm;
  89 + }
  90 +
  91 + public void setFgsdm(String fgsdm) {
  92 + this.fgsdm = fgsdm;
  93 + }
  94 +
  95 + public String getGsname() {
  96 + return BasicData.businessCodeNameMap.get(this.gsdm);
  97 + }
  98 +
  99 + public void setGsname(String gsname) {
  100 + this.gsname = gsname;
  101 + }
  102 +
  103 + public String getFgsname() {
  104 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
  105 + }
  106 +
  107 + public void setFgsname(String fgsname) {
  108 + this.fgsname = fgsname;
  109 + }
  110 +
  111 +
  112 +}
src/main/java/com/bsth/entity/oil/Cwjy.java
  View file @2b57e3b
1 -package com.bsth.entity.oil;  
2 -  
3 -import java.util.Date;  
4 -  
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient;  
10 -  
11 -import com.bsth.data.BasicData;  
12 -  
13 -@Entity  
14 -@Table(name = "bsth_c_cwjy")  
15 -public class Cwjy {  
16 - @Id  
17 - @GeneratedValue  
18 - private Integer id;  
19 -  
20 - private String gsdm;  
21 -  
22 - private String fgsdm;  
23 -  
24 - private String nbbm;  
25 -  
26 - private String xgr;  
27 -  
28 - private Date createDate;  
29 -  
30 - private String line;  
31 -  
32 - @Transient  
33 - private String linename;  
34 -  
35 - @Transient  
36 - private String gsname;  
37 -  
38 - @Transient  
39 - private String fgsname;  
40 - public Integer getId() {  
41 - return id;  
42 - }  
43 -  
44 - public void setId(Integer id) {  
45 - this.id = id;  
46 - }  
47 -  
48 - public String getGsdm() {  
49 - return gsdm;  
50 - }  
51 -  
52 - public void setGsdm(String gsdm) {  
53 - this.gsdm = gsdm;  
54 - }  
55 -  
56 - public String getFgsdm() {  
57 - return fgsdm;  
58 - }  
59 -  
60 - public void setFgsdm(String fgsdm) {  
61 - this.fgsdm = fgsdm;  
62 - }  
63 -  
64 - public String getNbbm() {  
65 - return nbbm;  
66 - }  
67 -  
68 - public void setNbbm(String nbbm) {  
69 - this.nbbm = nbbm;  
70 - }  
71 -  
72 - public String getXgr() {  
73 - return xgr;  
74 - }  
75 -  
76 - public void setXgr(String xgr) {  
77 - this.xgr = xgr;  
78 - }  
79 -  
80 - public Date getCreateDate() {  
81 - return createDate;  
82 - }  
83 -  
84 - public void setCreateDate(Date createDate) {  
85 - this.createDate = createDate;  
86 - }  
87 -  
88 - public String getGsname() {  
89 - return BasicData.businessCodeNameMap.get(this.gsdm);  
90 - }  
91 -  
92 - public void setGsname(String gsname) {  
93 - this.gsname = gsname;  
94 - }  
95 -  
96 - public String getFgsname() {  
97 - return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);  
98 - }  
99 -  
100 - public void setFgsname(String fgsname) {  
101 - this.fgsname = fgsname;  
102 - }  
103 -  
104 - public String getLine() {  
105 - return line;  
106 - }  
107 -  
108 - public void setLine(String line) {  
109 - this.line = line;  
110 - }  
111 -  
112 - public String getLinename() {  
113 - return BasicData.lineCode2NameMap.get(this.line);  
114 - }  
115 -  
116 - public void setLinename(String linename) {  
117 - this.linename = linename;  
118 - }  
119 -  
120 -  
121 -  
122 -  
123 -} 1 +package com.bsth.entity.oil;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.*;
  6 +
  7 +import com.bsth.data.BasicData;
  8 +
  9 +@Entity
  10 +@Table(name = "bsth_c_cwjy")
  11 +public class Cwjy {
  12 + @Id
  13 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  14 + private Integer id;
  15 +
  16 + private String gsdm;
  17 +
  18 + private String fgsdm;
  19 +
  20 + private String nbbm;
  21 +
  22 + private String xgr;
  23 +
  24 + private Date createDate;
  25 +
  26 + private String line;
  27 +
  28 + @Transient
  29 + private String linename;
  30 +
  31 + @Transient
  32 + private String gsname;
  33 +
  34 + @Transient
  35 + private String fgsname;
  36 + public Integer getId() {
  37 + return id;
  38 + }
  39 +
  40 + public void setId(Integer id) {
  41 + this.id = id;
  42 + }
  43 +
  44 + public String getGsdm() {
  45 + return gsdm;
  46 + }
  47 +
  48 + public void setGsdm(String gsdm) {
  49 + this.gsdm = gsdm;
  50 + }
  51 +
  52 + public String getFgsdm() {
  53 + return fgsdm;
  54 + }
  55 +
  56 + public void setFgsdm(String fgsdm) {
  57 + this.fgsdm = fgsdm;
  58 + }
  59 +
  60 + public String getNbbm() {
  61 + return nbbm;
  62 + }
  63 +
  64 + public void setNbbm(String nbbm) {
  65 + this.nbbm = nbbm;
  66 + }
  67 +
  68 + public String getXgr() {
  69 + return xgr;
  70 + }
  71 +
  72 + public void setXgr(String xgr) {
  73 + this.xgr = xgr;
  74 + }
  75 +
  76 + public Date getCreateDate() {
  77 + return createDate;
  78 + }
  79 +
  80 + public void setCreateDate(Date createDate) {
  81 + this.createDate = createDate;
  82 + }
  83 +
  84 + public String getGsname() {
  85 + return BasicData.businessCodeNameMap!=null?BasicData.businessCodeNameMap.get(this.gsdm):gsname;
  86 + }
  87 +
  88 + public void setGsname(String gsname) {
  89 + this.gsname = gsname;
  90 + }
  91 +
  92 + public String getFgsname() {
  93 + return BasicData.businessFgsCodeNameMap!=null?BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm):fgsdm;
  94 + }
  95 +
  96 + public void setFgsname(String fgsname) {
  97 + this.fgsname = fgsname;
  98 + }
  99 +
  100 + public String getLine() {
  101 + return line;
  102 + }
  103 +
  104 + public void setLine(String line) {
  105 + this.line = line;
  106 + }
  107 +
  108 + public String getLinename() {
  109 + return BasicData.lineCode2NameMap!=null?BasicData.lineCode2NameMap.get(this.line):linename;
  110 + }
  111 +
  112 + public void setLinename(String linename) {
  113 + this.linename = linename;
  114 + }
  115 +
  116 +
  117 +
  118 +
  119 +}
src/main/java/com/bsth/entity/oil/Cyl.java
  View file @2b57e3b
1 -package com.bsth.entity.oil;  
2 -  
3 -import java.util.Date;  
4 -  
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -import javax.persistence.Transient;  
10 -  
11 -import com.bsth.data.BasicData;  
12 -  
13 -@Entity  
14 -@Table(name = "bsth_c_cyl")  
15 -public class Cyl {  
16 - @Id  
17 - @GeneratedValue  
18 - private Integer id;  
19 -  
20 - private String nbbm;  
21 -  
22 - //存油量  
23 - private Double cyl;  
24 -  
25 - private Date updatetime;  
26 -  
27 - //车厢容量  
28 - private Double cxrl;  
29 - //公司代码  
30 - private String gsdm;  
31 -  
32 - @Transient  
33 - private String gsname;  
34 -  
35 - @Transient  
36 - private String fgsname;  
37 -  
38 - //分公司代码  
39 - private String fgsdm;  
40 -  
41 - public Integer getId() {  
42 - return id;  
43 - }  
44 -  
45 - public void setId(Integer id) {  
46 - this.id = id;  
47 - }  
48 -  
49 - public String getNbbm() {  
50 - return nbbm;  
51 - }  
52 -  
53 - public void setNbbm(String nbbm) {  
54 - this.nbbm = nbbm;  
55 - }  
56 -  
57 - public Double getCyl() {  
58 - return cyl;  
59 - }  
60 -  
61 - public void setCyl(Double cyl) {  
62 - this.cyl = cyl;  
63 - }  
64 -  
65 - public Date getUpdatetime() {  
66 - return updatetime;  
67 - }  
68 -  
69 - public void setUpdatetime(Date updatetime) {  
70 - this.updatetime = updatetime;  
71 - }  
72 -  
73 - public Double getCxrl(){  
74 - return cxrl;  
75 - }  
76 -  
77 - public void setCxrl(Double cxrl){  
78 - this.cxrl=cxrl;  
79 - }  
80 -  
81 - public String getGsdm(){  
82 - return gsdm;  
83 - }  
84 -  
85 - public void setGsdm(String gsdm){  
86 - this.gsdm=gsdm;  
87 - }  
88 -  
89 - public String getFgsdm() {  
90 - return fgsdm;  
91 - }  
92 -  
93 - public void setFgsdm(String fgsdm) {  
94 - this.fgsdm = fgsdm;  
95 - }  
96 -  
97 - public String getGsname() {  
98 - return BasicData.businessCodeNameMap.get(this.gsdm);  
99 - }  
100 -  
101 - public void setGsname(String gsname) {  
102 - this.gsname = gsname;  
103 - }  
104 -  
105 - public String getFgsname() {  
106 - return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);  
107 - }  
108 -  
109 - public void setFgsname(String fgsname) {  
110 - this.fgsname = fgsname;  
111 - }  
112 -  
113 -  
114 -} 1 +package com.bsth.entity.oil;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.*;
  6 +
  7 +import com.bsth.data.BasicData;
  8 +
  9 +@Entity
  10 +@Table(name = "bsth_c_cyl")
  11 +public class Cyl {
  12 + @Id
  13 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  14 + private Integer id;
  15 +
  16 + private String nbbm;
  17 +
  18 + //存油量
  19 + private Double cyl;
  20 +
  21 + private Date updatetime;
  22 +
  23 + //车厢容量
  24 + private Double cxrl;
  25 + //公司代码
  26 + private String gsdm;
  27 +
  28 + @Transient
  29 + private String gsname;
  30 +
  31 + @Transient
  32 + private String fgsname;
  33 +
  34 + //分公司代码
  35 + private String fgsdm;
  36 +
  37 + public Integer getId() {
  38 + return id;
  39 + }
  40 +
  41 + public void setId(Integer id) {
  42 + this.id = id;
  43 + }
  44 +
  45 + public String getNbbm() {
  46 + return nbbm;
  47 + }
  48 +
  49 + public void setNbbm(String nbbm) {
  50 + this.nbbm = nbbm;
  51 + }
  52 +
  53 + public Double getCyl() {
  54 + return cyl;
  55 + }
  56 +
  57 + public void setCyl(Double cyl) {
  58 + this.cyl = cyl;
  59 + }
  60 +
  61 + public Date getUpdatetime() {
  62 + return updatetime;
  63 + }
  64 +
  65 + public void setUpdatetime(Date updatetime) {
  66 + this.updatetime = updatetime;
  67 + }
  68 +
  69 + public Double getCxrl(){
  70 + return cxrl;
  71 + }
  72 +
  73 + public void setCxrl(Double cxrl){
  74 + this.cxrl=cxrl;
  75 + }
  76 +
  77 + public String getGsdm(){
  78 + return gsdm;
  79 + }
  80 +
  81 + public void setGsdm(String gsdm){
  82 + this.gsdm=gsdm;
  83 + }
  84 +
  85 + public String getFgsdm() {
  86 + return fgsdm;
  87 + }
  88 +
  89 + public void setFgsdm(String fgsdm) {
  90 + this.fgsdm = fgsdm;
  91 + }
  92 +
  93 + public String getGsname() {
  94 + return BasicData.businessCodeNameMap.get(this.gsdm);
  95 + }
  96 +
  97 + public void setGsname(String gsname) {
  98 + this.gsname = gsname;
  99 + }
  100 +
  101 + public String getFgsname() {
  102 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.gsdm);
  103 + }
  104 +
  105 + public void setFgsname(String fgsname) {
  106 + this.fgsname = fgsname;
  107 + }
  108 +
  109 +
  110 +}
src/main/java/com/bsth/entity/oil/Dlb.java
  View file @2b57e3b
1 -package com.bsth.entity.oil;  
2 -  
3 -import java.text.DecimalFormat;  
4 -import java.util.Date;  
5 -  
6 -import javax.persistence.Entity;  
7 -import javax.persistence.GeneratedValue;  
8 -import javax.persistence.Id;  
9 -import javax.persistence.Table;  
10 -import javax.persistence.Transient;  
11 -  
12 -import org.springframework.format.annotation.DateTimeFormat;  
13 -  
14 -import com.bsth.data.BasicData;  
15 -  
16 -@Entity  
17 -@Table(name = "bsth_c_dlb")  
18 -public class Dlb {  
19 - @Id  
20 - @GeneratedValue  
21 - private Integer id;  
22 - @DateTimeFormat(pattern="yyyy-MM-dd")  
23 - private Date rq;  
24 - private String xlbm;  
25 - private String ssgsdm;  
26 - private String fgsdm;  
27 - private String nbbm;  
28 - private String jsy;  
29 - private Double czlc=0.0;  
30 - private Double jzlc=0.0;  
31 - //出站存电  
32 - private Double czcd=0.0;  
33 - //进站存电  
34 - private Double jzcd=0.0;  
35 - //充电量  
36 - private Double cdl;  
37 - private int sfkt;  
38 - private String jhsj;  
39 - //耗电  
40 - private Double hd=0.0;  
41 - private Double sh=0.0;  
42 - private String shyy;  
43 - private Double zlc=0.0;  
44 - private int yhlx;  
45 -  
46 - private Double ns=0.0;  
47 - private Double fyylc=0.0;  
48 - private Double jhzlc=0.0;  
49 - private Double jhfyylc=0.0;  
50 - private int jhzbc;  
51 - private int jhbc;  
52 - private int sjzbc;  
53 - private int sjbc;  
54 - private String edituser;  
55 - private Date edittime;  
56 - private Date createtime;  
57 - private Date updatetime;  
58 - private int nylx;  
59 - //进场顺序（根据最先出场和最后进场来关联车辆的存电量）  
60 - private int jcsx;  
61 -  
62 - private String jname;  
63 - @Transient  
64 - private String name;  
65 - @Transient  
66 - private String bglyh;  
67 -  
68 - @Transient  
69 - private String xlname;  
70 -  
71 - @Transient  
72 - private String gsname;  
73 -  
74 - @Transient  
75 - private String fgsname;  
76 -  
77 -  
78 -  
79 - private String lp;  
80 -  
81 - public Integer getId() {  
82 - return id;  
83 - }  
84 -  
85 - public void setId(Integer id) {  
86 - this.id = id;  
87 - }  
88 -  
89 - public Date getRq() {  
90 - return rq;  
91 - }  
92 -  
93 - public void setRq(Date rq) {  
94 - this.rq = rq;  
95 - }  
96 -  
97 - public String getXlbm() {  
98 - return xlbm;  
99 - }  
100 -  
101 - public void setXlbm(String xlbm) {  
102 - this.xlbm = xlbm;  
103 - }  
104 -  
105 - public String getSsgsdm() {  
106 - return ssgsdm;  
107 - }  
108 -  
109 - public void setSsgsdm(String ssgsdm) {  
110 - this.ssgsdm = ssgsdm;  
111 - }  
112 -  
113 - public String getFgsdm() {  
114 - return fgsdm;  
115 - }  
116 -  
117 - public void setFgsdm(String fgsdm) {  
118 - this.fgsdm = fgsdm;  
119 - }  
120 -  
121 - public String getNbbm() {  
122 - return nbbm;  
123 - }  
124 -  
125 - public void setNbbm(String nbbm) {  
126 - this.nbbm = nbbm;  
127 - }  
128 -  
129 - public String getJsy() {  
130 - return jsy;  
131 - }  
132 -  
133 - public void setJsy(String jsy) {  
134 - this.jsy = jsy;  
135 - }  
136 -  
137 - public Double getCzlc() {  
138 - return czlc;  
139 - }  
140 -  
141 - public void setCzlc(Double czlc) {  
142 - this.czlc = czlc;  
143 - }  
144 -  
145 - public Double getJzlc() {  
146 - return jzlc;  
147 - }  
148 -  
149 - public void setJzlc(Double jzlc) {  
150 - this.jzlc = jzlc;  
151 - }  
152 -  
153 - public Double getCzcd() {  
154 - return czcd;  
155 - }  
156 -  
157 - public void setCzcd(Double czcd) {  
158 - this.czcd = czcd;  
159 - }  
160 -  
161 - public Double getJzcd() {  
162 - return jzcd;  
163 - }  
164 -  
165 - public void setJzcd(Double jzcd) {  
166 - this.jzcd = jzcd;  
167 - }  
168 -  
169 - public Double getCdl() {  
170 - return cdl;  
171 - }  
172 -  
173 - public void setCdl(Double cdl) {  
174 - this.cdl = cdl;  
175 - }  
176 -  
177 - public int getSfkt() {  
178 - return sfkt;  
179 - }  
180 -  
181 - public void setSfkt(int sfkt) {  
182 - this.sfkt = sfkt;  
183 - }  
184 -  
185 - public String getJhsj() {  
186 - return jhsj;  
187 - }  
188 -  
189 - public void setJhsj(String jhsj) {  
190 - this.jhsj = jhsj;  
191 - }  
192 -  
193 - public Double getHd() {  
194 - return hd;  
195 - }  
196 -  
197 - public void setHd(Double hd) {  
198 - this.hd = hd;  
199 - }  
200 -  
201 - public Double getSh() {  
202 - return sh;  
203 - }  
204 -  
205 - public void setSh(Double sh) {  
206 - this.sh = sh;  
207 - }  
208 -  
209 - public String getShyy() {  
210 - return shyy;  
211 - }  
212 -  
213 - public void setShyy(String shyy) {  
214 - this.shyy = shyy;  
215 - }  
216 -  
217 - public Double getZlc() {  
218 - return zlc;  
219 - }  
220 -  
221 - public void setZlc(Double zlc) {  
222 - this.zlc = zlc;  
223 - }  
224 -  
225 - public int getYhlx() {  
226 - return yhlx;  
227 - }  
228 -  
229 - public void setYhlx(int yhlx) {  
230 - this.yhlx = yhlx;  
231 - }  
232 -  
233 - public Double getNs() {  
234 - return ns;  
235 - }  
236 -  
237 - public void setNs(Double ns) {  
238 - this.ns = ns;  
239 - }  
240 -  
241 - public Double getFyylc() {  
242 - return fyylc;  
243 - }  
244 -  
245 - public void setFyylc(Double fyylc) {  
246 - this.fyylc = fyylc;  
247 - }  
248 -  
249 - public Double getJhzlc() {  
250 - return jhzlc;  
251 - }  
252 -  
253 - public void setJhzlc(Double jhzlc) {  
254 - this.jhzlc = jhzlc;  
255 - }  
256 -  
257 - public Double getJhfyylc() {  
258 - return jhfyylc;  
259 - }  
260 -  
261 - public void setJhfyylc(Double jhfyylc) {  
262 - this.jhfyylc = jhfyylc;  
263 - }  
264 -  
265 - public int getJhzbc() {  
266 - return jhzbc;  
267 - }  
268 -  
269 - public void setJhzbc(int jhzbc) {  
270 - this.jhzbc = jhzbc;  
271 - }  
272 -  
273 - public int getJhbc() {  
274 - return jhbc;  
275 - }  
276 -  
277 - public void setJhbc(int jhbc) {  
278 - this.jhbc = jhbc;  
279 - }  
280 -  
281 - public int getSjzbc() {  
282 - return sjzbc;  
283 - }  
284 -  
285 - public void setSjzbc(int sjzbc) {  
286 - this.sjzbc = sjzbc;  
287 - }  
288 -  
289 - public int getSjbc() {  
290 - return sjbc;  
291 - }  
292 -  
293 - public void setSjbc(int sjbc) {  
294 - this.sjbc = sjbc;  
295 - }  
296 -  
297 - public String getEdituser() {  
298 - return edituser;  
299 - }  
300 -  
301 - public void setEdituser(String edituser) {  
302 - this.edituser = edituser;  
303 - }  
304 -  
305 - public Date getEdittime() {  
306 - return edittime;  
307 - }  
308 -  
309 - public void setEdittime(Date edittime) {  
310 - this.edittime = edittime;  
311 - }  
312 -  
313 - public Date getCreatetime() {  
314 - return createtime;  
315 - }  
316 -  
317 - public void setCreatetime(Date createtime) {  
318 - this.createtime = createtime;  
319 - }  
320 -  
321 - public int getNylx() {  
322 - return nylx;  
323 - }  
324 -  
325 - public void setNylx(int nylx) {  
326 - this.nylx = nylx;  
327 - }  
328 -  
329 - public int getJcsx() {  
330 - return jcsx;  
331 - }  
332 -  
333 - public void setJcsx(int jcsx) {  
334 - this.jcsx = jcsx;  
335 - }  
336 -  
337 - public String getBglyh() {  
338 - if(this.getZlc()==0){  
339 - return "0";  
340 - }else{  
341 - DecimalFormat df = new DecimalFormat("0.00");  
342 - return df.format(this.getHd()/this.getZlc()*100);  
343 - }  
344 - }  
345 -  
346 - public void setBglyh(String bglyh) {  
347 - this.bglyh = bglyh;  
348 - }  
349 -  
350 - public String getXlname() {  
351 - return BasicData.lineCode2NameMap.get(this.xlbm);  
352 - }  
353 -  
354 - public void setXlname(String xlname) {  
355 - this.xlname = xlname;  
356 - }  
357 -  
358 - public String getGsname() {  
359 - return BasicData.businessCodeNameMap.get(this.ssgsdm);  
360 - }  
361 -  
362 - public void setGsname(String gsname) {  
363 - this.gsname = gsname;  
364 - }  
365 -  
366 - public String getName() {  
367 - return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);  
368 - }  
369 -  
370 - public void setName(String name) {  
371 - this.name = name;  
372 - }  
373 -  
374 - public String getFgsname() {  
375 - return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);  
376 - }  
377 -  
378 - public void setFgsname(String fgsname) {  
379 - this.fgsname = fgsname;  
380 - }  
381 -  
382 - public Date getUpdatetime() {  
383 - return updatetime;  
384 - }  
385 -  
386 - public void setUpdatetime(Date updatetime) {  
387 - this.updatetime = updatetime;  
388 - }  
389 -  
390 - public String getLp() {  
391 - return lp;  
392 - }  
393 -  
394 - public void setLp(String lp) {  
395 - this.lp = lp;  
396 - }  
397 -  
398 - public String getJname() {  
399 - return jname;  
400 - }  
401 -  
402 - public void setJname(String jname) {  
403 - this.jname = jname;  
404 - }  
405 -  
406 -  
407 -  
408 -} 1 +package com.bsth.entity.oil;
  2 +
  3 +import java.text.DecimalFormat;
  4 +import java.util.Date;
  5 +
  6 +import javax.persistence.*;
  7 +
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import com.bsth.data.BasicData;
  11 +
  12 +@Entity
  13 +@Table(name = "bsth_c_dlb")
  14 +public class Dlb {
  15 + @Id
  16 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  17 + private Integer id;
  18 + @DateTimeFormat(pattern="yyyy-MM-dd")
  19 + private Date rq;
  20 + private String xlbm;
  21 + private String linename;
  22 + private String ssgsdm;
  23 + private String fgsdm;
  24 + private String nbbm;
  25 + private String jsy;
  26 + private Double czlc=0.0;
  27 + private Double jzlc=0.0;
  28 + //出站存电
  29 + private Double czcd=0.0;
  30 + //进站存电
  31 + private Double jzcd=0.0;
  32 + //充电量
  33 + private Double cdl;
  34 + private int sfkt;
  35 + private String jhsj;
  36 + //耗电
  37 + private Double hd=0.0;
  38 + private Double sh=0.0;
  39 + private String shyy;
  40 + private Double zlc=0.0;
  41 + private int yhlx;
  42 +
  43 + private Double ns=0.0;
  44 + private Double fyylc=0.0;
  45 + private Double jhzlc=0.0;
  46 + private Double jhfyylc=0.0;
  47 + private int jhzbc;
  48 + private int jhbc;
  49 + private int sjzbc;
  50 + private int sjbc;
  51 + private String edituser;
  52 + private Date edittime;
  53 + private Date createtime;
  54 + private Date updatetime;
  55 + private int nylx;
  56 + //进场顺序（根据最先出场和最后进场来关联车辆的存电量）
  57 + private int jcsx;
  58 +
  59 + private String jname;
  60 + @Transient
  61 + private String name;
  62 + @Transient
  63 + private String bglyh;
  64 +
  65 + @Transient
  66 + private String xlname;
  67 +
  68 + @Transient
  69 + private String gsname;
  70 +
  71 + @Transient
  72 + private String fgsname;
  73 +
  74 +
  75 +
  76 + private String lp;
  77 +
  78 + public Integer getId() {
  79 + return id;
  80 + }
  81 +
  82 + public void setId(Integer id) {
  83 + this.id = id;
  84 + }
  85 +
  86 + public Date getRq() {
  87 + return rq;
  88 + }
  89 +
  90 + public void setRq(Date rq) {
  91 + this.rq = rq;
  92 + }
  93 +
  94 + public String getXlbm() {
  95 + return xlbm;
  96 + }
  97 +
  98 + public void setXlbm(String xlbm) {
  99 + this.xlbm = xlbm;
  100 + }
  101 +
  102 + public String getLinename() {
  103 + return linename;
  104 + }
  105 +
  106 + public void setLinename(String linename) {
  107 + this.linename = linename;
  108 + }
  109 +
  110 + public String getSsgsdm() {
  111 + return ssgsdm;
  112 + }
  113 +
  114 + public void setSsgsdm(String ssgsdm) {
  115 + this.ssgsdm = ssgsdm;
  116 + }
  117 +
  118 + public String getFgsdm() {
  119 + return fgsdm;
  120 + }
  121 +
  122 + public void setFgsdm(String fgsdm) {
  123 + this.fgsdm = fgsdm;
  124 + }
  125 +
  126 + public String getNbbm() {
  127 + return nbbm;
  128 + }
  129 +
  130 + public void setNbbm(String nbbm) {
  131 + this.nbbm = nbbm;
  132 + }
  133 +
  134 + public String getJsy() {
  135 + return jsy;
  136 + }
  137 +
  138 + public void setJsy(String jsy) {
  139 + this.jsy = jsy;
  140 + }
  141 +
  142 + public Double getCzlc() {
  143 + return czlc;
  144 + }
  145 +
  146 + public void setCzlc(Double czlc) {
  147 + this.czlc = czlc;
  148 + }
  149 +
  150 + public Double getJzlc() {
  151 + return jzlc;
  152 + }
  153 +
  154 + public void setJzlc(Double jzlc) {
  155 + this.jzlc = jzlc;
  156 + }
  157 +
  158 + public Double getCzcd() {
  159 + return czcd;
  160 + }
  161 +
  162 + public void setCzcd(Double czcd) {
  163 + this.czcd = czcd;
  164 + }
  165 +
  166 + public Double getJzcd() {
  167 + return jzcd;
  168 + }
  169 +
  170 + public void setJzcd(Double jzcd) {
  171 + this.jzcd = jzcd;
  172 + }
  173 +
  174 + public Double getCdl() {
  175 + return cdl;
  176 + }
  177 +
  178 + public void setCdl(Double cdl) {
  179 + this.cdl = cdl;
  180 + }
  181 +
  182 + public int getSfkt() {
  183 + return sfkt;
  184 + }
  185 +
  186 + public void setSfkt(int sfkt) {
  187 + this.sfkt = sfkt;
  188 + }
  189 +
  190 + public String getJhsj() {
  191 + return jhsj;
  192 + }
  193 +
  194 + public void setJhsj(String jhsj) {
  195 + this.jhsj = jhsj;
  196 + }
  197 +
  198 + public Double getHd() {
  199 + return hd;
  200 + }
  201 +
  202 + public void setHd(Double hd) {
  203 + this.hd = hd;
  204 + }
  205 +
  206 + public Double getSh() {
  207 + return sh;
  208 + }
  209 +
  210 + public void setSh(Double sh) {
  211 + this.sh = sh;
  212 + }
  213 +
  214 + public String getShyy() {
  215 + return shyy;
  216 + }
  217 +
  218 + public void setShyy(String shyy) {
  219 + this.shyy = shyy;
  220 + }
  221 +
  222 + public Double getZlc() {
  223 + return zlc;
  224 + }
  225 +
  226 + public void setZlc(Double zlc) {
  227 + this.zlc = zlc;
  228 + }
  229 +
  230 + public int getYhlx() {
  231 + return yhlx;
  232 + }
  233 +
  234 + public void setYhlx(int yhlx) {
  235 + this.yhlx = yhlx;
  236 + }
  237 +
  238 + public Double getNs() {
  239 + return ns;
  240 + }
  241 +
  242 + public void setNs(Double ns) {
  243 + this.ns = ns;
  244 + }
  245 +
  246 + public Double getFyylc() {
  247 + return fyylc;
  248 + }
  249 +
  250 + public void setFyylc(Double fyylc) {
  251 + this.fyylc = fyylc;
  252 + }
  253 +
  254 + public Double getJhzlc() {
  255 + return jhzlc;
  256 + }
  257 +
  258 + public void setJhzlc(Double jhzlc) {
  259 + this.jhzlc = jhzlc;
  260 + }
  261 +
  262 + public Double getJhfyylc() {
  263 + return jhfyylc;
  264 + }
  265 +
  266 + public void setJhfyylc(Double jhfyylc) {
  267 + this.jhfyylc = jhfyylc;
  268 + }
  269 +
  270 + public int getJhzbc() {
  271 + return jhzbc;
  272 + }
  273 +
  274 + public void setJhzbc(int jhzbc) {
  275 + this.jhzbc = jhzbc;
  276 + }
  277 +
  278 + public int getJhbc() {
  279 + return jhbc;
  280 + }
  281 +
  282 + public void setJhbc(int jhbc) {
  283 + this.jhbc = jhbc;
  284 + }
  285 +
  286 + public int getSjzbc() {
  287 + return sjzbc;
  288 + }
  289 +
  290 + public void setSjzbc(int sjzbc) {
  291 + this.sjzbc = sjzbc;
  292 + }
  293 +
  294 + public int getSjbc() {
  295 + return sjbc;
  296 + }
  297 +
  298 + public void setSjbc(int sjbc) {
  299 + this.sjbc = sjbc;
  300 + }
  301 +
  302 + public String getEdituser() {
  303 + return edituser;
  304 + }
  305 +
  306 + public void setEdituser(String edituser) {
  307 + this.edituser = edituser;
  308 + }
  309 +
  310 + public Date getEdittime() {
  311 + return edittime;
  312 + }
  313 +
  314 + public void setEdittime(Date edittime) {
  315 + this.edittime = edittime;
  316 + }
  317 +
  318 + public Date getCreatetime() {
  319 + return createtime;
  320 + }
  321 +
  322 + public void setCreatetime(Date createtime) {
  323 + this.createtime = createtime;
  324 + }
  325 +
  326 + public int getNylx() {
  327 + return nylx;
  328 + }
  329 +
  330 + public void setNylx(int nylx) {
  331 + this.nylx = nylx;
  332 + }
  333 +
  334 + public int getJcsx() {
  335 + return jcsx;
  336 + }
  337 +
  338 + public void setJcsx(int jcsx) {
  339 + this.jcsx = jcsx;
  340 + }
  341 +
  342 + public String getBglyh() {
  343 + if(this.getZlc()==0){
  344 + return "0";
  345 + }else{
  346 + DecimalFormat df = new DecimalFormat("0.00");
  347 + return df.format(this.getHd()/this.getZlc()*100);
  348 + }
  349 + }
  350 +
  351 + public void setBglyh(String bglyh) {
  352 + this.bglyh = bglyh;
  353 + }
  354 +
  355 + public String getXlname() {
  356 + return BasicData.lineCodeAllNameMap.get(this.xlbm);
  357 + }
  358 +
  359 + public void setXlname(String xlname) {
  360 + this.xlname = xlname;
  361 + }
  362 +
  363 + public String getGsname() {
  364 + return BasicData.businessCodeNameMap.get(this.ssgsdm);
  365 + }
  366 +
  367 + public void setGsname(String gsname) {
  368 + this.gsname = gsname;
  369 + }
  370 +
  371 + public String getName() {
  372 + return BasicData.allPerson.get(this.ssgsdm+"-"+this.jsy);
  373 + }
  374 +
  375 + public void setName(String name) {
  376 + this.name = name;
  377 + }
  378 +
  379 + public String getFgsname() {
  380 + return BasicData.businessFgsCodeNameMap.get(this.fgsdm+"_"+this.ssgsdm);
  381 + }
  382 +
  383 + public void setFgsname(String fgsname) {
  384 + this.fgsname = fgsname;
  385 + }
  386 +
  387 + public Date getUpdatetime() {
  388 + return updatetime;
  389 + }
  390 +
  391 + public void setUpdatetime(Date updatetime) {
  392 + this.updatetime = updatetime;
  393 + }
  394 +
  395 + public String getLp() {
  396 + return lp;
  397 + }
  398 +
  399 + public void setLp(String lp) {
  400 + this.lp = lp;
  401 + }
  402 +
  403 + public String getJname() {
  404 + return jname;
  405 + }
  406 +
  407 + public void setJname(String jname) {
  408 + this.jname = jname;
  409 + }
  410 +
  411 +
  412 +
  413 +}
src/main/java/com/bsth/entity/oil/Jdl.java
  View file @2b57e3b
1 -package com.bsth.entity.oil;  
2 -  
3 -import java.util.Date;  
4 -  
5 -import javax.persistence.Entity;  
6 -import javax.persistence.GeneratedValue;  
7 -import javax.persistence.Id;  
8 -import javax.persistence.Table;  
9 -  
10 -import org.springframework.format.annotation.DateTimeFormat;  
11 -  
12 -@Entity  
13 -@Table(name = "bsth_c_jdl")  
14 -public class Jdl {  
15 - @Id  
16 - @GeneratedValue  
17 - private Integer id;  
18 - @DateTimeFormat(pattern="yyyy-MM-dd")  
19 - private Date rq;  
20 - private String gsBm;  
21 - private String gsName;  
22 - private String fgsBm;  
23 - private String fgsName;  
24 - private String nbbm;  
25 - private String jsy;  
26 - private Double jdl = 0.0;  
27 - private String jdz;  
28 - private String remarks;  
29 - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")  
30 - private Date createrDate;  
31 -  
32 -  
33 - public Integer getId() {  
34 - return id;  
35 - }  
36 - public void setId(Integer id) {  
37 - this.id = id;  
38 - }  
39 - public Date getRq() {  
40 - return rq;  
41 - }  
42 - public void setRq(Date rq) {  
43 - this.rq = rq;  
44 - }  
45 - public String getGsBm() {  
46 - return gsBm;  
47 - }  
48 - public void setGsBm(String gsBm) {  
49 - this.gsBm = gsBm;  
50 - }  
51 - public String getGsName() {  
52 - return gsName;  
53 - }  
54 - public void setGsName(String gsName) {  
55 - this.gsName = gsName;  
56 - }  
57 - public String getFgsBm() {  
58 - return fgsBm;  
59 - }  
60 - public void setFgsBm(String fgsBm) {  
61 - this.fgsBm = fgsBm;  
62 - }  
63 - public String getFgsName() {  
64 - return fgsName;  
65 - }  
66 - public void setFgsName(String fgsName) {  
67 - this.fgsName = fgsName;  
68 - }  
69 - public String getNbbm() {  
70 - return nbbm;  
71 - }  
72 - public void setNbbm(String nbbm) {  
73 - this.nbbm = nbbm;  
74 - }  
75 - public Double getJdl() {  
76 - return jdl;  
77 - }  
78 - public void setJdl(Double jdl) {  
79 - this.jdl = jdl;  
80 - }  
81 - public String getJdz() {  
82 - return jdz;  
83 - }  
84 - public void setJdz(String jdz) {  
85 - this.jdz = jdz;  
86 - }  
87 - public String getRemarks() {  
88 - return remarks;  
89 - }  
90 - public void setRemarks(String remarks) {  
91 - this.remarks = remarks;  
92 - }  
93 - public Date getCreaterDate() {  
94 - return createrDate;  
95 - }  
96 - public void setCreaterDate(Date createrDate) {  
97 - this.createrDate = createrDate;  
98 - }  
99 - public String getJsy() {  
100 - return jsy;  
101 - }  
102 - public void setJsy(String jsy) {  
103 - this.jsy = jsy;  
104 - }  
105 -  
106 -  
107 -  
108 -} 1 +package com.bsth.entity.oil;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.*;
  6 +
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +
  9 +@Entity
  10 +@Table(name = "bsth_c_jdl")
  11 +public class Jdl {
  12 + @Id
  13 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  14 + private Integer id;
  15 + @DateTimeFormat(pattern="yyyy-MM-dd")
  16 + private Date rq;
  17 + private String gsBm;
  18 + private String gsName;
  19 + private String fgsBm;
  20 + private String fgsName;
  21 + private String nbbm;
  22 + private String jsy;
  23 + private Double jdl = 0.0;
  24 + private String jdz;
  25 + private String remarks;
  26 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
  27 + private Date createrDate;
  28 +
  29 +
  30 + public Integer getId() {
  31 + return id;
  32 + }
  33 + public void setId(Integer id) {
  34 + this.id = id;
  35 + }
  36 + public Date getRq() {
  37 + return rq;
  38 + }
  39 + public void setRq(Date rq) {
  40 + this.rq = rq;
  41 + }
  42 + public String getGsBm() {
  43 + return gsBm;
  44 + }
  45 + public void setGsBm(String gsBm) {
  46 + this.gsBm = gsBm;
  47 + }
  48 + public String getGsName() {
  49 + return gsName;
  50 + }
  51 + public void setGsName(String gsName) {
  52 + this.gsName = gsName;
  53 + }
  54 + public String getFgsBm() {
  55 + return fgsBm;
  56 + }
  57 + public void setFgsBm(String fgsBm) {
  58 + this.fgsBm = fgsBm;
  59 + }
  60 + public String getFgsName() {
  61 + return fgsName;
  62 + }
  63 + public void setFgsName(String fgsName) {
  64 + this.fgsName = fgsName;
  65 + }
  66 + public String getNbbm() {
  67 + return nbbm;
  68 + }
  69 + public void setNbbm(String nbbm) {
  70 + this.nbbm = nbbm;
  71 + }
  72 + public Double getJdl() {
  73 + return jdl;
  74 + }
  75 + public void setJdl(Double jdl) {
  76 + this.jdl = jdl;
  77 + }
  78 + public String getJdz() {
  79 + return jdz;
  80 + }
  81 + public void setJdz(String jdz) {
  82 + this.jdz = jdz;
  83 + }
  84 + public String getRemarks() {
  85 + return remarks;
  86 + }
  87 + public void setRemarks(String remarks) {
  88 + this.remarks = remarks;
  89 + }
  90 + public Date getCreaterDate() {
  91 + return createrDate;
  92 + }
  93 + public void setCreaterDate(Date createrDate) {
  94 + this.createrDate = createrDate;
  95 + }
  96 + public String getJsy() {
  97 + return jsy;
  98 + }
  99 + public void setJsy(String jsy) {
  100 + this.jsy = jsy;
  101 + }
  102 +
  103 +
  104 +
  105 +}
src/main/java/com/bsth/entity/oil/Jql.java 0 → 100644
  View file @2b57e3b
  1 +package com.bsth.entity.oil;
  2 +
  3 +import java.util.Date;
  4 +
  5 +import javax.persistence.*;
  6 +
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +
  9 +@Entity
  10 +@Table(name = "bsth_c_jql")
  11 +public class Jql {
  12 + @Id
  13 + @GeneratedValue(strategy = GenerationType.IDENTITY)
  14 + private Integer id;
  15 + @DateTimeFormat(pattern="yyyy-MM-dd")
  16 + private Date rq;
  17 + private String gsBm;
  18 + private String gsName;
  19 + private String fgsBm;
  20 + private String fgsName;
  21 + private String nbbm;
  22 + private String jsy;
  23 + private Double jql = 0.0;
  24 + private String jqz;
  25 + private String remarks;
  26 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
  27 + private Date createrDate;
  28 +
  29 +
  30 + public Integer getId() {
  31 + return id;
  32 + }
  33 + public void setId(Integer id) {
  34 + this.id = id;
  35 + }
  36 + public Date getRq() {
  37 + return rq;
  38 + }
  39 + public void setRq(Date rq) {
  40 + this.rq = rq;
  41 + }
  42 + public String getGsBm() {
  43 + return gsBm;
  44 + }
  45 + public void setGsBm(String gsBm) {
  46 + this.gsBm = gsBm;
  47 + }
  48 + public String getGsName() {
  49 + return gsName;
  50 + }
  51 + public void setGsName(String gsName) {
  52 + this.gsName = gsName;
  53 + }
  54 + public String getFgsBm() {
  55 + return fgsBm;
  56 + }
  57 + public void setFgsBm(String fgsBm) {
  58 + this.fgsBm = fgsBm;
  59 + }
  60 + public String getFgsName() {
  61 + return fgsName;
  62 + }
  63 + public void setFgsName(String fgsName) {
  64 + this.fgsName = fgsName;
  65 + }
  66 + public String getNbbm() {
  67 + return nbbm;
  68 + }
  69 + public void setNbbm(String nbbm) {
  70 + this.nbbm = nbbm;
  71 + }
  72 + public Double getJql() {
  73 + return jql;
  74 + }
  75 + public void setJql(Double jql) {
  76 + this.jql = jql;
  77 + }
  78 + public String getJqz() {
  79 + return jqz;
  80 + }
  81 + public void setJqz(String jqz) {
  82 + this.jqz = jqz;
  83 + }
  84 + public String getRemarks() {
  85 + return remarks;
  86 + }
  87 + public void setRemarks(String remarks) {
  88 + this.remarks = remarks;
  89 + }
  90 + public Date getCreaterDate() {
  91 + return createrDate;
  92 + }
  93 + public void setCreaterDate(Date createrDate) {
  94 + this.createrDate = createrDate;
  95 + }
  96 + public String getJsy() {
  97 + return jsy;
  98 + }
  99 + public void setJsy(String jsy) {
  100 + this.jsy = jsy;
  101 + }
  102 +
  103 +
  104 +
  105 +}