From 4016e642df6add50e055696350b5ae0bb20059ca Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Sat, 25 Feb 2023 17:46:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/entity/ProjectJqmDev.java | 2 + .../com/zhgd/xmgl/task/JinqianmaoTask.java | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectJqmDev.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectJqmDev.java index ab6f21699..e21362b7f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectJqmDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectJqmDev.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.ToString; import lombok.experimental.Accessors; /** @@ -27,6 +28,7 @@ import lombok.experimental.Accessors; @TableName(value = "project_jqm_dev") @Accessors(chain = true) @ApiModel(value = "ProjectJqmDev实体类", description = "ProjectJqmDev") +@ToString public class ProjectJqmDev { /** * 金钱猫设备id diff --git a/src/main/java/com/zhgd/xmgl/task/JinqianmaoTask.java b/src/main/java/com/zhgd/xmgl/task/JinqianmaoTask.java index 759f761f6..7a4b519d1 100644 --- a/src/main/java/com/zhgd/xmgl/task/JinqianmaoTask.java +++ b/src/main/java/com/zhgd/xmgl/task/JinqianmaoTask.java @@ -94,41 +94,41 @@ public class JinqianmaoTask { } public void getProjectNameNumberMap() { - List companyConfigs = companyConfigMapper.selectList(new QueryWrapper<>()); - for (CompanyConfig companyConfig:companyConfigs){ - JSONObject jsonInfo = new JSONObject(); - jsonInfo.put("StartIndex", 0); - jsonInfo.put("Count", 10000); - HttpResponse httpResponse = HttpRequest.post(getUrl("getProjectList",companyConfig.getUrl(),companyConfig.getAk(),companyConfig.getSecret())) - .body(jsonInfo.toJSONString()) - .timeout(5 * 60 * 1000) - .execute(); - log.info("请求第三方接口getProjectList响应体：{}", httpResponse); - if (httpResponse.getStatus() == HttpStatus.HTTP_OK && httpResponse.body() != null) { - JSONObject projectListData = JSON.parseObject(httpResponse.body()); - JSONObject data = projectListData.getJSONObject("data"); - if (data != null) { - JSONArray projectList = data.getJSONArray("data"); - if (CollUtil.isNotEmpty(projectList)) { - List> nameIdList = new LinkedList<>(); - for (int i = 0; i < projectList.size(); i++) { - HashMap nameIdMap = new LinkedHashMap<>(2); - JSONObject project = projectList.getJSONObject(i); - nameIdMap.put("name", project.getString("prjName")); - nameIdMap.put("id", project.getString("proId")); - nameIdList.add(nameIdMap); + List companyConfigs = companyConfigMapper.selectList(new QueryWrapper<>()); + for (CompanyConfig companyConfig : companyConfigs) { + JSONObject jsonInfo = new JSONObject(); + jsonInfo.put("StartIndex", 0); + jsonInfo.put("Count", 10000); + String url = getUrl("getProjectList", companyConfig.getUrl(), companyConfig.getAk(), companyConfig.getSecret()); + String body = jsonInfo.toJSONString(); + log.info("getProjectNameNumberMap()调用http：getProjectList，url：{},body:{}", url, body); + HttpResponse httpResponse = HttpRequest.post(url).body(body).timeout(5 * 60 * 1000).execute(); + log.info("请求第三方接口getProjectList响应体：{}", httpResponse); + if (httpResponse.getStatus() == HttpStatus.HTTP_OK && httpResponse.body() != null) { + JSONObject projectListData = JSON.parseObject(httpResponse.body()); + JSONObject data = projectListData.getJSONObject("data"); + if (data != null) { + JSONArray projectList = data.getJSONArray("data"); + if (CollUtil.isNotEmpty(projectList)) { + List> nameIdList = new LinkedList<>(); + for (int i = 0; i < projectList.size(); i++) { + HashMap nameIdMap = new LinkedHashMap<>(2); + JSONObject project = projectList.getJSONObject(i); + nameIdMap.put("name", project.getString("prjName")); + nameIdMap.put("id", project.getString("proId")); + nameIdList.add(nameIdMap); + } + nameIdList.forEach(nameIdMap -> projectService.update(Wrappers.lambdaUpdate().set(Project::getProjectNumber, nameIdMap.get("id")).eq(Project::getProjectName, nameIdMap.get("name")))); + log.info("getProjectNameNumberMap()的nameIdList：{}", nameIdList); } - nameIdList.forEach(nameIdMap -> projectService.update(Wrappers.lambdaUpdate().set(Project::getProjectNumber, nameIdMap.get("id")).eq(Project::getProjectName, nameIdMap.get("name")))); } } } - } } public void saveJqmDev() { - List companyConfigs = companyConfigMapper.selectList(new QueryWrapper<>()); + List companyConfigs = companyConfigMapper.selectList(new QueryWrapper<>()); for (CompanyConfig companyConfig:companyConfigs){ - List projectList = projectService.list(Wrappers.lambdaQuery().isNotNull(Project::getProjectNumber)); JSONObject jsonInfo = new JSONObject(); jsonInfo.put("StartIndex", 0); @@ -136,21 +136,18 @@ public class JinqianmaoTask { for (Project project : projectList) { String projectNumber = project.getProjectNumber(); - jsonInfo.put("proId", projectNumber); String url = getUrl("getDevList", companyConfig.getUrl(), companyConfig.getAk(), companyConfig.getSecret()); - HttpResponse httpResponse = HttpRequest.post(url) - .body(jsonInfo.toJSONString()) - .timeout(5 * 60 * 1000) - .execute(); - log.info("saveJqmDev()的url：{}", url); - log.info("saveJqmDev()的body：{}", jsonInfo.toJSONString()); + String body = jsonInfo.toJSONString(); + log.info("saveJqmDev()调用http：url：{}；body：{}", url, body); + HttpResponse httpResponse = HttpRequest.post(url).body(body).timeout(5 * 60 * 1000).execute(); log.info("请求第三方接口getDevList响应体：{}", httpResponse); if (httpResponse.getStatus() == HttpStatus.HTTP_OK && httpResponse.body() != null) { JSONObject response = JSON.parseObject(httpResponse.body()); log.info("请求第三方接口getDevList响应体Data：{}", response.getJSONObject("data")); if (response.getJSONObject("data") != null) { JSONArray devList = response.getJSONObject("data").getJSONArray("data"); + log.debug("devList：{}", devList); if (CollUtil.isNotEmpty(devList)) { List projectJqmDevList = new LinkedList<>(); String date = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN); @@ -164,7 +161,7 @@ public class JinqianmaoTask { ProjectJqmDev projectJqmDev = projectJqmDevService.getOne(Wrappers.lambdaQuery(ProjectJqmDev.class) .eq(ProjectJqmDev::getDevSn, devId).eq(ProjectJqmDev::getProjectNumber, projectNumber)); - Integer curFloor = getCurFloor(projectNumber, devId,companyConfig.getUrl(),companyConfig.getAk(),companyConfig.getSecret()); + Integer curFloor = getCurFloor(projectNumber, devId, companyConfig.getUrl(), companyConfig.getAk(), companyConfig.getSecret()); if (projectJqmDev != null) { if (!Objects.equals(curFloor, projectJqmDev.getLastFloorCount())) { asyncCommon.sendMqAndApp("楼层变动通知", "设备：" + devName + "的楼层发生变动，请及时进行巡检！", "楼层变动通知", project.getProjectSn(), "/pages/projectEnd/projectIndex/projectIndex"); @@ -181,6 +178,7 @@ public class JinqianmaoTask { projectJqmDevList.add(new ProjectJqmDev(null, projectNumber, project.getProjectSn(), project.getProjectName(), devId, devName, devType, devStatus, curFloor, date, date)); } } + log.debug("saveBatch：projectJqmDevList:{}", projectJqmDevList); projectJqmDevService.saveBatch(projectJqmDevList); } } else {