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

pms代码合并

Browse Source
This commit is contained in:
雨木c
2023-01-13 10:24:47 +08:00
parent f6dfee86e6
commit 2b08dcb1ec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/area/PrimaryGridDataController.java
View File

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pms.api.PmsTerminalClient; import com.njcn.device.pms.api.PmsTerminalClient;
import com.njcn.device.pms.pojo.param.PmsBaseParam;
import com.njcn.device.pms.pojo.po.PmsTerminal; import com.njcn.device.pms.pojo.po.PmsTerminal;
import com.njcn.prepare.harmonic.pojo.param.PrimaryGridDataIntegrityParam; import com.njcn.prepare.harmonic.pojo.param.PrimaryGridDataIntegrityParam;
import com.njcn.prepare.harmonic.pojo.param.PrimaryGridParam; import com.njcn.prepare.harmonic.pojo.param.PrimaryGridParam;
@@ -92,7 +93,7 @@ public class PrimaryGridDataController extends BaseController {
List<String> orgIdList = new ArrayList<> (); List<String> orgIdList = new ArrayList<> ();
if(CollectionUtils.isEmpty (primaryGridDataIntegrityParam.getDeviceId ())){ if(CollectionUtils.isEmpty (primaryGridDataIntegrityParam.getDeviceId ())){
/*todo 不知道是否需要补招*/ /*todo 不知道是否需要补招*/
List<PmsTerminal> data = pmsTerminalClient.getTerminalSelectList ( ).getData ( ); List<PmsTerminal> data = pmsTerminalClient.getTerminalSelectList (new PmsBaseParam()).getData ( );
orgIdList = data.stream ().map (PmsTerminal::getId).collect(Collectors.toList()); orgIdList = data.stream ().map (PmsTerminal::getId).collect(Collectors.toList());
}else{ }else{
orgIdList = primaryGridDataIntegrityParam.getDeviceId (); orgIdList = primaryGridDataIntegrityParam.getDeviceId ();