Commit 16e4fc2a878af2b21d8d5e0df4931108ed00d239
1 parent
61f9ea50
接口修正
Showing
1 changed file
with
8 additions
and
8 deletions
src/main/java/com/bsth/server_rs/bigdata/BigdateService.java
| @@ -169,11 +169,11 @@ public class BigdateService { | @@ -169,11 +169,11 @@ public class BigdateService { | ||
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | @GET | 171 | @GET |
| 172 | - @Path("/line/level/{levle}") | ||
| 173 | - public List<Map<String, Object>> findLineByLevle(@PathParam("levle") String levle) { | 172 | + @Path("/line/level/{level}") |
| 173 | + public List<Map<String, Object>> findLineByLevle(@PathParam("level") String level) { | ||
| 174 | String sql="SELECT company,line_code,name,level,shanghai_linecode, nature from bsth_c_line where " | 174 | String sql="SELECT company,line_code,name,level,shanghai_linecode, nature from bsth_c_line where " |
| 175 | + " shanghai_linecode is not null and shanghai_linecode !='' and destroy=0 and remove=0 " | 175 | + " shanghai_linecode is not null and shanghai_linecode !='' and destroy=0 and remove=0 " |
| 176 | - + " and levle = '"+levle+"'"; | 176 | + + " and level = '"+level+"'"; |
| 177 | List<Map<String, Object>> list=jdbcTemplate.query(sql, | 177 | List<Map<String, Object>> list=jdbcTemplate.query(sql, |
| 178 | new RowMapper<Map<String, Object>>(){ | 178 | new RowMapper<Map<String, Object>>(){ |
| 179 | @Override | 179 | @Override |
| @@ -285,7 +285,7 @@ public class BigdateService { | @@ -285,7 +285,7 @@ public class BigdateService { | ||
| 285 | if(type.equals("actual")){ | 285 | if(type.equals("actual")){ |
| 286 | sql="select t.gsdm,t.xl,t.xl_name,t.jhbc as jhbc,t.jhssgfbcs as gfbcs," | 286 | sql="select t.gsdm,t.xl,t.xl_name,t.jhbc as jhbc,t.jhssgfbcs as gfbcs," |
| 287 | + " t.jhssdgbcs as dgbcs, t.sjbc,t.sjgfbcs,t.sjdgbcs from bsth_c_calc_count t" | 287 | + " t.jhssdgbcs as dgbcs, t.sjbc,t.sjgfbcs,t.sjdgbcs from bsth_c_calc_count t" |
| 288 | - + " t where t.date='"+date+"'"; | 288 | + + " where t.date='"+date+"'"; |
| 289 | } | 289 | } |
| 290 | List<Map<String, Object>> list=jdbcTemplate.query(sql, | 290 | List<Map<String, Object>> list=jdbcTemplate.query(sql, |
| 291 | new RowMapper<Map<String, Object>>(){ | 291 | new RowMapper<Map<String, Object>>(){ |
| @@ -322,7 +322,7 @@ public class BigdateService { | @@ -322,7 +322,7 @@ public class BigdateService { | ||
| 322 | if(type.equals("actual")){ | 322 | if(type.equals("actual")){ |
| 323 | sql="select t.gsdm,t.xl,t.xl_name,t.jhbc as jhbc,t.jhssgfbcs as gfbcs," | 323 | sql="select t.gsdm,t.xl,t.xl_name,t.jhbc as jhbc,t.jhssgfbcs as gfbcs," |
| 324 | + " t.jhssdgbcs as dgbcs,t.sjbc,t.sjgfbcs,t.sjdgbcs from bsth_c_calc_count t" | 324 | + " t.jhssdgbcs as dgbcs,t.sjbc,t.sjgfbcs,t.sjdgbcs from bsth_c_calc_count t" |
| 325 | - + " t where t.date='"+date+"' and xl='"+line+"'"; | 325 | + + " where t.date='"+date+"' and xl='"+line+"'"; |
| 326 | } | 326 | } |
| 327 | List<Map<String, Object>> list=jdbcTemplate.query(sql, | 327 | List<Map<String, Object>> list=jdbcTemplate.query(sql, |
| 328 | new RowMapper<Map<String, Object>>(){ | 328 | new RowMapper<Map<String, Object>>(){ |
| @@ -366,7 +366,7 @@ public class BigdateService { | @@ -366,7 +366,7 @@ public class BigdateService { | ||
| 366 | if(type.equals("actual")){ | 366 | if(type.equals("actual")){ |
| 367 | sql="select t.gsdm,t.xl,t.xl_name,t.jhzgl as jhzlc,t.jhyylc as jhyylc," | 367 | sql="select t.gsdm,t.xl,t.xl_name,t.jhzgl as jhzlc,t.jhyylc as jhyylc," |
| 368 | + " t.jhkslc as jhkslc,t.sjzgl as sjzlc,t.sjyylc,t.sjkslc from bsth_c_calc_count t" | 368 | + " t.jhkslc as jhkslc,t.sjzgl as sjzlc,t.sjyylc,t.sjkslc from bsth_c_calc_count t" |
| 369 | - + " t where t.date='"+date+"'"; | 369 | + + " where t.date='"+date+"'"; |
| 370 | } | 370 | } |
| 371 | List<Map<String, Object>> list=jdbcTemplate.query(sql, | 371 | List<Map<String, Object>> list=jdbcTemplate.query(sql, |
| 372 | new RowMapper<Map<String, Object>>(){ | 372 | new RowMapper<Map<String, Object>>(){ |
| @@ -397,7 +397,7 @@ public class BigdateService { | @@ -397,7 +397,7 @@ public class BigdateService { | ||
| 397 | 397 | ||
| 398 | 398 | ||
| 399 | @GET | 399 | @GET |
| 400 | - @Path("/lineLc/date/{type}/{date}/line/{line}") | 400 | + @Path("/lineLc/{type}/date/{date}/line/{line}") |
| 401 | public List<Map<String, Object>> findLineLcByDateLine(@PathParam("type") String type, | 401 | public List<Map<String, Object>> findLineLcByDateLine(@PathParam("type") String type, |
| 402 | @PathParam("date") String date,@PathParam("line") String line) { | 402 | @PathParam("date") String date,@PathParam("line") String line) { |
| 403 | String sql=""; | 403 | String sql=""; |
| @@ -409,7 +409,7 @@ public class BigdateService { | @@ -409,7 +409,7 @@ public class BigdateService { | ||
| 409 | if(type.equals("actual")){ | 409 | if(type.equals("actual")){ |
| 410 | sql="select t.gsdm,t.xl,t.xl_name,t.jhzgl as jhzlc,t.jhyylc as jhyylc," | 410 | sql="select t.gsdm,t.xl,t.xl_name,t.jhzgl as jhzlc,t.jhyylc as jhyylc," |
| 411 | + " t.jhkslc as jhkslc,t.sjzgl as sjzlc,t.sjyylc,t.sjkslc from bsth_c_calc_count t" | 411 | + " t.jhkslc as jhkslc,t.sjzgl as sjzlc,t.sjyylc,t.sjkslc from bsth_c_calc_count t" |
| 412 | - + " t where t.date='"+date+"' and xl ='"+line+"'"; | 412 | + + " where t.date='"+date+"' and xl ='"+line+"'"; |
| 413 | } | 413 | } |
| 414 | List<Map<String, Object>> list=jdbcTemplate.query(sql, | 414 | List<Map<String, Object>> list=jdbcTemplate.query(sql, |
| 415 | new RowMapper<Map<String, Object>>(){ | 415 | new RowMapper<Map<String, Object>>(){ |