jfpt-BladeX.git

			@@ -275,7 +275,7 @@
			SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
			String time = df.format(new Date());// new Date()为获取当前系统时间
			ArrayList<String> strings = pastDay(time);
			String[] str={"医疗求助","火警","紧急求救","盗警","普通报警","交通","中心调度","系统测试"};
			String[] str={"医疗求助","火警","紧急求救","盗警","普通报警","交通","中心调度","系统测试","电话报警"};
			Map<String, Object> maps = new HashMap<String, Object>();
			for (int j=0;j<strings.size();j++){
			Map<String, Object> map = new HashMap<String, Object>();
			@@ -306,8 +306,11 @@
			case "中心调度" :
			map.put("中心调度",list.get(i).get("cou"));
			break;
			case "电话报警" :
			map.put("电话报警",list.get(i).get("cou"));
			break;
			default :
			map.put("系统测试",list.get(i).get("cou"));
			map.put("未知",list.get(i).get("cou"));
			}
			}
			lists.add(map);

			@@ -121,7 +121,9 @@
			@ApiOperation(value = "新增或修改", notes = "传入jingdan")
			public R submit(@Valid @RequestBody Jingdan jingdan) {
			//return R.status(jingdanService.saveOrUpdate(jingdan));

			if ("".equals(jingdan.getType())){
			jingdan.setType("0");
			}
			if (jingdan.getCzTime() != null && jingdan.getCzTime().equals("")){
			jingdan.setCzTime(null);
			}

	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java	7 ●●●●● patch \| view \| raw \| blame \| history
	blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/controller/JingdanController.java	4 ●●●●● patch \| view \| raw \| blame \| history