文件后缀.mysql增添字段数据表名

yaowanxin

2 天以前 e0ba02eb14e31451293a93dafd285b279d9a7775

文件后缀.mysql增添字段数据表名

 cnas-device/src/main/java/com/ruoyi/device/dto/DataConfigDto.java

@@ -36,4 +36,12 @@

    @ApiModelProperty("设备ID")
    private Integer deviceId;
    //数据库用户名
    @ApiModelProperty("数据库用户名")
    private String dbUserName;
    //数据库密码
    @ApiModelProperty("数据库密码")
    private String dbPassword;
    @ApiModelProperty("数据库表")
    private String dbTable;
}

 cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java

@@ -31,4 +31,6 @@
    //数据库密码
    @ApiModelProperty(value = "数据库密码")
    private String dbPassword;
    @ApiModelProperty(value = "数据库表")
    private String dbTable;
}

 cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java

@@ -140,4 +140,6 @@
    //数据库密码
    @ApiModelProperty("数据库密码")
    private String dbPassword;
    @ApiModelProperty("数据库表")
    private String dbTable;
}

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java

@@ -241,6 +241,7 @@
            Device device1 = deviceMapper.selectById(device.getId());
            dto.setDbUserName(device1.getDbUserName());
            dto.setDbPassword(device1.getDbPassword());
            dto.setDbTable(device1.getDbTable());
            String ip = device.getIp();

            // 根据检验项获取config
@@ -254,7 +255,7 @@
                map.putAll(dataCollectBridge(list, device, dto.getEntrustCode()));

            } else {
                map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag(),dto.getDbUserName(),dto.getDbPassword()));
                map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag(),dto.getDbUserName(),dto.getDbPassword(),dto.getDbTable()));

            }
        }

 cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java

@@ -43,7 +43,7 @@
     * @param device
     * @return
     */
    public static Map<String, Object> dataAcquisitionEntrance(List<DataConfig> dataConfig, Device device, String entrustCode, String sampleCode, String ip, String cableTag, String dbUserName, String dbPassword) {
    public static Map<String, Object> dataAcquisitionEntrance(List<DataConfig> dataConfig, Device device, String entrustCode, String sampleCode, String ip, String cableTag, String dbUserName, String dbPassword,String dbTable) {
        // 判断是否是影像测量仪
        if (device.getManagementNumber().equals("JCZX-ZB-OP07001")) {
            if (device.getFileType().equals(".xlsx")) {
@@ -78,7 +78,8 @@
                "&mdbSampleCode=" + device.getSampleCode() +
                "&dbFileName=" + device.getDbFileName()+
                "&dbUserName=" + dbUserName +
                "&dbPassword=" + dbPassword;
                "&dbPassword=" + dbPassword +
                "&dbTable=" + dbTable;
        System.out.println("请求的 URL: " + http);
        String result = null;
        try {
@@ -136,8 +137,12 @@
                    }
                    break;
                case ".db":
                    map = analysisDb1(data, userMap, device);
//                    map = analysisDb(data, userMap, device);
//                    map = analysisDb1(data, userMap, device);
                    map = analysisDb(data, userMap, device);
                    break;
                case ".mysql":
//                    map = analysisDb1(data, userMap, device);
                    map = analysisDb(data, userMap, device);
                    break;
                case ".png":
                    map = readPngString(data, userMap, device);
@@ -205,15 +210,15 @@
                String refery = getRefer(v.get(config).getRefery());
                for (int i = 0; i < dataList.size(); i++) {
                    JSONObject jsonObject1 = JSON.parseObject(dataList.get(i).toString());
                    if (ObjectUtils.isNotEmpty(jsonObject1.get(refery))) {
                        numberOfDataEntries.addAndGet(1);
                        list.add(jsonObject1.get(refery));
                    }
//                    Object o = jsonObject1.get(refery);
//                    if (ObjectUtils.isNotEmpty(o)) {
//                    if (ObjectUtils.isNotEmpty(jsonObject1.get(refery))) {
//                        numberOfDataEntries.addAndGet(1);
//                        list.add(o);
//                        list.add(jsonObject1.get(refery));
//                    }
                    Object o = jsonObject1.get(refery);
                    if (ObjectUtils.isNotEmpty(o)) {
                        numberOfDataEntries.addAndGet(1);
                        list.add(o);
                    }
                }
            }
            // 拼接数采配置
@@ -261,7 +266,6 @@
            AtomicInteger numberOfDataEntries = new AtomicInteger();
            List<Object> list = new ArrayList<>();
            for (int config = 0; config < v.size(); config++) {
//                String refery = v.get(config).getRefery();
                String refery = getRefer(v.get(config).getRefery());
                for (int i = 0; i < dataList.size(); i++) {
                    JSONObject jsonObject1 = JSON.parseObject(dataList.get(i).toString());