Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

数据中心修改

Browse Source
This commit is contained in:
雨木c
2023-04-11 16:31:51 +08:00
parent 14d66c6089
commit 4ffccaced0
6 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java
View File

@@ -396,7 +396,7 @@ public class COverlimit {
}else if(DicDataEnum.KV1100.getCode().equalsIgnoreCase(voltageLevel)){
return 7000;
}else {
throw new BusinessException("没有对应电压等级,请先完善字典");
throw new BusinessException("没有对应电压等级,请先完善字典"+voltageLevel);
}
}

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java
View File

@@ -42,7 +42,7 @@ public class DistortionRateController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/distortionRate")
@ApiOperation("谐波畸变率排名")
@ApiOperation("谐波畸变率排名_mysql")
@ApiImplicitParam(name = "lineParam", value = "参数", required = true)
public HttpResult<String> distortionRate(@RequestBody @Validated LineParam lineParam){
String methodDescribe = getMethodDescribe("distortionRate");
@@ -54,6 +54,7 @@ public class DistortionRateController extends BaseController {
@PostMapping("/distortionRateBySource")
@ApiOperation("谐波畸变率排名")
@ApiImplicitParam(name = "lineParam", value = "参数", required = true)
@Deprecated
public HttpResult<String> distortionRateBySource(@RequestBody @Validated LineParam lineParam){
log.info(LocalDateTime.now()+"distortionRateBySource开始执行");
String methodDescribe = getMethodDescribe("distortionRateBySource");

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java
View File

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping("/normalLimit")
@Api(tags = "告警数据预处理")
@Api(tags = "告警数据预处理_mysql")
@AllArgsConstructor
public class NormalLimitController extends BaseController {

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
View File

@@ -540,6 +540,7 @@ public class DayDataServiceImpl implements DayDataService {
@Transactional(rollbackFor = {Exception.class})
@Async("asyncExecutor")
public void dataToDayHandler(List<String> indexLists, String startTime, String endTime) {
log.info(LocalDateTime.now()+"data表转day开始=====》");
Date time = null;
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
@@ -761,6 +762,9 @@ public class DayDataServiceImpl implements DayDataService {
if (!CollectionUtils.isEmpty(dataPltPOList)){
statDataPltDService.insert(dataPltPOList);
}
log.info(LocalDateTime.now()+"data表转day结束=====》");
}

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java
View File

@@ -29,6 +29,7 @@ import org.springframework.util.CollectionUtils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -111,6 +112,7 @@ public class LimitRateService extends MppServiceImpl<LimitRatePOMapper, LimitRa
@SneakyThrows
@Async("asyncExecutor")
public void limitRate(List<String> lineList, String startTime, String endTime) {
log.info(LocalDateTime.now()+"r_stat_limit_rate_d开始执行=======》");
List<RStatLimitRateDPO> list = new ArrayList<>();
List<LimitRate> limitRateList = new ArrayList<> ();
Date date = null;
@@ -153,6 +155,8 @@ public class LimitRateService extends MppServiceImpl<LimitRatePOMapper, LimitRa
/*插入mysql*/
statLimitRateDService.insert(list);
}
log.info(LocalDateTime.now()+"r_stat_limit_rate_d执行结束《=======");
}

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
View File

@@ -23,6 +23,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -64,6 +65,7 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
@Override
@Async("asyncExecutor")
public void limitTargetData(LineParam lineParam,String time) {
log.info(LocalDateTime.now()+"r_stat_limit_target_d开始执行=======》");
List<RStatLimitTargetDPO> list = new ArrayList<>();
Date dateOut = DateUtil.parse(time);
List<RStatLimitRateDPO> limitRateData = new ArrayList<>();
@@ -83,6 +85,7 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
}
}
this.saveOrUpdateBatchByMultiId(list,50);
log.info(LocalDateTime.now()+"r_stat_limit_target_d开始执行=======》");
}
private List<LimitRate> getLimitRateData(String lineId,String date){