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

代码优化

Browse Source
This commit is contained in:
xy
2026-04-08 10:19:06 +08:00
parent 445f27143b
commit 45fd613e47
6 changed files with 7 additions and 42 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/EquipmentFeignClient.java
View File

@@ -51,9 +51,6 @@ public interface EquipmentFeignClient {
@PostMapping("/updateModuleNumber")
HttpResult<String> updateModuleNumber(@RequestParam("nDid") String nDid,@RequestParam("number") Integer number);
@PostMapping("/updateLedger")
HttpResult<String> updateLedger(@RequestParam("nDid") String nDid,@RequestParam("engineeringId") String engineeringId,@RequestParam("projectId") String projectId);
@PostMapping("/getAll")
HttpResult<List<CsEquipmentDeliveryPO>> getAll();

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

@@ -72,12 +72,6 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory<Equi
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<String> updateLedger(String nDid, String engineeringId, String projectId) {
log.error("{}异常，降级处理，异常为：{}","更新设备预设工程和项目id数据异常",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<CsEquipmentDeliveryPO>> getAll() {
log.error("{}异常，降级处理，异常为：{}","获取所有装置",cause.toString());

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

@@ -303,20 +303,6 @@ public class EquipmentDeliveryController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/updateLedger")
@ApiOperation("更新设备预设工程和项目id")
@ApiImplicitParams({
@ApiImplicitParam(name = "nDid", value = "网络设备码", required = true),
@ApiImplicitParam(name = "engineeringId", value = "工程id", required = true),
@ApiImplicitParam(name = "projectId", value = "项目id", required = true)
})
public HttpResult<String> updateLedger(@RequestParam("nDid") String nDid,@RequestParam("engineeringId") String engineeringId,@RequestParam("projectId") String projectId){
String methodDescribe = getMethodDescribe("updateLedger");
csEquipmentDeliveryService.updateLedger(nDid,engineeringId,projectId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/rebootDevice")
@ApiOperation("重启设备")

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

@@ -11,7 +11,6 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
import com.njcn.csdevice.pojo.vo.DeviceManagerVO;
import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -122,8 +121,6 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
*/
void updateModuleNumber(String nDid, Integer number);
void updateLedger(String nDid,String engineeringId,String projectId);
boolean rebootDevice(String nDid);
/**

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

@@ -759,20 +759,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
}
}
@Override
public void updateLedger(String nDid,String engineeringId,String projectId) {
boolean result;
LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(CsEquipmentDeliveryPO::getNdid,nDid)
.ne(CsEquipmentDeliveryPO::getRunStatus,0)
.set(CsEquipmentDeliveryPO::getAssociatedEngineering,engineeringId)
.set(CsEquipmentDeliveryPO::getAssociatedProject,projectId);
result = this.update(lambdaUpdateWrapper);
if (result) {
refreshDeviceDataCache();
}
}
@Override
public boolean rebootDevice(String nDid) {
boolean result = false;

9
cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java
View File

@@ -221,8 +221,13 @@ public class CsAppReportServiceImpl extends ServiceImpl<CsAppReportMapper, CsApp
vo.setEventNums(item.getEventList().split(",").length);
vo.setFilePath(item.getFilePath());
vo.setIsComplete(Objects.isNull(item.getFilePath()) ? 0 : 1);
vo.setApplyUser(userVO.getName());
String applyUser = item.getCreateBy();
if (applyUser != null && !applyUser.isEmpty()) {
UserVO applyUserVo = userFeignClient.getUserById(applyUser).getData();
vo.setApplyUser(Objects.isNull(applyUserVo)? null : applyUserVo.getName());
} else {
vo.setApplyUser(null);
}
CsLinePO linePO = csLineFeignClient.getById(item.getLineId()).getData();
DevDetailDTO devDetailDTO = csLedgerFeignClient.queryDevDetail(linePO.getDeviceId()).getData();
vo.setLineName(linePO.getName());