drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdOperationalRevenueController.java
File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/OperationalRevenueController.java @@ -5,13 +5,14 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.secure.utils.AuthUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.sxkj.common.model.ResponseResult; import org.sxkj.gd.workOrder.entity.OperationalRevenue; import org.sxkj.gd.workOrder.service.OperationalRevenueService; import org.sxkj.gd.workOrder.vo.OperationalRevenueVo; import org.sxkj.gd.workOrder.entity.GdOperationalRevenue; import org.sxkj.gd.workOrder.service.GdOperationalRevenueService; import org.sxkj.gd.workOrder.vo.GdOperationalRevenueVo; import java.time.LocalDateTime; import java.util.List; @@ -22,11 +23,11 @@ */ @Api(tags = "运营收益管理") @RestController @AllArgsConstructor @RequestMapping("/revenue") public class OperationalRevenueController { public class GdOperationalRevenueController { @Autowired private OperationalRevenueService operationalRevenueService; private final GdOperationalRevenueService operationalRevenueService; /** * 分页查询运营收益 @@ -43,11 +44,11 @@ @ApiParam("市场空间") @RequestParam(value = "marketSpace", required = false) String marketSpace, @ApiParam("创建人") @RequestParam(value = "nickName", required = false) String nickName ) { Page<OperationalRevenue> page = new Page<>(current, size); IPage<OperationalRevenue> result = operationalRevenueService.selectPage(page, operatingIncome, totalCost, netProfit, financialIrr, marketSpace, nickName); Page<GdOperationalRevenue> page = new Page<>(current, size); IPage<GdOperationalRevenue> result = operationalRevenueService.selectPage(page, operatingIncome, totalCost, netProfit, financialIrr, marketSpace, nickName); // 转换为Vo分页 IPage<OperationalRevenueVo> voPage = result.convert(operationalRevenueService::convertToVo); IPage<GdOperationalRevenueVo> voPage = result.convert(operationalRevenueService::convertToVo); return ResponseResult.success(voPage); } @@ -57,10 +58,10 @@ @ApiOperation("查询所有运营收益") @GetMapping("/list") public ResponseResult list() { List<OperationalRevenue> list = operationalRevenueService.list(); List<GdOperationalRevenue> list = operationalRevenueService.list(); // 转换为Vo列表 List<OperationalRevenueVo> voList = list.stream() List<GdOperationalRevenueVo> voList = list.stream() .map(operationalRevenueService::convertToVo) .collect(Collectors.toList()); return ResponseResult.success(voList); @@ -74,10 +75,10 @@ @ApiOperation("根据ID查询运营收益") @GetMapping("selectById/{id}") public ResponseResult getById(@ApiParam("主键ID") @PathVariable Long id) { OperationalRevenue operationalRevenue = operationalRevenueService.getById(id); GdOperationalRevenue operationalRevenue = operationalRevenueService.getById(id); // 转换为Vo对象 OperationalRevenueVo vo = operationalRevenueService.convertToVo(operationalRevenue); GdOperationalRevenueVo vo = operationalRevenueService.convertToVo(operationalRevenue); return ResponseResult.success(vo); } @@ -86,7 +87,7 @@ */ @ApiOperation("新增运营收益") @PostMapping("/add") public ResponseResult save(@RequestBody OperationalRevenue operationalRevenue) { public ResponseResult save(@RequestBody GdOperationalRevenue operationalRevenue) { operationalRevenue.setCreateUser(String.valueOf(AuthUtil.getUserId())); LocalDateTime now = LocalDateTime.now(); operationalRevenue.setCreateTime(now); @@ -103,7 +104,7 @@ */ @ApiOperation("修改运营收益") @PutMapping("update") public ResponseResult updateById(@RequestBody OperationalRevenue operationalRevenue) { public ResponseResult updateById(@RequestBody GdOperationalRevenue operationalRevenue) { LocalDateTime now = LocalDateTime.now(); operationalRevenue.setUpdateTime(now); operationalRevenue.setUpdateUser(String.valueOf(AuthUtil.getUserId())); drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/entity/GdOperationalRevenue.java
File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/entity/OperationalRevenue.java @@ -15,7 +15,7 @@ @Data @EqualsAndHashCode(callSuper = false) @TableName("ja_gd_operational_revenue") public class OperationalRevenue implements Serializable { public class GdOperationalRevenue implements Serializable { private static final long serialVersionUID = 1L;
New file @@ -0,0 +1,13 @@ package org.sxkj.gd.workOrder.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.sxkj.gd.workOrder.entity.GdOperationalRevenue; /** * 运营收益Mapper接口 */ @Mapper public interface GdOperationalRevenueMapper extends BaseMapper<GdOperationalRevenue> { } drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/mapper/OperationalRevenueMapper.java
File was deleted drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/GdOperationalRevenueService.java
New file @@ -0,0 +1,33 @@ package org.sxkj.gd.workOrder.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.sxkj.gd.workOrder.entity.GdOperationalRevenue; import org.sxkj.gd.workOrder.vo.GdOperationalRevenueVo; /** * 运营收益Service接口 */ public interface GdOperationalRevenueService extends IService<GdOperationalRevenue> { /** * 分页查询运营收益 * @param page 分页参数 * @param operatingIncome 营业收入 * @param totalCost 综合总成本费用 * @param netProfit 净利润 * @param financialIrr 财务内部收益率 * @param marketSpace 市场空间 * @param nickName 创建人 * @return 分页结果 */ IPage<GdOperationalRevenue> selectPage(Page<GdOperationalRevenue> page, String operatingIncome, String totalCost, String netProfit, String financialIrr, String marketSpace, String nickName); /** * 实体类转换Vo * @param entity 实体对象 * @return Vo对象 */ GdOperationalRevenueVo convertToVo(GdOperationalRevenue entity); } drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/OperationalRevenueService.java
File was deleted drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/impl/GdOperationalRevenueServiceImpl.java
New file @@ -0,0 +1,94 @@ package org.sxkj.gd.workOrder.service.impl; import com.alibaba.nacos.common.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.sxkj.gd.workOrder.entity.GdOperationalRevenue; import org.sxkj.gd.workOrder.mapper.GdOperationalRevenueMapper; import org.sxkj.gd.workOrder.service.GdOperationalRevenueService; import org.sxkj.gd.workOrder.vo.GdOperationalRevenueVo; import java.math.BigDecimal; /** * 运营收益Service实现类 */ @Service public class GdOperationalRevenueServiceImpl extends ServiceImpl<GdOperationalRevenueMapper, GdOperationalRevenue> implements GdOperationalRevenueService { @Override public IPage<GdOperationalRevenue> selectPage(Page<GdOperationalRevenue> page, String operatingIncome, String totalCost, String netProfit, String financialIrr, String marketSpace, String nickName) { LambdaQueryWrapper<GdOperationalRevenue> queryWrapper = new LambdaQueryWrapper<>(); // 根据营业收入查询 (转换为精确查询) if (StringUtils.hasText(operatingIncome)) { try { queryWrapper.eq(GdOperationalRevenue::getOperatingIncome, new BigDecimal(operatingIncome)); } catch (NumberFormatException e) { // 如果转换失败，可以忽略或记录日志 } } // 根据综合总成本费用查询 (转换为精确查询) if (StringUtils.hasText(totalCost)) { try { queryWrapper.eq(GdOperationalRevenue::getTotalCost, new BigDecimal(totalCost)); } catch (NumberFormatException e) { // } } // 根据净利润查询 (转换为精确查询) if (StringUtils.hasText(netProfit)) { try { queryWrapper.eq(GdOperationalRevenue::getNetProfit, new BigDecimal(netProfit)); } catch (NumberFormatException e) { // } } // 根据财务内部收益率查询 (转换为精确查询) if (StringUtils.hasText(financialIrr)) { try { queryWrapper.eq(GdOperationalRevenue::getFinancialIrr, new BigDecimal(financialIrr)); } catch (NumberFormatException e) { // } } // 根据市场空间模糊查询 if (StringUtils.hasText(marketSpace)) { queryWrapper.like(GdOperationalRevenue::getMarketSpace, marketSpace); } // 根据创建人名称模糊查询 if (StringUtils.hasText(nickName)) { queryWrapper.like(GdOperationalRevenue::getNickName, nickName); } // 按创建时间倒序 queryWrapper.orderByDesc(GdOperationalRevenue::getCreateTime); return this.page(page, queryWrapper); } @Override public GdOperationalRevenueVo convertToVo(GdOperationalRevenue entity) { GdOperationalRevenueVo vo = new GdOperationalRevenueVo(); vo.setId(String.valueOf(entity.getId())); vo.setOperatingIncome(entity.getOperatingIncome()); vo.setTotalCost(entity.getTotalCost()); vo.setNetProfit(entity.getNetProfit()); vo.setFinancialIrr(entity.getFinancialIrr()); vo.setMarketSpace(entity.getMarketSpace()); vo.setEarnForecast(entity.getEarnForecast()); vo.setNickName(entity.getNickName()); vo.setCreateTime(entity.getCreateTime()); return vo; } } drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/service/impl/OperationalRevenueServiceImpl.java
File was deleted drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/vo/GdOperationalRevenueVo.java
File was renamed from drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/vo/OperationalRevenueVo.java @@ -9,7 +9,7 @@ * 运营收益视图对象 */ @Data public class OperationalRevenueVo { public class GdOperationalRevenueVo { private String id; private BigDecimal operatingIncome; private BigDecimal totalCost;
