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

海南大屏bug修改

Browse Source
This commit is contained in:
hzj
2024-12-02 18:18:33 +08:00
parent e7b4117167
commit 396fe59b94
14 changed files with 469 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/excel/CarryCapcityDataEexcel.java
View File

@@ -1,11 +1,12 @@
package com.njcn.advance.pojo.carrycapacity.excel;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.converters.localdatetime.LocalDateTimeStringConverter;
import com.njcn.advance.utils.EasyExcelUtil;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
/**
@@ -266,17 +267,20 @@ public class CarryCapcityDataEexcel {
private Double i25_c;
public static void main(String[] args) {
List<CarryCapcityDataEexcel> objects = EasyExcelUtil.syncReadModel("C:\\Users\\无名\\Desktop\\11.xlsx", CarryCapcityDataEexcel.class, 0,3);
System.out.println(objects);
// List<CarryCapcityDataEexcel> objects = EasyExcelUtil.syncReadModel("C:\\Users\\无名\\Desktop\\11.xlsx", CarryCapcityDataEexcel.class, 0,3);
// System.out.println(objects);
// String sheetName = "sheetName";
// List<CarryCapcityDataEexcel> excels = new ArrayList<>();
// CarryCapcityDataEexcel exportHeadersExcel = new CarryCapcityDataEexcel();
// excels.add(exportHeadersExcel);
//
// EasyExcel.write("C:\\\\Users\\\\无名\\\\Desktop\\\\22.xlsx", CarryCapcityDataEexcel.class)
// .sheet(sheetName)
// .doWrite(excels);
String sheetName = "sheetName";
List<CarryCapcityDataEexcel> excels = new ArrayList<>();
CarryCapcityDataEexcel exportHeadersExcel = new CarryCapcityDataEexcel();
excels.add(exportHeadersExcel);
EasyExcel.write("C:\\\\Users\\\\无名\\\\Desktop\\\\22.xlsx", CarryCapcityDataEexcel.class)
.sheet(sheetName)
.doWrite(excels);
EasyExcel.write("C:\\\\Users\\\\无名\\\\Desktop\\\\22.xlsx", CarryCapcityDataEexcel.class)
.sheet("sheetName2")
.doWrite(excels);
}

1
pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityDeviceParam.java
View File

@@ -23,6 +23,7 @@ public class CarryCapacityDeviceParam {
/**
* 设备名称
*/
@Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG)
private String devName;
private String devScale;

1
pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/param/CarryCapacityUserParam.java
View File

