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

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 src/main/java/org/springblade/modules/catalog/controller/catalogController.java

@@ -35,6 +35,8 @@

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
@@ -144,4 +146,46 @@
      return R.data(list);
   }


   /**
    * 总数
    * @param response
    * @return
    */
   @GetMapping("/selectCount")
   public R selectCount(HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      List<Map<String, Object>> lists = new ArrayList<>();
      List<Map<String, Object>> list1 = catalogService.selectCount();
         Map<String, Object> mapa = new HashMap<String, Object>();
         Map<String, Object> mape = new HashMap<String, Object>();
         Map<String, Object> maps = new HashMap<String, Object>();
         Map<String, Object> mapse = new HashMap<String, Object>();
         mapa.put("value",list1.get(0).get("counta"));
         mapa.put("backgroundColor","#FF0000");
         mapa.put("prefixText","警情总数");
         mapa.put("suffixText","条");
         mape.put("value",list1.get(1).get("counta"));
         mape.put("backgroundColor","#000000");
         mape.put("prefixText","设备总数");
         mape.put("suffixText","个");

         maps.put("value",list1.get(2).get("counta"));
         maps.put("backgroundColor","#6CDEFF");
         maps.put("prefixText","用户总数");
         maps.put("suffixText","个");

         mapse.put("value",list1.get(3).get("counta"));
         mapse.put("backgroundColor","#FF9900");
         mapse.put("prefixText","出警队伍总数");
         mapse.put("suffixText","队");
         lists.add(mapa);
         lists.add(mape);
         lists.add(maps);
         lists.add(mapse);
      return R.data(lists);
   }

}