Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口调整

Browse Source
This commit is contained in:
xuyang
2023-08-16 16:29:54 +08:00
parent c7fd55a58a
commit ee43dce699
15 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DataSetFeignClient.java
View File

@@ -24,4 +24,7 @@ public interface DataSetFeignClient {
@PostMapping("/getDataSet")
HttpResult<List<LineTargetVO>> getDataSet(@RequestParam("modelId") String modelId,@RequestParam("clDev") Integer clDev);
@PostMapping("/getModuleDataSet")
HttpResult<List<CsDataSet>> getModuleDataSet(@RequestParam("modelId") String modelId);
}

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java
View File

@@ -26,5 +26,5 @@ public interface EquipmentFeignClient {
HttpResult<List<CsEquipmentDeliveryDTO>> queryDeviceById(@RequestParam("ids") List<String> ids);
@PostMapping("/updateSoftInfoBynDid")
HttpResult<Boolean> updateSoftInfoBynDid(@RequestParam("nDId") String nDid,@RequestParam("id") String id);
HttpResult<Boolean> updateSoftInfoBynDid(@RequestParam("nDId") String nDid, @RequestParam("id") String id, @RequestParam("module") Integer module);
}

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataSetFeignClientFallbackFactory.java
View File

@@ -44,6 +44,12 @@ public class DataSetFeignClientFallbackFactory implements FallbackFactory<DataSe
log.error("{}异常，降级处理，异常为：{}","获取数据集",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsDataSet>> getModuleDataSet(String modelId) {
log.error("{}异常，降级处理，异常为：{}","获取子模块数据集",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java
View File

@@ -48,7 +48,7 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory<Equi
}
@Override
public HttpResult<Boolean> updateSoftInfoBynDid(String nDid, String id) {
public HttpResult<Boolean> updateSoftInfoBynDid(String nDid, String id, Integer module) {
log.error("{}异常，降级处理，异常为：{}","根据网关id调整软件信息",cause.toString());
throw new BusinessException(finalExceptionEnum);
}

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
View File

@@ -119,4 +119,10 @@ public class CsEquipmentDeliveryAddParm{
@ApiModelProperty(value="软件信息")
private String softinfoId;
/**
* 模块个数
*/
@ApiModelProperty(value="模块个数")
private Integer modelNumber;
}

5
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
View File

@@ -123,4 +123,9 @@ public class CsEquipmentDeliveryAuditParm {
@ApiModelProperty(value="软件信息")
private String softinfoId;
/**
* 模块个数
*/
@ApiModelProperty(value="模块个数")
private Integer modelNumber;
}

6
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
View File

@@ -132,5 +132,11 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
@TableField(value = "softinfo_id")
private String softinfoId;
/**
* 模块个数
*/
@TableField(value = "module_number")
private Integer moduleNumber;
}

8
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java
View File

@@ -72,5 +72,13 @@ public class CsLinePO extends BaseEntity {
@TableField(value = "conType")
private Integer conType;
/**
* 逻辑子设备id(与模板对应)
* 治理监测点 0
* 负载监测点 1
* 电网监测点 2
*/
@TableField(value = "clDid")
private Integer clDid;
}

10
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataSetController.java
View File

@@ -66,5 +66,15 @@ public class CsDataSetController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getModuleDataSet")
@ApiOperation("获取子模块数据集")
@ApiImplicitParam(name = "modelId", value = "模板id", required = true)
public HttpResult<List<CsDataSet>> getModuleDataSet(@RequestParam("modelId") String modelId){
String methodDescribe = getMethodDescribe("getModuleDataSet");
List<CsDataSet> list = csDataSetService.getModuleDataSet(modelId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

7
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
View File

@@ -170,11 +170,12 @@ public class EquipmentDeliveryController extends BaseController {
@ApiOperation("根据网关id调整软件信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "nDId", value = "网关id", required = true),
@ApiImplicitParam(name = "id", value = "软件信息id", required = true)
@ApiImplicitParam(name = "id", value = "软件信息id", required = true),
@ApiImplicitParam(name = "module", value = "模块个数", required = true)
})
public HttpResult<Boolean> updateSoftInfoBynDid(@RequestParam("nDId") String nDid,@RequestParam("id") String id){
public HttpResult<Boolean> updateSoftInfoBynDid(@RequestParam("nDId") String nDid,@RequestParam("id") String id,@RequestParam("module") Integer module){
String methodDescribe = getMethodDescribe("updateSoftInfoBynDid");
csEquipmentDeliveryService.updateSoftInfoBynDid(nDid,id);
csEquipmentDeliveryService.updateSoftInfoBynDid(nDid,id,module);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}

1
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml
View File

@@ -106,5 +106,6 @@
and t1.did = #{param.did}
and t3.cl_dev = #{param.cldId}
and t4.stat_method = #{param.statMethod}
order by t4.sort
</select>
</mapper>

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
View File

@@ -81,5 +81,5 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
* 根据网关id修改软件信息
* @param nDid 网关id
*/
void updateSoftInfoBynDid(String nDid,String id);
void updateSoftInfoBynDid(String nDid,String id,Integer module);
}

7
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataSetService.java
View File

@@ -38,4 +38,11 @@ public interface ICsDataSetService extends IService<CsDataSet> {
* @return
*/
List<LineTargetVO> getDataSet(String modelId,Integer clDev);
/**
* 获取子模块数据集
* @param modelId 模板id
* @return
*/
List<CsDataSet> getModuleDataSet(String modelId);
}

5
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java
View File

@@ -36,4 +36,9 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
return this.baseMapper.getDataSet(modelId,clDev);
}
@Override
public List<CsDataSet> getModuleDataSet(String modelId) {
return this.lambdaQuery().eq(CsDataSet::getPid,modelId).ne(CsDataSet::getClDev,0).list();
}
}

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -255,9 +255,9 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
}
@Override
public void updateSoftInfoBynDid(String nDid, String id) {
public void updateSoftInfoBynDid(String nDid, String id, Integer module) {
LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getSoftinfoId,id).eq(CsEquipmentDeliveryPO::getNdid,nDid);
lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getSoftinfoId,id).set(CsEquipmentDeliveryPO::getModuleNumber,module).eq(CsEquipmentDeliveryPO::getNdid,nDid);
this.update(lambdaUpdateWrapper);
}