blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -313,6 +313,7 @@ left join ( select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm where alarmType = '一键求助' group by DATE_FORMAT(alarmTime,'%Y-%m-%d') ) b on @@ -320,12 +321,31 @@ </select> <!-- <!–查询本日，本周，本月 主动报警的数量–>--> <!-- <select id="selectAlarmSum" resultType="java.util.HashMap">--> <!-- select sa.alarmType name,IFNULL(sb.count, 0) value from (select alarmType from sys_alarm GROUP BY alarmType) sa--> <!-- left join--> <!-- ( select alarmType,count(*) count from sys_alarm--> <!-- where 1=1--> <!-- <if test="conditionVo.status==0">--> <!-- and to_days(alarmTime) = to_days(now())--> <!-- </if>--> <!-- <if test="conditionVo.status==1">--> <!-- and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)--> <!-- </if>--> <!-- <if test="conditionVo.status==2">--> <!-- and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')--> <!-- </if>--> <!-- group by alarmType--> <!-- ) sb--> <!-- on--> <!-- sa.alarmType = sb.alarmType--> <!-- </select>--> <!--查询本日，本周，本月 主动报警的数量--> <select id="selectAlarmSum" resultType="java.util.HashMap"> select sa.alarmType name,IFNULL(sb.count, 0) value from (select alarmType from sys_alarm GROUP BY alarmType) sa left join ( select alarmType,count(*) count from sys_alarm where 1=1 select '一键求助' name,ifnull(count(*),0 ) value from sys_alarm where alarmType = '一键求助' <if test="conditionVo.status==0"> and to_days(alarmTime) = to_days(now()) </if> @@ -335,10 +355,19 @@ <if test="conditionVo.status==2"> and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m') </if> group by alarmType ) sb on sa.alarmType = sb.alarmType union all select '电话报警' name,ifnull(count(*),0 ) value from sys_alarm where alarmType = '电话报警' <if test="conditionVo.status==0"> and to_days(alarmTime) = to_days(now()) </if> <if test="conditionVo.status==1"> and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1) </if> <if test="conditionVo.status==2"> and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m') </if> </select> <select id="queryPolice" resultType="java.util.HashMap"> blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
@@ -45,7 +45,7 @@ <if test="animalHeatVo.status!=null"> and status=#{animalHeatVo.status} </if> ORDER BY create_time asc ORDER BY create_time desc </select> <!--查询本周每天的体温数据(按礼拜一开始计算)--> blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java
@@ -23,7 +23,9 @@ static BASE64Encoder encoder = new sun.misc.BASE64Encoder(); static BASE64Decoder decoder = new sun.misc.BASE64Decoder(); private static String PRE_URL = "software/minio/data/jfpt/animalHeat/"; private static String PRE_URL = "software/minio/data/jfpt/animalHeat"; private static String PRF_MINIO_URL = "jfpt/animalHeat"; /** * 二进制原始数据转换为图片 @@ -45,7 +47,7 @@ } ImageIO.write(bi1, "jpg", w2);//不管输出什么格式图片，此处不需改动 //返回图片路径 return PRE_URL+ StringPool.SLASH+ DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID() return PRF_MINIO_URL+ StringPool.SLASH+ DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID() +StringPool.DOT+ "jpg"; } catch (IOException e) { e.printStackTrace(); blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -44,7 +44,6 @@ if (null!=conditionVo.getStatus()) { //获取数据 List<Object> objectList = getParcelData(conditionVo,PARCEL_CONTRABAND_URL,PARCEL_KEY,PARCEL_SECRET); System.out.println("objectList = " + objectList); Map<String,String> mapCode = new HashMap<>(); //遍历集合，存储所有的违禁包裹编码 for (Object object : objectList) { @@ -53,6 +52,7 @@ //将所有的违禁包裹编码存起来 mapCode.put(objectMap.get("objCode").toString(),objectMap.get("objCode").toString()); } System.out.println("mapCode = " + mapCode); //遍历违禁编码map数据 List<Map<String,Object>> list = new ArrayList<>(); for (String value:mapCode.values()) { @@ -139,6 +139,7 @@ //12.封装数据 list.add(listTime); list.add(parcelList); list.add(getKindServenDataList()); //13.返回 return list; } @@ -189,6 +190,7 @@ String params = HttpClientUtils.httpPost(url, key, secret, map); //5.数据转换 Map<String, Object> data = (Map<String, Object>) JSONObject.parse(params); //System.out.println("data = " + data); return JSON.parseArray(data.get("result").toString()); } @@ -229,12 +231,21 @@ */ @Override public Map<String, Object> selectParcelData() { HashMap<String, Object> map = new HashMap<>(); map.put("parcelData",getKindServenDataList()); return map; } /** * 获取危险违禁品7天内每天的数量集合 * @return */ public List<Integer> getKindServenDataList(){ ConditionVo conditionVo = new ConditionVo(); conditionVo.setStatus(1);//近7天status 为 1 //获取数据 List<Object> objectList = getParcelData(conditionVo,PARCEL_CONTRABAND_URL,PARCEL_KEY,PARCEL_SECRET); //遍历违禁编码map数据 HashMap<String, Object> map = new HashMap<>(); List<String> times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date())); List<Integer> list = new ArrayList<>(); for (String time:times) { @@ -244,14 +255,22 @@ Map<String, Object> objectMap = (Map<String, Object>) object;//取出list里面的值转为map //对比时间和objCode,危险品，刀具，枪支等 if (time.equals(objectMap.get("dateStr").toString()) ){ //枪支 if (objectMap.get("objCode").toString().equals("gan")) { count += Integer.parseInt(objectMap.get("objCount").toString()); } //刀具 if (objectMap.get("objCode").toString().equals("knife")) { count += Integer.parseInt(objectMap.get("objCount").toString()); } //爆炸物 if (objectMap.get("objCode").toString().equals("boomExplosive")) { count += Integer.parseInt(objectMap.get("objCount").toString()); } } } list.add(count); } map.put("parcelData",list); return map; return list; } } blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml
@@ -115,7 +115,7 @@ <!--查询业主总数--> <select id="selectSuserCount" resultType="java.lang.Integer"> select count(*) from sys_suser select count(*) from sys_suser where is_delete=0 </select> </mapper> blade-service/blade-jfpts/src/main/resources/application.properties
@@ -10,7 +10,12 @@ #²éѯijÆÚ¼äµÄÎ¥½ûÎïƷͳ¼Æ URL #PARCEL_CONTRABAND_URL=http://113.105.119.25:90/backstage-temporary-api/machineStat/queryMachineDayContrabandStat PARCEL_CONTRABAND_URL=http://fengkong.sf-express.com/backstage-temporary-api/machineStat/queryMachineDayContrabandStat #Î¥½ûƷС·ÖÀà PARCEL_CONTRABAND_URL=http://fengkong.sf-express.com/backstage-temporary-api/machineStat/queryMachineDayContrabandStatByObjCode #Î¥½ûÆ·´ó·ÖÀà PARCEL_CONTRABAND_URL_BIG=http://fengkong.sf-express.com/backstage-temporary-api/machineStat/queryMachineDayContrabandStatByObjTypeCode #²éѯijÆÚ¼äµÄ°ü¹üͳ¼Æ URL #PARCEL_URL=http://113.105.119.25:90/backstage-temporary-api/machineStat/queryMachineDayStat PARCEL_URL=http://fengkong.sf-express.com/backstage-temporary-api/machineStat/queryMachineDayStat
