From 5445eefe09eb84151e468ce6cc73bbe350d65a16 Mon Sep 17 00:00:00 2001 From: chenxiwang <1520264117@qq.com> Date: Tue, 23 Jul 2024 10:10:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A4=E7=A9=BA=E3=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gunshi/project/xyt/timetask/DataTask.java | 324 +++++++++--------- src/main/resources/application-prod.yml | 5 + src/main/resources/config-prod.yml | 16 +- 3 files changed, 182 insertions(+), 163 deletions(-) create mode 100644 src/main/resources/application-prod.yml diff --git a/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java b/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java index 1cc524d..80e7d7a 100644 --- a/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java +++ b/src/main/java/com/gunshi/project/xyt/timetask/DataTask.java @@ -144,14 +144,16 @@ public class DataTask { ObjectMapper om = new ObjectMapper(); Map map = om.readValue(respStr, Map.class); List list = (List)map.get("data"); - for (Map map1 : list) { - StPptnRReal stPptnRReal = new ObjectMapper().convertValue(map1, StPptnRReal.class); - if(ObjectUtils.isEmpty(stPptnRReal.getChtm())){ - stPptnRReal.setChtm(new Date()); + if(CollectionUtils.isNotEmpty(list)){ + for (Map map1 : list) { + StPptnRReal stPptnRReal = new ObjectMapper().convertValue(map1, StPptnRReal.class); + if(ObjectUtils.isEmpty(stPptnRReal.getChtm())){ + stPptnRReal.setChtm(new Date()); + } + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("stcd", stPptnRReal.getStcd()); + stPptnRRealService.saveOrUpdate(stPptnRReal, updateWrapper); } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("stcd", stPptnRReal.getStcd()); - stPptnRRealService.saveOrUpdate(stPptnRReal, updateWrapper); } } catch (IOException e) @@ -176,32 +178,34 @@ public class DataTask { List stcdLast = stPptnRService.getStcdLastPptnData(); OkHttpClient client = OkHttpUtil.build(); try { - for(StPptnR stPptnR : stcdLast){ - Date stm = stPptnR.getStm(); - Calendar calendar = Calendar.getInstance(); - // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） - if(ObjectUtils.isEmpty(stm)){ - calendar.add(Calendar.DATE, -40); - } else { - calendar.add(Calendar.SECOND, 1); - } - stm = calendar.getTime(); - Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpphisRoute) - .post(new FormBody.Builder().add("stcd", stPptnR.getStcd()) - .add("stm", sdfH.format(stm)) - .add("etm", sdfH.format(now)) - .build()) - .build()).execute(); - String respStr = resp.body().string(); - ObjectMapper om = new ObjectMapper(); - Map map = om.readValue(respStr, Map.class); - if("400".equals(map.get("code").toString())){ - continue; - } - List list = (List)map.get("data"); - if(CollectionUtils.isNotEmpty(list)){ - List rlist = JSONObject.parseArray(JSONObject.toJSONString(list)).toJavaList(StPptnR.class); - stPptnRService.saveBatch(rlist); + if(CollectionUtils.isNotEmpty(stcdLast)){ + for(StPptnR stPptnR : stcdLast){ + Date stm = stPptnR.getStm(); + Calendar calendar = Calendar.getInstance(); + // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） + if(ObjectUtils.isEmpty(stm)){ + calendar.add(Calendar.DATE, -40); + } else { + calendar.add(Calendar.SECOND, 1); + } + stm = calendar.getTime(); + Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpphisRoute) + .post(new FormBody.Builder().add("stcd", stPptnR.getStcd()) + .add("stm", sdfH.format(stm)) + .add("etm", sdfH.format(now)) + .build()) + .build()).execute(); + String respStr = resp.body().string(); + ObjectMapper om = new ObjectMapper(); + Map map = om.readValue(respStr, Map.class); + if("400".equals(map.get("code").toString())){ + continue; + } + List list = (List)map.get("data"); + if(CollectionUtils.isNotEmpty(list)){ + List rlist = JSONObject.parseArray(JSONObject.toJSONString(list)).toJavaList(StPptnR.class); + stPptnRService.saveBatch(rlist); + } } } } @@ -227,44 +231,46 @@ public class DataTask { List stcdLast = stPptnRDService.getStcdLastPptnDayData(); OkHttpClient client = OkHttpUtil.build(); try { - for(StPptnRD stPptnRD : stcdLast){ - String stcd = stPptnRD.getStcd(); - Date stm = stPptnRD.getStm(); - Calendar calendar = Calendar.getInstance(); - // 默认两周前的时间（接口只提供addvcd的条件，数据量较大），如果存在，需要加一天（接口是大于等于开始时间） - if(ObjectUtils.isEmpty(stm)){ - calendar.add(Calendar.DATE, -14); - } else { - calendar.add(Calendar.DATE, 1); - } - stm = calendar.getTime(); - MediaType mediaType = MediaType.parse("application/json"); - SyncDataReq syncDataReq = new SyncDataReq(); - syncDataReq.setAdcd(stPptnRD.getAddvcd()); - syncDataReq.setType("SK"); - syncDataReq.setStartDate(sdfD.format(stm)); - syncDataReq.setEndDate(sdfD.format(now)); - RequestBody body = RequestBody.create(JacksonUtils.writeValue(syncDataReq), mediaType); - Response resp = client.newCall(new Request.Builder().url(apiPath) - .post(body) - .build()).execute(); - String respStr = resp.body().string(); - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - SkSyncResp resq = objectMapper.readValue(respStr, SkSyncResp.class); - SkSyncData data = resq.getData(); - List stPptnRDList = data.getStPptnRD(); - if(CollectionUtils.isNotEmpty(stPptnRDList)) { - Iterator iterator = stPptnRDList.iterator(); - while (iterator.hasNext()) { - StPptnRD stPptnRD1 = iterator.next(); - if (!stcd.equals(stPptnRD1.getStcd())) { - iterator.remove(); - continue; - } - stPptnRD1.setYear(Integer.valueOf(sdfD.format(stPptnRD1.getTm()).substring(0, 4))); + if(CollectionUtils.isNotEmpty(stcdLast)){ + for(StPptnRD stPptnRD : stcdLast){ + String stcd = stPptnRD.getStcd(); + Date stm = stPptnRD.getStm(); + Calendar calendar = Calendar.getInstance(); + // 默认两周前的时间（接口只提供addvcd的条件，数据量较大），如果存在，需要加一天（接口是大于等于开始时间） + if(ObjectUtils.isEmpty(stm)){ + calendar.add(Calendar.DATE, -14); + } else { + calendar.add(Calendar.DATE, 1); + } + stm = calendar.getTime(); + MediaType mediaType = MediaType.parse("application/json"); + SyncDataReq syncDataReq = new SyncDataReq(); + syncDataReq.setAdcd(stPptnRD.getAddvcd()); + syncDataReq.setType("SK"); + syncDataReq.setStartDate(sdfD.format(stm)); + syncDataReq.setEndDate(sdfD.format(now)); + RequestBody body = RequestBody.create(JacksonUtils.writeValue(syncDataReq), mediaType); + Response resp = client.newCall(new Request.Builder().url(apiPath) + .post(body) + .build()).execute(); + String respStr = resp.body().string(); + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + SkSyncResp resq = objectMapper.readValue(respStr, SkSyncResp.class); + SkSyncData data = resq.getData(); + List stPptnRDList = data.getStPptnRD(); + if(CollectionUtils.isNotEmpty(stPptnRDList)) { + Iterator iterator = stPptnRDList.iterator(); + while (iterator.hasNext()) { + StPptnRD stPptnRD1 = iterator.next(); + if (!stcd.equals(stPptnRD1.getStcd())) { + iterator.remove(); + continue; + } + stPptnRD1.setYear(Integer.valueOf(sdfD.format(stPptnRD1.getTm()).substring(0, 4))); + } + stPptnRDService.saveBatch(stPptnRDList); } - stPptnRDService.saveBatch(stPptnRDList); } } } @@ -298,14 +304,16 @@ public class DataTask { ObjectMapper om = new ObjectMapper(); Map map = om.readValue(respStr, Map.class); List list = (List)map.get("data"); - for (Map map1 : list) { - StRsvrRReal stRsvrRReal = new ObjectMapper().convertValue(map1, StRsvrRReal.class); - if(ObjectUtils.isEmpty(stRsvrRReal.getChtm())){ - stRsvrRReal.setChtm(new Date()); + if(CollectionUtils.isNotEmpty(list)){ + for (Map map1 : list) { + StRsvrRReal stRsvrRReal = new ObjectMapper().convertValue(map1, StRsvrRReal.class); + if(ObjectUtils.isEmpty(stRsvrRReal.getChtm())){ + stRsvrRReal.setChtm(new Date()); + } + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("stcd", stRsvrRReal.getStcd()); + stRsvrRRealService.saveOrUpdate(stRsvrRReal, updateWrapper); } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("stcd", stRsvrRReal.getStcd()); - stRsvrRRealService.saveOrUpdate(stRsvrRReal, updateWrapper); } } catch (IOException e) @@ -330,32 +338,34 @@ public class DataTask { List stcdLast = stRsvrRService.getStcdLastRsvrData(); OkHttpClient client = OkHttpUtil.build(); try { - for(StRsvrR stRsvrR : stcdLast){ - Date stm = stRsvrR.getStm(); - Calendar calendar = Calendar.getInstance(); - // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） - if(ObjectUtils.isEmpty(stm)){ - calendar.add(Calendar.DATE, -40); - } else { - calendar.add(Calendar.SECOND, 1); - } - stm = calendar.getTime(); - Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskzzhisRoute) - .post(new FormBody.Builder().add("stcd", stRsvrR.getStcd()) - .add("stm", sdfH.format(stm)) - .add("etm", sdfH.format(now)) - .build()) - .build()).execute(); - String respStr = resp.body().string(); - ObjectMapper om = new ObjectMapper(); - Map map = om.readValue(respStr, Map.class); - if("400".equals(map.get("code").toString())){ - continue; - } - List list = (List)map.get("data"); - if(CollectionUtils.isNotEmpty(list)){ - List rlist = JSONObject.parseArray(JSONObject.toJSONString(list)).toJavaList(StRsvrR.class); - stRsvrRService.saveBatch(rlist); + if(CollectionUtils.isNotEmpty(stcdLast)){ + for(StRsvrR stRsvrR : stcdLast){ + Date stm = stRsvrR.getStm(); + Calendar calendar = Calendar.getInstance(); + // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） + if(ObjectUtils.isEmpty(stm)){ + calendar.add(Calendar.DATE, -40); + } else { + calendar.add(Calendar.SECOND, 1); + } + stm = calendar.getTime(); + Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskzzhisRoute) + .post(new FormBody.Builder().add("stcd", stRsvrR.getStcd()) + .add("stm", sdfH.format(stm)) + .add("etm", sdfH.format(now)) + .build()) + .build()).execute(); + String respStr = resp.body().string(); + ObjectMapper om = new ObjectMapper(); + Map map = om.readValue(respStr, Map.class); + if("400".equals(map.get("code").toString())){ + continue; + } + List list = (List)map.get("data"); + if(CollectionUtils.isNotEmpty(list)){ + List rlist = JSONObject.parseArray(JSONObject.toJSONString(list)).toJavaList(StRsvrR.class); + stRsvrRService.saveBatch(rlist); + } } } } @@ -388,20 +398,22 @@ public class DataTask { ObjectMapper om = new ObjectMapper(); Map map = om.readValue(respStr, Map.class); List list = (List)map.get("data"); - for (Map map1 : list) { - StImgRReal stImgRReal = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setDateFormat(sdf).convertValue(map1, StImgRReal.class); - if(ObjectUtils.isEmpty(stImgRReal.getChtm())){ - stImgRReal.setChtm(new Date()); + if(CollectionUtils.isNotEmpty(list)){ + for (Map map1 : list) { + StImgRReal stImgRReal = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setDateFormat(sdf).convertValue(map1, StImgRReal.class); + if(ObjectUtils.isEmpty(stImgRReal.getChtm())){ + stImgRReal.setChtm(new Date()); + } + if(ObjectUtils.isEmpty(stImgRReal.getChid())){ + stImgRReal.setChid(map1.get("machineid").toString()); + } + if(ObjectUtils.isEmpty(stImgRReal.getImgPath())){ + stImgRReal.setImgPath(map1.get("url").toString()); + } + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("stcd", stImgRReal.getStcd()).eq("chid", stImgRReal.getChid()); + stImgRRealService.saveOrUpdate(stImgRReal, updateWrapper); } - if(ObjectUtils.isEmpty(stImgRReal.getChid())){ - stImgRReal.setChid(map1.get("machineid").toString()); - } - if(ObjectUtils.isEmpty(stImgRReal.getImgPath())){ - stImgRReal.setImgPath(map1.get("url").toString()); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("stcd", stImgRReal.getStcd()).eq("chid", stImgRReal.getChid()); - stImgRRealService.saveOrUpdate(stImgRReal, updateWrapper); } } catch (IOException e) @@ -426,45 +438,47 @@ public class DataTask { List stcdLast = stImgRService.getStcdLastImgData(); OkHttpClient client = OkHttpUtil.build(); try { - for (StImgR stImgR : stcdLast) { - Date stm = stImgR.getStm(); - Calendar calendar = Calendar.getInstance(); - // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） - if(ObjectUtils.isEmpty(stm)){ - calendar.add(Calendar.DATE, -40); - } else { - calendar.add(Calendar.SECOND, 1); - } - stm = calendar.getTime(); - Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpichisRoute) - .post(new FormBody.Builder().add("stcd", stImgR.getStcd()) - .add("stm", sdfH.format(stm)) - .add("etm", sdfH.format(now)) - .build()) - .build()).execute(); - String respStr = resp.body().string(); - ObjectMapper om = new ObjectMapper(); - Map map = om.readValue(respStr, Map.class); - if ("400".equals(map.get("code").toString())) { - continue; - } - List list = (List)map.get("data"); - if (CollectionUtils.isNotEmpty(list)) { - List rlist = list.stream().map(map1 -> { - StImgR stImgRNew = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setDateFormat(sdf).convertValue(map1, StImgR.class); - // 手动设置对应属性 - if(ObjectUtils.isEmpty(stImgRNew.getChtm())){ - stImgRNew.setChtm(new Date()); - } - if(ObjectUtils.isEmpty(stImgRNew.getChid())){ - stImgRNew.setChid(map1.get("machineid").toString()); - } - if(ObjectUtils.isEmpty(stImgRNew.getImgPath())){ - stImgRNew.setImgPath(map1.get("url").toString()); - } - return stImgRNew; - }).collect(Collectors.toList()); - stImgRService.saveBatch(rlist); + if(CollectionUtils.isNotEmpty(stcdLast)){ + for (StImgR stImgR : stcdLast) { + Date stm = stImgR.getStm(); + Calendar calendar = Calendar.getInstance(); + // 默认40天前（接口最多40天），存在则加1秒（接口是大于等于开始时间） + if(ObjectUtils.isEmpty(stm)){ + calendar.add(Calendar.DATE, -40); + } else { + calendar.add(Calendar.SECOND, 1); + } + stm = calendar.getTime(); + Response resp = client.newCall(new Request.Builder().url(owrsvrPath + hbskpichisRoute) + .post(new FormBody.Builder().add("stcd", stImgR.getStcd()) + .add("stm", sdfH.format(stm)) + .add("etm", sdfH.format(now)) + .build()) + .build()).execute(); + String respStr = resp.body().string(); + ObjectMapper om = new ObjectMapper(); + Map map = om.readValue(respStr, Map.class); + if ("400".equals(map.get("code").toString())) { + continue; + } + List list = (List)map.get("data"); + if (CollectionUtils.isNotEmpty(list)) { + List rlist = list.stream().map(map1 -> { + StImgR stImgRNew = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setDateFormat(sdf).convertValue(map1, StImgR.class); + // 手动设置对应属性 + if(ObjectUtils.isEmpty(stImgRNew.getChtm())){ + stImgRNew.setChtm(new Date()); + } + if(ObjectUtils.isEmpty(stImgRNew.getChid())){ + stImgRNew.setChid(map1.get("machineid").toString()); + } + if(ObjectUtils.isEmpty(stImgRNew.getImgPath())){ + stImgRNew.setImgPath(map1.get("url").toString()); + } + return stImgRNew; + }).collect(Collectors.toList()); + stImgRService.saveBatch(rlist); + } } } } diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000..e0f3f9e --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,5 @@ +spring: + config: + import: + - config-common.yml + - config-prod.yml diff --git a/src/main/resources/config-prod.yml b/src/main/resources/config-prod.yml index c58861d..0bcd73a 100644 --- a/src/main/resources/config-prod.yml +++ b/src/main/resources/config-prod.yml @@ -14,12 +14,12 @@ spring: username: gunshiiot password: 1234567a driver-class-name: org.postgresql.Driver - data: - redis: - host: 36.133.116.124 - port: 6379 - password: 1234567a - database: 4 + data: + redis: + host: 10.0.41.112 + port: 6379 + password: 1234567a + database: 4 mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl