南昌市物联网技防平台-后台
Administrator
2021-03-24 047218d6c0fa2b069cb21424323b1b64a4d5ba44
违禁品明细接口修改,体温监测图片路径修改
4 files modified
76 ■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java 13 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java 4 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java 54 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/resources/application.properties 5 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java
@@ -25,7 +25,7 @@
    private static String PRE_URL = "software/minio/data/jfpt/animalHeat";
    private static String PRF_MINIO_URL = "jfpt/animalHeat";
    private static String PRF_MINIO_URL = "minio/jfpt/animalHeat";
    /**
     * 二进制原始数据转换为图片
@@ -36,8 +36,9 @@
            byte[] bytes1 = decoder.decodeBuffer(base64String);
            ByteArrayInputStream bais = new ByteArrayInputStream(bytes1);
            BufferedImage bi1 = ImageIO.read(bais);
            File w2 = new File("D://"+PRE_URL+StringPool.SLASH+ DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID()
                +".jpg");//可以是jpg,png,gif格式
            String UUID = DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID();
            //可以是jpg,png,gif格式
            File w2 = new File("D://"+PRE_URL+StringPool.SLASH+ UUID+".jpg");
            //判断父文件夹存在与否
            File parentFile = w2.getParentFile();
            System.out.println("parentFile = " + parentFile);
@@ -45,10 +46,10 @@
                //如果不存在,则创建
                parentFile.mkdirs();
            }
            ImageIO.write(bi1, "jpg", w2);//不管输出什么格式图片,此处不需改动
            //不管输出什么格式图片,此处不需改动
            ImageIO.write(bi1, "jpg", w2);
            //返回图片路径
            return PRF_MINIO_URL+ StringPool.SLASH+ DateUtil.today()+StringPool.SLASH+ StringUtil.randomUUID()
                +StringPool.DOT+ "jpg";
            return PRF_MINIO_URL+ StringPool.SLASH+ UUID +StringPool.DOT+ "jpg";
        } catch (IOException e) {
            e.printStackTrace();
        }
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/service/impl/HealthcodeServiceImpl.java
@@ -75,10 +75,6 @@
     */
    @Override
    public IPage<Healthcode> selectHealthcodeListPage(IPage<Healthcode> page, HealthcodeVO healthcodeVO) {
        //判断城市
        if(null != healthcodeVO.getProvince()){
            //根据拿到的省id 查询出城市名称
        }
        return page.setRecords(baseMapper.selectHealthcodeListPage(page,healthcodeVO));
    }
}
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -41,6 +41,9 @@
    @Value("${PARCEL_DETAIL_RUL}")
    private String PARCEL_DETAIL_RUL;
    @Value("${PARCEL_KIND_URL}")
    private String PARCEL_KIND_URL;
    /**
@@ -337,53 +340,10 @@
     */
    @Override
    public Object getParcelkindDetailPage(ConditionVo conditionVo) {
        conditionVo.setDecisioDiagramResult("contraband");
        Map<Object, Object> map = new HashMap<>();
        List<Object> list = new ArrayList<>();
        //获取违禁包裹数据
        Map<String,Object> result = (Map<String,Object>)getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
        //获取违禁品数据
        String result = getParcelDataPageList(conditionVo, PARCEL_KIND_URL, PARCEL_KEY, PARCEL_SECRET).get("result").toString();
        if (null!=result) {
            //获取总违禁包裹数量
            Integer totalSize = Integer.parseInt(result.get("totalSize").toString());
            int total = totalSize/conditionVo.getCurrentPage() +1 ;
            for (int i = 0;i<total;i++){
                conditionVo.setCurrentPage(i+1);
                //获取违禁包裹数据
                Map<String,Object> resultData = (Map<String,Object>)getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
                //提取违禁品数据
                List<Object> dataList = JSON.parseArray(resultData.get("data").toString());
                for (Object data : dataList) {
                    //取出list里面的值转为map
                    Map<String, Object> objectMap = (Map<String, Object>) data;
                    //获取违禁包裹名称,包裹Id,包裹图片,过机时间
                    String checkMachineName = objectMap.get("checkMachineName").toString();
                    String packageId = objectMap.get("packageId").toString();
                    String imgUrl = objectMap.get("imgUrl").toString();
                    String samplingTime = objectMap.get("samplingTime").toString();
                    //获取违禁品集合数据
                    List<Object> detailVoList = JSON.parseArray(objectMap.get("coordsDetailVoList").toString());
                    //遍历违禁品集合数据
                    for (Object detailVo : detailVoList) {
                        //封装违禁包裹信息
                        Map<String, Object> detailVoMap = (Map<String, Object>) detailVo;
                        detailVoMap.put("checkMachineName", checkMachineName);
                        detailVoMap.put("packageId", packageId);
                        detailVoMap.put("imgUrl", imgUrl);
                        detailVoMap.put("samplingTime", samplingTime);
                        list.add(detailVoMap);
                    }
                }
            }
            //对组装好的违禁品集合数据排序,按时间
            //分页
            List<Object> listPaging = PageList.getListPaging(list, conditionVo.getCurrentPage(), conditionVo.getPageSize());
            //封装数据
            map.put("totalSize", list.size());
            map.put("data", listPaging);
            map.put("currentPage", conditionVo.getCurrentPage());
            map.put("pageSize", conditionVo.getPageSize());
            //返回数据
            return map;
            return JSONObject.parse(result);
        }
        return null;
    }
@@ -416,7 +376,7 @@
            map.put("pageSize", conditionVo.getPageSize());
        }
        //3.远程调用api 获取数据
        String params = HttpClientUtils.httpPost(PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET, map);
        String params = HttpClientUtils.httpPost(url, key, secret, map);
        Map<String,Object> paramsMap = (Map<String, Object>) JSONObject.parse(params);
        if (paramsMap.get("succ").toString().equals("ok")){
            //4返回数据
blade-service/blade-jfpts/src/main/resources/application.properties
@@ -1,5 +1,5 @@
#ͼƬ±£´æµ½´ÅÅÌ·¾¶
picture.addUrl= http://36.134.81.48:9000/
picture.addUrl= https://web.byisf.com/
picture.pre= software/minio/data/jfpt/animalHeat/
@@ -25,3 +25,6 @@
#°²¼ì°ü¹üͼƬ½Ó¿ÚURL
PARCEL_PICTURE_URL=http://fengkong.sf-express.com/backstage-temporary-api/machineStat/showImg
#Î¥½ûÆ·Ã÷ϸ½Ó¿ÚURL
PARCEL_KIND_URL=http://fengkong.sf-express.com/backstage-temporary-api/machineStat/queryContrabandDetailList