潘钊 / control_service_data_Interface · Commits

Commit 9538d7178dd49adbb6052f718fadbcb9b7d6814b

Authored by 娄高锋
1 parent e20f1eb7
build: skipped

直属公司统计指标接口添加日期查询条件

Inline Side-by-side
Showing 1 changed file with 25 additions and 22 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @9538d71
... ... @@ -763,6 +763,7 @@ public class BigscreenService {
763 763 return JSON.parseObject(JSON.toJSONString(resMap));
764 764 }
765 765  
  766 + /** 按月份查询统计指标 */
766 767 @GET
767 768 @Path("/selectData/getMonthly/{month}")
768 769 public JSONObject getMonthly(@PathParam("month") String month){
... ... @@ -896,6 +897,8 @@ public class BigscreenService {
896 897 }
897 898 }
898 899  
  900 + resMap.put("date", month);
  901 +
899 902 resMap.put("jhzgl", df.format(jhzgl));
900 903 resMap.put("sjzgl", df.format(sjzgl));
901 904 resMap.put("jhcc", jhcc);
... ... @@ -925,13 +928,13 @@ public class BigscreenService {
925 928 return JSON.parseObject(JSON.toJSONString(resMap));
926 929 }
927 930  
  931 + /** 按日期查询四家直属公司统计指标 */
928 932 @GET
929   - @Path("/selectData/getCompanyData")
930   - public List<Map<String, Object>> getCompanyData(){
  933 + @Path("/selectData/getCompanyData/{date}")
  934 + public List<Map<String, Object>> getCompanyData(@PathParam("date") String date){
931 935 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
932 936  
933   - String date = sd.format(new Date());
934   - String date2 = sd.format(new Date(new Date().getTime() - 1l*1000*60*60*24));
  937 +// String date = sd.format(new Date());
935 938  
936 939 String gpLineSql = "select * from bsth_c_line_plate";
937 940 List<Map<String, Object>> gpLineList=jdbcTemplate.query(gpLineSql,
... ... @@ -997,7 +1000,7 @@ public class BigscreenService {
997 1000 + " jhsmbcs,sjsmbczds,smbczdl,jhsmbcsz,sjsmbczdsz,smbczdlz,"
998 1001 + " jhszfcs,sjszfczds,szfczdl,jhzgl,sjzgl,create_date"
999 1002 + " from bsth_c_calc_count "
1000   - + " where date >= '"+date2+"' and date <= '"+date+"'";
  1003 + + " where date = '"+date+"'";
1001 1004  
1002 1005 List<Map<String, Object>> list=jdbcTemplate.query(sql,
1003 1006 new RowMapper<Map<String, Object>>(){
... ... @@ -1078,28 +1081,27 @@ public class BigscreenService {
1078 1081 if(yyLine.contains(t.get("lineCode").toString())){
1079 1082 if(sortMap.get(t.get("gs")) != null){
1080 1083 Map<String, Object> m = resList.get(sortMap.get(t.get("gs")));
1081   - if(date.equals(t.get("date").toString())){
1082   - mapPut(m, "jhcc", t.get("jhccz").toString());
1083   - mapPut(m, "sjcc", t.get("sjcc").toString());
1084   - mapPut(m, "jhbc", t.get("jhbc").toString());
1085   - mapPut(m, "sjbc", t.get("sjbc").toString());
1086   - mapPut(m, "jhsmbc", t.get("jhsmbcs").toString());
1087   - mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
1088   - mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
1089   - mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
1090   - if(gpSet.contains(t.get("lineCode").toString())){
1091   - mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
1092   - mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
1093   - }
1094   - } else {
1095   - mapPut(m, "jhzgl", t.get("jhzgl").toString());
1096   - mapPut(m, "sjzgl", t.get("sjzgl").toString());
1097   - }
  1084 + mapPut(m, "jhcc", t.get("jhccz").toString());
  1085 + mapPut(m, "sjcc", t.get("sjcc").toString());
  1086 + mapPut(m, "jhbc", t.get("jhbc").toString());
  1087 + mapPut(m, "sjbc", t.get("sjbc").toString());
  1088 + mapPut(m, "jhsmbc", t.get("jhsmbcs").toString());
  1089 + mapPut(m, "sjsmbc", t.get("sjsmbczds").toString());
  1090 + mapPut(m, "jhqqbc", t.get("jhszfcs").toString());
  1091 + mapPut(m, "sjqqzd", t.get("sjszfczds").toString());
  1092 + if(gpSet.contains(t.get("lineCode").toString())){
  1093 + mapPut(m, "jhgpqqbc", t.get("jhszfcs").toString());
  1094 + mapPut(m, "sjgpqqzd", t.get("sjszfczds").toString());
  1095 + }
  1096 + mapPut(m, "jhzgl", t.get("jhzgl").toString());
  1097 + mapPut(m, "sjzgl", t.get("sjzgl").toString());
1098 1098 }
1099 1099 }
1100 1100 }
1101 1101  
1102 1102 for(Map<String, Object> m : resList){
  1103 + m.put("date", date);
  1104 +
1103 1105 m.put("glzxl", new BigDecimal(m.get("jhzgl").toString()).doubleValue()>0?
1104 1106 new BigDecimal(m.get("sjzgl").toString()).divide(new BigDecimal(m.get("jhzgl").toString()),
1105 1107 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
... ... @@ -1123,6 +1125,7 @@ public class BigscreenService {
1123 1125 return resList;
1124 1126 }
1125 1127  
  1128 + /** 报备登记查询接口 */
1126 1129 @GET
1127 1130 @Path("/selectData/getReport")
1128 1131 public List<Map<String, Object>> getReport(){
... ...