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

移动代码

Browse Source
This commit is contained in:
huangzj
2023-06-02 08:49:14 +08:00
parent 1f2e8005dc
commit bf2a0ea480
38 changed files with 1122 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java
View File

@@ -48,8 +48,8 @@ public class CslineController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryLineByDevId")
@ApiOperation("项目查询通过id获取")
@ApiImplicitParam(name = "id", value = "项目id集合", required = true)
@ApiOperation("项目查询通过设备id获取")
@ApiImplicitParam(name = "id", value = "设备id集合", required = true)
public HttpResult<List<CsLinePO>> queryLineByDevId(@RequestParam String id){
String methodDescribe = getMethodDescribe("queryLineByDevId");
List<CsLinePO> csLinePOS = csLinePOService.queryByDevId(id);

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppTopologyController.java
View File

@@ -47,11 +47,11 @@ public class AppTopologyController extends BaseController {
@PostMapping("/addAppTopologyDiagram")
@ApiOperation("新增拓扑图")
// @ApiImplicitParam(name = "appTopologyDiagramAddParm", value = "新增项目参数", required = true)
public HttpResult<Boolean> addAppTopologyDiagram(@Validated AppTopologyDiagramAddParm appTopologyDiagramAddParm){
public HttpResult<AppTopologyDiagramVO> addAppTopologyDiagram(@Validated AppTopologyDiagramAddParm appTopologyDiagramAddParm){
String methodDescribe = getMethodDescribe("addAppTopologyDiagram");
Boolean flag = appTopologyDiagramService.addAppTopologyDiagram(appTopologyDiagramAddParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
AppTopologyDiagramVO vo = appTopologyDiagramService.addAppTopologyDiagram(appTopologyDiagramAddParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
}

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

@@ -37,7 +37,8 @@
a.id projectId,
a.name projectName,
b.id equipmentId,
b.name equipmentName
b.name equipmentName,
c.create_time createTime
FROM cs_project a,
cs_equipment_delivery b,
cs_project_equipment c,

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

@@ -28,8 +28,8 @@ public interface AppTopologyDiagramService extends IService<AppTopologyDiagramPO
* @return: java.lang.Boolean
* @Author: clam
* @Date: 2023/3/27
*/
Boolean addAppTopologyDiagram(AppTopologyDiagramAddParm appTopologyDiagramAddParm);
*/
AppTopologyDiagramVO addAppTopologyDiagram(AppTopologyDiagramAddParm appTopologyDiagramAddParm);
/**
* @Description: AuditAppTopologyDiagram
* @Param: [appTopologyDiagramAuditParm]

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

@@ -48,7 +48,7 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
private final AppTopologyDiagramMapper appTopologyDiagramMapper;
@Override
@Transactional(rollbackFor = {Exception.class})
public Boolean addAppTopologyDiagram(AppTopologyDiagramAddParm appTopologyDiagramAddParm) {
public AppTopologyDiagramVO addAppTopologyDiagram(AppTopologyDiagramAddParm appTopologyDiagramAddParm) {
AppTopologyDiagramPO appTopologyDiagramPO = new AppTopologyDiagramPO();
MultipartFile file = appTopologyDiagramAddParm.getFile ( );
@@ -58,7 +58,9 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
appTopologyDiagramPO.setName (appTopologyDiagramAddParm.getTopologyDiagramName ());
appTopologyDiagramPO.setStatus ("1");
boolean save = this.save (appTopologyDiagramPO);
return save;
AppTopologyDiagramVO vo = new AppTopologyDiagramVO();
BeanUtils.copyProperties(appTopologyDiagramPO, vo);
return vo;
}
@Override
@@ -92,7 +94,9 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
queryWrapper.eq ("status","1").
eq (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getId ()),"id",appTopologyDiagramAuditParm.getId ()).
eq (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getProjectId ()),"project_id",appTopologyDiagramAuditParm.getProjectId ()).
like (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getName ()),"name", appTopologyDiagramAuditParm.getName ());
like (StringUtils.isNotBlank (appTopologyDiagramAuditParm.getName ()),"name", appTopologyDiagramAuditParm.getName ()).
orderByDesc("create_time");
List<AppTopologyDiagramPO> list = this.list (queryWrapper);
List<AppTopologyDiagramVO> collect = list.stream ( ).map (temp -> {
@@ -105,6 +109,7 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
return vo;
}).collect (Collectors.toList ( ));
return collect;
}
@Override
@@ -116,7 +121,9 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
QueryWrapper<AppTopologyDiagramPO> queryWrapper = new QueryWrapper<> ();
queryWrapper.eq ("status","1").
eq (StringUtils.isNotBlank (appTopologyDiagramQueryPageParm.getProjectId ()),"project_id",appTopologyDiagramQueryPageParm.getProjectId ()).
like (StringUtils.isNotBlank (appTopologyDiagramQueryPageParm.getSearchValue ()),"name", appTopologyDiagramQueryPageParm.getSearchValue ());
like (StringUtils.isNotBlank (appTopologyDiagramQueryPageParm.getSearchValue ()),"name", appTopologyDiagramQueryPageParm.getSearchValue ()).
orderByDesc("create_time");
tempPage = appTopologyDiagramMapper.selectPage (tempPage, queryWrapper);
List<AppTopologyDiagramVO> collect = tempPage.getRecords ( ).stream ( ).map (temp -> {
AppTopologyDiagramVO vo = new AppTopologyDiagramVO ( );
@@ -128,6 +135,7 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
return vo;
}).collect (Collectors.toList ( ));
returnpage.setRecords (collect);
returnpage.setTotal(tempPage.getTotal());
return returnpage;
}
}

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

@@ -79,6 +79,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
vo.setCityName (this.getAreaById (vo.getCity ()));
return vo;
}).collect(Collectors.toList());
return csEngineeringVOList;
}
@@ -102,6 +103,8 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
return vo;
}).collect (Collectors.toList ( ));
returnPage.setRecords (collect);
returnPage.setTotal(tempPage.getTotal());
return returnPage;
}

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

@@ -82,6 +82,8 @@ public class CsEquipmentAlarmPOServiceImpl extends ServiceImpl<CsEquipmentAlarmP
return csEquipmentAlarmVO;
}).collect(Collectors.toList());
returnpage.setRecords(collect);
returnpage.setTotal(queryPage.getTotal());
return returnpage;
}

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

@@ -1,5 +1,6 @@
package com.njcn.csdevice.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.csdevice.mapper.CsEquipmentTransferPOMapper;
@@ -11,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import springfox.documentation.spring.web.json.Json;
import java.util.List;
@@ -34,7 +36,8 @@ public class CsEquipmentTransferPOServiceImpl extends ServiceImpl<CsEquipmentTra
BeanUtils.copyProperties(csEquipmentTransferAddParm, csEquipmentTransferPO);
csEquipmentTransferPO.setStatus(DataStateEnum.ENABLE.getCode());
boolean save = this.save(csEquipmentTransferPO);
log.info("插入成功");
log.info("插入成功"+JSON.toJSONString(csEquipmentTransferPO));
return save;
}