@@ -31,6 +31,7 @@ public class CarryCapacityUserParam {
/**
* 用户名称
*/
@Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG)
private String userName;
/**

5
pqs-advance/advance-api/src/main/java/com/njcn/advance/utils/EasyExcelUtil.java
View File

@@ -376,4 +376,9 @@ public class EasyExcelUtil {
return new EasyExcelWriteTool(response.getOutputStream());
}
public static void main(String[] args) {
List<Map<Integer, String>> maps = EasyExcelUtil.syncRead("C:\\Users\\无名\\Desktop\\11.xlsx");
System.out.println(maps);
}
}

14
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/carrycapacity/CarryCapacityController.java
View File

@@ -56,15 +56,7 @@ public class CarryCapacityController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapacityDataVO, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/modelTraining")
@ApiOperation("承载能力评估模型训练")
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
public HttpResult<CarryCapacityDataVO> modelTraining(@RequestBody @Validated CarryCapacityQueryDataParam queryParam) {
String methodDescribe = getMethodDescribe("modelTraining");
CarryCapacityDataVO carryCapacityDataVO = carryCapcityService.modelTraining(queryParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapacityDataVO, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryCarryCapacityQData")
@@ -72,7 +64,7 @@ public class CarryCapacityController extends BaseController {
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
public HttpResult<CarryCapacityDataQVO> queryCarryCapacityQData(@RequestBody @Validated CarryCapacityQueryDataParam queryParam) {
String methodDescribe = getMethodDescribe("queryCarryCapacityQData");
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapcityService.queryCarryCapacityQData(queryParam), methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapcityService.queryCarryCapacityqData(queryParam), methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -81,7 +73,7 @@ public class CarryCapacityController extends BaseController {
@ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
public HttpResult<CarryCapacityDataIVO> queryCarryCapacityIData(@RequestBody @Validated CarryCapacityQueryDataParam queryParam) {
String methodDescribe = getMethodDescribe("queryCarryCapacityIData");
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapcityService.queryCarryCapacityIData(queryParam), methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, carryCapcityService.queryCarryCapacityiData(queryParam), methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)

5
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/CarryCapacityService.java
View File

@@ -21,9 +21,9 @@ public interface CarryCapacityService {
CarryCapacityDataVO queryCarryCapacityData(CarryCapacityQueryDataParam queryParam);
CarryCapacityDataQVO queryCarryCapacityQData(CarryCapacityQueryDataParam queryParam);
CarryCapacityDataQVO queryCarryCapacityqData(CarryCapacityQueryDataParam queryParam);
CarryCapacityDataIVO queryCarryCapacityIData(CarryCapacityQueryDataParam queryParam);
CarryCapacityDataIVO queryCarryCapacityiData(CarryCapacityQueryDataParam queryParam);
CarryCapacityDResultVO carryCapacityCal(CarryCapacityCalParam calParam);
@@ -31,7 +31,6 @@ public interface CarryCapacityService {
boolean uploadExcel(ExcelDataParam excelDataParam) throws Exception;
CarryCapacityDataVO modelTraining(CarryCapacityQueryDataParam queryParam);
CarryCapacityDResultVO carryCapacityEvaluate(CarryCapacityEvaluateParam calParam);
}

47
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java
View File

@@ -1,10 +1,17 @@
package com.njcn.advance.service.carrycapacity.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.advance.enums.AdvanceResponseEnum;
import com.njcn.advance.mapper.carrycapacity.CarryCapacityDevicePOMapper;
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityDeviceParam;
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityUserParam;
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityDevicePO;
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityUserPO;
import com.njcn.advance.service.carrycapacity.CarryCapacityDevicePOService;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +30,10 @@ public class CarryCapacityDevicePOServiceImpl extends ServiceImpl<CarryCapacityD
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateDevice(CarryCapacityDeviceParam.CarryCapacityDeviceUpdateParam deviceParam) {
if(StringUtils.isBlank(deviceParam.getDevName())){
throw new BusinessException("干扰源设备名称不能为空");
}
checkName(deviceParam,true);
return this.lambdaUpdate().eq(CarryCapacityDevicePO::getDevId, deviceParam.getDevId())
.set(CarryCapacityDevicePO::getDevName, deviceParam.getDevName())
.set(CarryCapacityDevicePO::getProtocolCapacity, deviceParam.getProtocolCapacity())
@@ -32,8 +43,38 @@ public class CarryCapacityDevicePOServiceImpl extends ServiceImpl<CarryCapacityD
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(CarryCapacityDeviceParam capacityDeviceParam) {
CarryCapacityDevicePO carryCapacityDevicePO = new CarryCapacityDevicePO();
BeanUtils.copyProperties(capacityDeviceParam,carryCapacityDevicePO);
return this.save(carryCapacityDevicePO);
if(StringUtils.isBlank(capacityDeviceParam.getDevName())){
throw new BusinessException("干扰源设备名称不能为空");
}
checkName(capacityDeviceParam,false);
CarryCapacityDevicePO carryCapacityDevice = new CarryCapacityDevicePO();
BeanUtils.copyProperties(capacityDeviceParam,carryCapacityDevice);
return this.save(carryCapacityDevice);
}
/**
* 检查名称是否已存在
*
* @return 结果
*/
private void checkName(CarryCapacityDeviceParam carryCapacityDeviceParam, boolean isUpdate) {
LambdaQueryWrapper<CarryCapacityDevicePO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
//条件组合：where state = 1 and name = ?
lambdaQueryWrapper.eq(CarryCapacityDevicePO::getUserId,carryCapacityDeviceParam.getUserId()).eq(CarryCapacityDevicePO::getDevName, carryCapacityDeviceParam.getDevName());
//and id <> ?
if (isUpdate) {
if (carryCapacityDeviceParam instanceof CarryCapacityDeviceParam.CarryCapacityDeviceUpdateParam) {
lambdaQueryWrapper.ne(CarryCapacityDevicePO::getDevId, ((CarryCapacityDeviceParam.CarryCapacityDeviceUpdateParam) carryCapacityDeviceParam).getDevId());
}
}
//若存在条件数据抛出异常
int count = this.getBaseMapper().selectCount(lambdaQueryWrapper);
if (count > 0) {
throw new BusinessException("干扰源设备名称已存在");
}
}
}

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityResultPOServiceImpl.java
View File

