Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

tangzy

2021-03-12 dd202fbaa4caea48aa5a0df620b87a6e41dba429

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java

@@ -54,4 +54,9 @@

    List<Map<String, Object>> selectScount(String time);

    /**
     * 查询警情总数
     * @return
     */
    Integer selectAlarmCount();
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml

@@ -261,6 +261,17 @@


    <update id="updateJtype">
    update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
</update>
        update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
    </update>

    <!--查询当天警情总数-->
    <select id="selectAlarmCount" resultType="java.lang.Integer">
        SELECT count(*) FROM `sys_alarm`
            where
        waringType != '系统测试'
            and
        waringType!='主机重新上电'
            and
        to_days(alarmTime) = to_days(curdate())
    </select>
</mapper>

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java

@@ -107,10 +107,6 @@
     */
    @Override
    public Integer selectAlarmCount(Integer status) {
        QueryWrapper<Alarm> wrapper = new QueryWrapper<>();
        if (status==0){
            wrapper.eq("alarmTime",new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
        }
        return baseMapper.selectCount(wrapper);
        return baseMapper.selectAlarmCount();
    }
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java

@@ -247,24 +247,24 @@
        //1.警情总数
        mapa.put("value",alarmCount);
        mapa.put("backgroundColor","#F56C6C");
        mapa.put("prefixText","警情总数");
        mapa.put("prefixText","今日警情总数");
        mapa.put("suffixText","条");

        //2.包裹总数
        mape.put("value",parcelCount.get(0));
        mape.put("backgroundColor","#67C23A");
        mape.put("prefixText","包裹总数");
        mape.put("prefixText","今日违禁包裹总数");
        mape.put("suffixText","个");

        //3.违禁品总数
        maps.put("value",parcelCount.get(1));
        maps.put("backgroundColor","#409EFF");
        maps.put("prefixText","违禁品总数");
        maps.put("backgroundColor","#E6A23C");
        maps.put("prefixText","今日违禁物品总数");
        maps.put("suffixText","个");

        //4.在线设备总数
        mapse.put("value",equipmentCount);
        mapse.put("backgroundColor","#E6A23C");
        mapse.put("backgroundColor","#409EFF");
        mapse.put("prefixText","在线设备总数");
        mapse.put("suffixText","个");
        //数据存入集合

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java

@@ -199,19 +199,19 @@
        //获取包裹数据
        List<Object> parcelData = getParcelData(conditionVo, PARCEL_URL, PARCEL_KEY, PARCEL_SECRET);
        //查询当天的包裹总数
        Integer checkCount = null;
        Integer dangerCount = null;
        Integer contrabandCount = null;
        if (status == 0) {
            for (Object object : parcelData) {
                //取出list里面的值转为map
                Map<String, Object> objectMap = (Map<String, Object>) object;
                checkCount = Integer.parseInt(objectMap.get("checkCount").toString()); //安检包裹数量
                dangerCount = Integer.parseInt(objectMap.get("dangerCount").toString()); //违禁包裹数量
                contrabandCount = Integer.parseInt(objectMap.get("contrabandCount").toString()); //违禁物品数量
            }
        }
        //封装数据
        list.add(checkCount);
        list.add(dangerCount);
        list.add(contrabandCount);
        //返回数据
        return list;
    }