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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2024-07-18 10:40:55 +08:00
parent 23e7288609 a573c17886
commit a9aa0785da
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import com.njcn.advance.mapper.carrycapacity.CarryCapacityUserPOMapper;
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityUserParam; import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityUserParam;
import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityUserPO; import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityUserPO;
import com.njcn.advance.service.carrycapacity.CarryCapacityUserPOService; import com.njcn.advance.service.carrycapacity.CarryCapacityUserPOService;
import com.njcn.common.pojo.constant.LogInfo;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.user.api.UserFeignClient; import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.vo.UserVO; import com.njcn.user.pojo.vo.UserVO;
@@ -77,7 +78,7 @@ public class CarryCapacityUserPOServiceImpl extends ServiceImpl<CarryCapacityUse
page.getRecords().stream().forEach(temp->{ page.getRecords().stream().forEach(temp->{
UserVO user = userFeignClient.getUserById(temp.getCreateBy()).getData(); UserVO user = userFeignClient.getUserById(temp.getCreateBy()).getData();
temp.setCreateBy(user.getName()); temp.setCreateBy(Objects.isNull(user)? LogInfo.UNKNOWN_USER:user.getName());
}); });
return page; return page;
} }

6
pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java
View File

@@ -289,7 +289,7 @@ public class ResponsibilityAlgorithm {
//EK计算，用于后续计算FK（不含背景的用户责任指标）、HK（包含背景的用户责任指标） //EK计算，用于后续计算FK（不含背景的用户责任指标）、HK（包含背景的用户责任指标）
//float **EKarr = (float **)malloc(TL * sizeof(float *));//先申请P个指针型字节的空间 //float **EKarr = (float **)malloc(TL * sizeof(float *));//先申请P个指针型字节的空间
//for (int i = 0; i < TL; i++) //for (int i = 0; i < TL; i++)
//EKarr[i] = (float *)malloc(TL * sizeof(float)); //EKarr[i] = (float *)malloc(TL * Float.SIZE / Byte.SIZE);
float[][] EKarr; float[][] EKarr;
EKarr = dyEKCom(simCor, Pdata, width, P, TL); EKarr = dyEKCom(simCor, Pdata, width, P, TL);
@@ -303,7 +303,7 @@ public class ResponsibilityAlgorithm {
//不含背景的用户谐波责任指标 //不含背景的用户谐波责任指标
//float **FKarr = (float **)malloc(TL * sizeof(float *));//先申请P个指针型字节的空间 //float **FKarr = (float **)malloc(TL * sizeof(float *));//先申请P个指针型字节的空间
//for (int i = 0; i < TL; i++) //for (int i = 0; i < TL; i++)
//FKarr[i] = (float *)malloc(TL * sizeof(float)); //FKarr[i] = (float *)malloc(TL * Float.SIZE / Byte.SIZE);
float[][] FKarr; float[][] FKarr;
FKarr = DyFKCom(EKdata, width, P, TL); FKarr = DyFKCom(EKdata, width, P, TL);
RealMatrix FKdata = MatrixUtils.createRealMatrix(slcorlength, P); RealMatrix FKdata = MatrixUtils.createRealMatrix(slcorlength, P);
@@ -316,7 +316,7 @@ public class ResponsibilityAlgorithm {
//包含背景的谐波责任指标 //包含背景的谐波责任指标
//float **HKarr = (float **)malloc(TL * sizeof(float *));//先申请P个指针型字节的空间 //float **HKarr = (float **)malloc(TL * sizeof(float *));//先申请P个指针型字节的空间
//for (int i = 0; i < TL; i++) //for (int i = 0; i < TL; i++)
//HKarr[i] = (float *)malloc(TL * sizeof(float)); //HKarr[i] = (float *)malloc(TL * Float.SIZE / Byte.SIZE);
float[][] HKarr; float[][] HKarr;
HKarr = DyHKCom(bjCore, EKdata, width, P, TL); HKarr = DyHKCom(bjCore, EKdata, width, P, TL);
RealMatrix HKdata = MatrixUtils.createRealMatrix(slcorlength, (P + 1)); RealMatrix HKdata = MatrixUtils.createRealMatrix(slcorlength, (P + 1));