@@ -56,8 +56,8 @@ public class CarryCapacityResultPOServiceImpl extends ServiceImpl<CarryCapacityR
BeanUtils.copyProperties(temp, vo);
String[] split = temp.getUserId().split(",");
List<String> collect1 = Arrays.stream(split).sequential().map(userId -> {
CarryCapacityUserPO carryCapacityUserPO = carryCapacityUserPOService.queyDetailUserById(userId);
return carryCapacityUserPO.getUserName();
CarryCapacityUserPO carryCapacityUser = carryCapacityUserPOService.queyDetailUserById(userId);
return carryCapacityUser.getUserName();
}).collect(Collectors.toList());
vo.setUserName(String.join(",", collect1));
if (ObjectUtils.isNotEmpty(temp.getIResultList()) ){

792
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

3
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityStrategyDhlPOServiceImpl.java
View File

@@ -27,7 +27,7 @@ public class CarryCapacityStrategyDhlPOServiceImpl extends ServiceImpl<CarryCapa
@Override
public List<CarryCapacityStrategyDhlVO> queyDetailDhl() {
List<CarryCapacityStrategyDhlPO> list = this.lambdaQuery().eq(CarryCapacityStrategyDhlPO::getUserFlag, 1).list();
List<CarryCapacityStrategyDhlVO> collect = list.stream().map(t -> {
return list.stream().map(t -> {
CarryCapacityStrategyDhlVO vo = new CarryCapacityStrategyDhlVO();
vo.setCount1(t.getCount1());
vo.setCount2(t.getCount2());
@@ -42,7 +42,6 @@ public class CarryCapacityStrategyDhlPOServiceImpl extends ServiceImpl<CarryCapa
vo.setType(t.getType());
return vo;
}).collect(Collectors.toList());
return collect;
}
@Override

10
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityStrategyPOServiceImpl.java
View File

@@ -38,8 +38,8 @@ public class CarryCapacityStrategyPOServiceImpl extends ServiceImpl<CarryCapacit
@Override
@Transactional(rollbackFor = {Exception.class})
public Boolean add(CarryCapacityStrategyParam carryCapacityStrategyParam) {
CarryCapacityStrategyPO carryCapacityStrategyPO = new CarryCapacityStrategyPO();
BeanUtils.copyProperties(carryCapacityStrategyParam, carryCapacityStrategyPO);
CarryCapacityStrategyPO carryCapacityStrategy = new CarryCapacityStrategyPO();
BeanUtils.copyProperties(carryCapacityStrategyParam, carryCapacityStrategy);
//将原始策略处理为不启用
this.lambdaUpdate().eq(CarryCapacityStrategyPO::getResult, carryCapacityStrategyParam.getResult())
.eq(CarryCapacityStrategyPO::getId, carryCapacityStrategyParam.getId())
@@ -56,9 +56,9 @@ public class CarryCapacityStrategyPOServiceImpl extends ServiceImpl<CarryCapacit
//将客户对应策略删除
this.remove(lambdaQuery);
//新增客户策略;
carryCapacityStrategyPO.setProtoFlag(2);
carryCapacityStrategyPO.setUserFlag(1);
return this.save(carryCapacityStrategyPO);
carryCapacityStrategy.setProtoFlag(2);
carryCapacityStrategy.setUserFlag(1);
return this.save(carryCapacityStrategy);
}
@Override

56
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityUserPOServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.njcn.advance.service.carrycapacity.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,7 +12,11 @@ import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityUserParam;
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityUserPO;
import com.njcn.advance.service.carrycapacity.CarryCapacityUserPOService;
import com.njcn.common.pojo.constant.LogInfo;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.harmonic.enums.HarmonicResponseEnum;
import com.njcn.harmonic.pojo.param.ReportTemplateParam;
import com.njcn.harmonic.pojo.po.ExcelRptTemp;
import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.vo.UserVO;
import lombok.RequiredArgsConstructor;
@@ -37,29 +42,52 @@ public class CarryCapacityUserPOServiceImpl extends ServiceImpl<CarryCapacityUse
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(CarryCapacityUserParam carryCapacityUserParam) {
CarryCapacityUserPO carryCapacityUserPO = new CarryCapacityUserPO();
BeanUtils.copyProperties(carryCapacityUserParam, carryCapacityUserPO);
CarryCapacityUserPO one = this.lambdaQuery().eq(CarryCapacityUserPO::getUserName, carryCapacityUserParam.getUserName()).one();
if(Objects.nonNull(one)){
if(StringUtils.isBlank(carryCapacityUserParam.getUserName())){
throw new BusinessException("用户称不能为空");
}
checkName(carryCapacityUserParam,false);
CarryCapacityUserPO carryCapacityUser = new CarryCapacityUserPO();
BeanUtils.copyProperties(carryCapacityUserParam, carryCapacityUser);
carryCapacityUser.setStatus(1);
return this.save(carryCapacityUser);
}
/**
* 检查名称是否已存在
*
* @return 结果
*/
private void checkName(CarryCapacityUserParam carryCapacityUserParam, boolean isUpdate) {
LambdaQueryWrapper<CarryCapacityUserPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
//条件组合：where state = 1 and name = ?
lambdaQueryWrapper.eq(CarryCapacityUserPO::getStatus, DataStateEnum.ENABLE.getCode()).eq(CarryCapacityUserPO::getUserName, carryCapacityUserParam.getUserName());
//and id <> ?
if (isUpdate) {
if (carryCapacityUserParam instanceof CarryCapacityUserParam.CarryCapacityUserUpdateParam) {
lambdaQueryWrapper.ne(CarryCapacityUserPO::getUserId, ((CarryCapacityUserParam.CarryCapacityUserUpdateParam) carryCapacityUserParam).getUserId());
}
}
//若存在条件数据抛出异常
int count = this.getBaseMapper().selectCount(lambdaQueryWrapper);
if (count > 0) {
throw new BusinessException(AdvanceResponseEnum.USER_NAME_EXIST);
}
carryCapacityUserPO.setStatus(1);
boolean save = this.save(carryCapacityUserPO);
return save;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateUser(CarryCapacityUserParam.CarryCapacityUserUpdateParam userUpdateParam) {
CarryCapacityUserPO carryCapacityUserPO = new CarryCapacityUserPO();
BeanUtils.copyProperties(userUpdateParam, carryCapacityUserPO);
CarryCapacityUserPO one = this.lambdaQuery().eq(CarryCapacityUserPO::getUserName, userUpdateParam.getUserName()).ne(CarryCapacityUserPO::getUserId,userUpdateParam.getUserId()).one();
if(Objects.nonNull(one)){
throw new BusinessException(AdvanceResponseEnum.USER_NAME_EXIST);
if(StringUtils.isBlank(userUpdateParam.getUserName())){
throw new BusinessException("用户称不能为空");
}
checkName(userUpdateParam,false);
CarryCapacityUserPO carryCapacityUser = new CarryCapacityUserPO();
BeanUtils.copyProperties(userUpdateParam, carryCapacityUser);
boolean save = this.updateById(carryCapacityUserPO);
return save;
return this.updateById(carryCapacityUser);
}
@Override

5
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -274,6 +275,10 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
public Page<RmpEventDetailAssPO> queryEventsAssPage(BaseParam baseParam) {
List<LocalDateTime> timeV = PubUtils.checkLocalDate(baseParam.getSearchBeginTime(), baseParam.getSearchEndTime());
LambdaQueryWrapper<RmpEventDetailAssPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotBlank(baseParam.getSearchValue())) {
lambdaQueryWrapper.like(RmpEventDetailAssPO::getContentDes, baseParam.getSearchValue());
}
lambdaQueryWrapper.between(RmpEventDetailAssPO::getTimeId, timeV.get(0), timeV.get(1))
.orderByAsc(RmpEventDetailAssPO::getTimeId);
return rmpEventDetailAssMapper.selectPage(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);

10
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
View File

@@ -71,7 +71,9 @@ import java.math.RoundingMode;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.ExecutionException;
@@ -963,7 +965,13 @@ public class CustomReportServiceImpl implements CustomReportService {
String tem = v.replace("&", "");
if (Objects.nonNull(finalTerminalMap)) {
if ("statis_time".equals(tem)) {
son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + InfluxDbSqlConstant.END_TIME);
//如何时间是大于当前时间则用当前时间
String localTime = InfluxDbSqlConstant.END_TIME;
LocalDate localDate = LocalDateTimeUtil.parseDate(reportSearchParam.getEndTime(), DatePattern.NORM_DATE_PATTERN);
if(LocalDate.now().isEqual(localDate)){
localTime = LocalTime.now().format(DatePattern.NORM_TIME_FORMATTER);
}
son.set("v", reportSearchParam.getStartTime() + InfluxDbSqlConstant.START_TIME + "_" + reportSearchParam.getEndTime() + localTime);
} else {
//台账信息
son.set("v", finalTerminalMap.getOrDefault(tem, "/"));