Commit 5ab55f4d authored by tangwei's avatar tangwei

修改入参数

parent e39e6b43
...@@ -30,14 +30,14 @@ public class TdHYGFInverterMonthGenerateImpl implements AscriptionService { ...@@ -30,14 +30,14 @@ public class TdHYGFInverterMonthGenerateImpl implements AscriptionService {
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); // DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy-MM"); // DateFormat dfty = new SimpleDateFormat("yyyy-MM");
//
Date star = dft.parse(timeNum);//开始时间 // Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star); // String yearMonth= dfty.format(star);
List<TdHYGFInverterMonthGenerate> hygfjpDayPower = tdHYGFInverterMonthGenerateMapper.selectList( List<TdHYGFInverterMonthGenerate> hygfjpDayPower = tdHYGFInverterMonthGenerateMapper.selectList(
new QueryWrapper<TdHYGFInverterMonthGenerate>(). new QueryWrapper<TdHYGFInverterMonthGenerate>().
eq("year_month", yearMonth).and(wrapper -> { eq("day_time", timeNum).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
.isNull("amos_company_code") .isNull("amos_company_code")
......
...@@ -30,13 +30,13 @@ public class TdHYGFInverterYearGenerateImpl implements AscriptionService { ...@@ -30,13 +30,13 @@ public class TdHYGFInverterYearGenerateImpl implements AscriptionService {
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy"); DateFormat dfty = new SimpleDateFormat("yyyy-MM");
Date star = dft.parse(timeNum);//开始时间 Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star); String yearMonth= dfty.format(star);
List<TdHYGFInverterYearGenerate> hygfjpDayPower = tdHYGFInverterYearGenerateMapper.selectList( List<TdHYGFInverterYearGenerate> hygfjpDayPower = tdHYGFInverterYearGenerateMapper.selectList(
new QueryWrapper<TdHYGFInverterYearGenerate>(). new QueryWrapper<TdHYGFInverterYearGenerate>().
eq("year", yearMonth).and(wrapper -> { eq("month_time", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
.isNull("amos_company_code") .isNull("amos_company_code")
......
...@@ -30,14 +30,14 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService { ...@@ -30,14 +30,14 @@ public class TdHYGFStationDayGenerateImpl implements AscriptionService {
@Override @Override
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); // DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy-MM"); // DateFormat dfty = new SimpleDateFormat("yyyy-MM");
//
Date star = dft.parse(timeNum);//开始时间 // Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star); // String yearMonth= dfty.format(star);
List<TdHYGFStationDayGenerate> hygfjpDayPower = tdHYGFStationDayGenerateMapper.selectList( List<TdHYGFStationDayGenerate> hygfjpDayPower = tdHYGFStationDayGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationDayGenerate>(). new QueryWrapper<TdHYGFStationDayGenerate>().
eq("year_month", yearMonth).and(wrapper -> { eq("day_time", timeNum).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
.isNull("amos_company_code") .isNull("amos_company_code")
......
...@@ -30,13 +30,13 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService { ...@@ -30,13 +30,13 @@ public class TdHYGFStationMonthGenerateImpl implements AscriptionService {
public void updateAscription(String timeNum) { public void updateAscription(String timeNum) {
try { try {
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); DateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
DateFormat dfty = new SimpleDateFormat("yyyy"); DateFormat dfty = new SimpleDateFormat("yyyy-MM");
Date star = dft.parse(timeNum);//开始时间 Date star = dft.parse(timeNum);//开始时间
String yearMonth= dfty.format(star); String yearMonth= dfty.format(star);
List<TdHYGFStationMonthGenerate> hygfjpDayPower = tdHYGFStationMonthGenerateMapper.selectList( List<TdHYGFStationMonthGenerate> hygfjpDayPower = tdHYGFStationMonthGenerateMapper.selectList(
new QueryWrapper<TdHYGFStationMonthGenerate>(). new QueryWrapper<TdHYGFStationMonthGenerate>().
eq("year", yearMonth).and(wrapper -> { eq("month_time", yearMonth).and(wrapper -> {
wrapper.isNull("regional_companies_code") wrapper.isNull("regional_companies_code")
.or() .or()
.isNull("amos_company_code") .isNull("amos_company_code")
......
...@@ -140,6 +140,11 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe ...@@ -140,6 +140,11 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
TimeUnit.SECONDS.sleep(1); TimeUnit.SECONDS.sleep(1);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
HashMap<String, Object> requestInfo = new HashMap<>(); HashMap<String, Object> requestInfo = new HashMap<>();
requestInfo.put("id", Long.valueOf(stationIds.get(i))); requestInfo.put("id", Long.valueOf(stationIds.get(i)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment