From eff17602443f2a4d64f66d1c2e81736b593ea8f8 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 3 Mar 2026 17:45:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=88=B9=E6=9C=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ship/dto/UpdateLngMeaPurIntDto.java | 52 ++++---- .../ship/dto/UpdateLngOpsPurIntDto.java | 32 ++--- .../ship/dto/UpdateLngOpsSalesIntDto.java | 31 ++--- .../ship/dto/UpdateLngShipScheduleDto.java | 9 ++ .../module/ship/vo/LngMeaPurIntVo.java | 3 +- .../module/ship/vo/LngOpsPurIntVo.java | 3 +- .../module/ship/vo/LngOpsSalesIntVo.java | 7 +- .../module/ship/vo/LngShipScheduleVo.java | 17 ++- .../ship/controller/MeaPurIntController.java | 8 +- .../ship/controller/OpsPurIntController.java | 47 ++++--- .../controller/OpsSalesIntController.java | 6 +- .../controller/ShipScheduleController.java | 117 ++++++++++++++++++ .../ship/service/IMeaPurIntService.java | 8 +- .../ship/service/IOpsPurIntService.java | 8 +- .../ship/service/IOpsSalesIntService.java | 8 +- .../ship/service/IShipScheduleService.java | 8 +- .../service/impl/MeaPurIntServiceImpl.java | 35 ++++-- .../service/impl/OpsPurIntServiceImpl.java | 33 +++-- .../service/impl/OpsSalesIntServiceImpl.java | 35 ++++-- .../service/impl/ShipScheduleServiceImpl.java | 22 ++++ 20 files changed, 342 insertions(+), 147 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngMeaPurIntDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngMeaPurIntDto.java index 3210662..0643c57 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngMeaPurIntDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngMeaPurIntDto.java @@ -1,22 +1,16 @@ package com.xjrsoft.module.ship.dto; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +import com.pictc.annotations.datalog.LogAttrField; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.List; - -import com.pictc.annotations.datalog.LogTable; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogJoin; -import com.pictc.annotations.datalog.LogJoinColumn; -import com.pictc.annotations.datalog.JoinCaseType; -import com.pictc.annotations.datalog.JoinType; -import com.pictc.annotations.datalog.ValueDirectionType; @@ -50,7 +44,7 @@ public class UpdateLngMeaPurIntDto implements Serializable { /** * 计量类型(L-装载计量/U-卸载计量) */ - @LogField(name="计量类型(L-装载计量/U-卸载计量)",index=2) + @LogField(name="计量类型",index=2) @ApiModelProperty("计量类型(L-装载计量/U-卸载计量)") private String typeCode; @@ -64,63 +58,63 @@ public class UpdateLngMeaPurIntDto implements Serializable { /** * 热值（MMBtu） */ - @LogField(name="热值（MMBtu）",index=4) + @LogField(name="热值",index=4) @ApiModelProperty("热值（MMBtu）") private BigDecimal qtyMmbtu; /** * 热值（GJ） */ - @LogField(name="热值（GJ）",index=5) + @LogField(name="热值",index=5) @ApiModelProperty("热值（GJ）") private BigDecimal qtyGj; /** * 重量（吨） */ - @LogField(name="重量（吨）",index=6) + @LogField(name="重量",index=6) @ApiModelProperty("重量（吨）") private BigDecimal qtyTon; /** * 液态体积（方） */ - @LogField(name="液态体积（方）",index=7) + @LogField(name="液态体积",index=7) @ApiModelProperty("液态体积（方）") private BigDecimal qtyM3L; /** * 气态体积（方） */ - @LogField(name="气态体积（方）",index=8) + @LogField(name="气态体积",index=8) @ApiModelProperty("气态体积（方）") private BigDecimal qtyM3; /** * 密度(吨/液态方) */ - @LogField(name="密度(吨/液态方)",index=9) + @LogField(name="密度",index=9) @ApiModelProperty("密度(吨/液态方)") private BigDecimal rateTonM3L; /** * 热值比(吨/GJ) */ - @LogField(name="热值比(吨/GJ)",index=10) + @LogField(name="热值比",index=10) @ApiModelProperty("热值比(吨/GJ)") private BigDecimal rateTonGj; /** * 热值比(气态方/GJ) */ - @LogField(name="热值比(气态方/GJ)",index=11) + @LogField(name="热值比",index=11) @ApiModelProperty("热值比(气态方/GJ)") private BigDecimal rateM3Gj; /** * 气化率(吨/气态方) */ - @LogField(name="气化率(吨/气态方)",index=12) + @LogField(name="气化率",index=12) @ApiModelProperty("气化率(吨/气态方)") private BigDecimal rateTonM3; @@ -134,7 +128,7 @@ public class UpdateLngMeaPurIntDto implements Serializable { /** * 来源(接收站发送数据表主键；非空时记录不可修改删除) */ - @LogField(name="来源(接收站发送数据表主键；非空时记录不可修改删除)",index=14) + @LogField(name="来源",index=14) @ApiModelProperty("来源(接收站发送数据表主键；非空时记录不可修改删除)") private String dataSource; @@ -152,5 +146,11 @@ public class UpdateLngMeaPurIntDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List fileList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngOpsPurIntDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngOpsPurIntDto.java index 7e0e54a..d51e18f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngOpsPurIntDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngOpsPurIntDto.java @@ -1,22 +1,17 @@ package com.xjrsoft.module.ship.dto; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import com.pictc.annotations.datalog.LogAttrField; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.List; - -import com.pictc.annotations.datalog.LogTable; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogJoin; -import com.pictc.annotations.datalog.LogJoinColumn; -import com.pictc.annotations.datalog.JoinCaseType; -import com.pictc.annotations.datalog.JoinType; -import com.pictc.annotations.datalog.ValueDirectionType; @@ -509,5 +504,10 @@ public class UpdateLngOpsPurIntDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; - + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List fileList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngOpsSalesIntDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngOpsSalesIntDto.java index 3191fa3..1f260a6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngOpsSalesIntDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngOpsSalesIntDto.java @@ -1,22 +1,17 @@ package com.xjrsoft.module.ship.dto; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import com.pictc.annotations.datalog.LogAttrField; +import com.pictc.annotations.datalog.LogField; +import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.List; - -import com.pictc.annotations.datalog.LogTable; -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogJoin; -import com.pictc.annotations.datalog.LogJoinColumn; -import com.pictc.annotations.datalog.JoinCaseType; -import com.pictc.annotations.datalog.JoinType; -import com.pictc.annotations.datalog.ValueDirectionType; @@ -481,5 +476,11 @@ public class UpdateLngOpsSalesIntDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List fileList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngShipScheduleDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngShipScheduleDto.java index 43c27dc..6bc3163 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngShipScheduleDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/dto/UpdateLngShipScheduleDto.java @@ -16,7 +16,9 @@ import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogAttrField; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; @@ -327,5 +329,12 @@ public class UpdateLngShipScheduleDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List fileList; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java index 6848624..3a2cf84 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java @@ -13,6 +13,7 @@ import java.math.BigDecimal; import java.util.List; import com.xjrsoft.module.ship.dto.AddLngMeaPurIntDto; +import com.xjrsoft.module.system.vo.LngFileUploadVo; /** * @title: 表单出参 @@ -183,7 +184,7 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("数据权限id") private Long ruleUserId; - + List fileList ; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java index 181c63e..140e59f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java @@ -13,6 +13,7 @@ import java.math.BigDecimal; import java.util.List; import com.xjrsoft.module.ship.dto.AddLngMeaPurIntDto; +import com.xjrsoft.module.system.vo.LngFileUploadVo; /** * @title: 表单出参 @@ -541,7 +542,7 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ private Long ruleUserId; - + List fileList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java index a665838..4b932d6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java @@ -2,6 +2,9 @@ package com.xjrsoft.module.ship.vo; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; + +import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -505,7 +508,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ private Long ruleUserId; - - + List fileList; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngShipScheduleVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngShipScheduleVo.java index eb34ae1..3a34c63 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngShipScheduleVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngShipScheduleVo.java @@ -1,16 +1,13 @@ package com.xjrsoft.module.ship.vo; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +import com.xjrsoft.module.system.vo.LngFileUploadVo; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** * @title: 表单出参 @@ -357,7 +354,7 @@ public class LngShipScheduleVo extends com.xjrsoft.common.model.base.BaseModel{ private Long ruleUserId; - + private List fileList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/MeaPurIntController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/MeaPurIntController.java index fcd1169..3cf5c3d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/MeaPurIntController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/MeaPurIntController.java @@ -84,11 +84,7 @@ public class MeaPurIntController { @ApiOperation(value="根据id查询LngMeaPurInt信息") @SaCheckPermission("meaPurInt:detail") public R info(@RequestParam Long id){ - LngMeaPurInt lngMeaPurInt = meaPurIntService.getById(id); - if (lngMeaPurInt == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngMeaPurInt, LngMeaPurIntVo.class)); + return R.ok(meaPurIntService.getMeaPurIntById(id)); } @GetMapping(value = "/datalog") @@ -119,7 +115,7 @@ public class MeaPurIntController { @ApiOperation(value = "删除") @SaCheckPermission("meaPurInt:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngMeaPurIntDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngMeaPurIntDto.class, ids)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/OpsPurIntController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/OpsPurIntController.java index cb8d054..42f8364 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/OpsPurIntController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/OpsPurIntController.java @@ -1,36 +1,38 @@ package com.xjrsoft.module.ship.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.xjrsoft.common.constant.GlobalConstant; -import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; -import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.ship.dto.AddLngOpsPurIntDto; -import com.xjrsoft.module.ship.dto.UpdateLngOpsPurIntDto; -import cn.dev33.satoken.annotation.SaCheckPermission; - +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.ship.dto.LngOpsPurIntPageDto; +import com.xjrsoft.module.ship.dto.UpdateLngOpsPurIntDto; import com.xjrsoft.module.ship.entity.LngOpsPurInt; import com.xjrsoft.module.ship.service.IOpsPurIntService; import com.xjrsoft.module.ship.vo.LngOpsPurIntPageVo; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.ship.vo.LngOpsPurIntVo; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.List; /** * @title: 采购执行 @@ -75,11 +77,8 @@ public class OpsPurIntController { @ApiOperation(value="根据id查询LngOpsPurInt信息") @SaCheckPermission("opsPurInt:detail") public R info(@RequestParam Long id){ - LngOpsPurInt lngOpsPurInt = opsPurIntService.getById(id); - if (lngOpsPurInt == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngOpsPurInt, LngOpsPurIntVo.class)); + + return R.ok(opsPurIntService.getOpsPurIntById(id)); } @GetMapping(value = "/datalog") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/OpsSalesIntController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/OpsSalesIntController.java index 14c18e5..b5a5d0e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/OpsSalesIntController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/OpsSalesIntController.java @@ -74,11 +74,7 @@ public class OpsSalesIntController { @ApiOperation(value="根据id查询LngOpsSalesInt信息") @SaCheckPermission("opsSalesInt:detail") public R info(@RequestParam Long id){ - LngOpsSalesInt lngOpsSalesInt = opsSalesIntService.getById(id); - if (lngOpsSalesInt == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngOpsSalesInt, LngOpsSalesIntVo.class)); + return R.ok(opsSalesIntService.getOpsSalesIntById(id)); } @GetMapping(value = "/datalog") diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java new file mode 100644 index 0000000..0e9e8ec --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/controller/ShipScheduleController.java @@ -0,0 +1,117 @@ +package com.xjrsoft.module.ship.controller; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.ship.dto.AddLngShipScheduleDto; +import com.xjrsoft.module.ship.dto.UpdateLngShipScheduleDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.ship.dto.LngShipSchedulePageDto; +import com.xjrsoft.module.ship.entity.LngShipSchedule; +import com.xjrsoft.module.ship.service.IShipScheduleService; +import com.xjrsoft.module.ship.vo.LngShipSchedulePageVo; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.ship.vo.LngShipScheduleVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** +* @title: 船期计划排布 +* @Author 管理员 +* @Date: 2026-03-03 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/ship" + "/shipSchedule") +@Api(value = "/ship" + "/shipSchedule",tags = "船期计划排布代码") +@AllArgsConstructor +public class ShipScheduleController { + + + private final IShipScheduleService shipScheduleService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngShipSchedule列表(分页)") + @SaCheckPermission("shipSchedule:list") + public R page(@Valid LngShipSchedulePageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .eq(ObjectUtil.isNotNull(dto.getId()),LngShipSchedule::getId,dto.getId()) + .like(StrUtil.isNotBlank(dto.getSsNo()),LngShipSchedule::getSsNo,dto.getSsNo()) + .eq(ObjectUtil.isNotNull(dto.getKId()),LngShipSchedule::getKId,dto.getKId()) + .like(StrUtil.isNotBlank(dto.getLongSpotCode()),LngShipSchedule::getLongSpotCode,dto.getLongSpotCode()) + .eq(ObjectUtil.isNotNull(dto.getComId()),LngShipSchedule::getComId,dto.getComId()) + //.between(ObjectUtil.isNotNull(dto.getDateEtaStart()) && ObjectUtil.isNotNull(dto.getDateEtaEnd()),LngShipSchedule::getDateEta,dto.getDateEtaStart(),dto.getDateEtaEnd()) + .like(StrUtil.isNotBlank(dto.getStaCode()),LngShipSchedule::getStaCode,dto.getStaCode()) + .like(StrUtil.isNotBlank(dto.getSuName()),LngShipSchedule::getSuName,dto.getSuName()) + .like(StrUtil.isNotBlank(dto.getSsTypeCode()),LngShipSchedule::getSsTypeCode,dto.getSsTypeCode()) + .eq(ObjectUtil.isNotNull(dto.getOpsPurId()),LngShipSchedule::getOpsPurId,dto.getOpsPurId()) + .eq(ObjectUtil.isNotNull(dto.getOpsSalesId()),LngShipSchedule::getOpsSalesId,dto.getOpsSalesId()) + .orderByDesc(LngShipSchedule::getId) + .select(LngShipSchedule.class,x -> VoToColumnUtil.fieldsToColumns(LngShipSchedulePageVo.class).contains(x.getProperty())); + IPage page = shipScheduleService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngShipSchedulePageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngShipSchedule信息") + @SaCheckPermission("shipSchedule:detail") + public R info(@RequestParam Long id){ + + return R.ok(shipScheduleService.getShipScheduleById(id)); + } + + @GetMapping(value = "/datalog") + @ApiOperation(value="根据id查询LngShipSchedule数据详细日志") + @SaCheckPermission("shipSchedule:datalog") + public R datalog(@RequestParam Long id){ + List logs = dataService.findLogsByEntityId(UpdateLngShipScheduleDto.class,id); + return R.ok(logs); + } + + + @PostMapping + @ApiOperation(value = "新增LngShipSchedule") + @SaCheckPermission("shipSchedule:add") + public R add(@Valid @RequestBody UpdateLngShipScheduleDto dto){ + UpdateLngShipScheduleDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngShipSchedule") + @SaCheckPermission("shipSchedule:edit") + public R update(@Valid @RequestBody UpdateLngShipScheduleDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("shipSchedule:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngShipScheduleDto.class, ids)); + + } + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IMeaPurIntService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IMeaPurIntService.java index 709ceb7..20ae4d1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IMeaPurIntService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IMeaPurIntService.java @@ -1,12 +1,8 @@ package com.xjrsoft.module.ship.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.yulichang.base.MPJBaseService; -import com.github.yulichang.extension.mapping.base.MPJDeepService; -import com.github.yulichang.extension.mapping.base.MPJRelationService; import com.xjrsoft.module.ship.entity.LngMeaPurInt; -import lombok.Data; -import java.util.List; +import com.xjrsoft.module.ship.vo.LngMeaPurIntVo; /** * @title: service @@ -16,4 +12,6 @@ import java.util.List; */ public interface IMeaPurIntService extends IService { + + LngMeaPurIntVo getMeaPurIntById(Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IOpsPurIntService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IOpsPurIntService.java index 795b876..1a90267 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IOpsPurIntService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IOpsPurIntService.java @@ -1,12 +1,8 @@ package com.xjrsoft.module.ship.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.yulichang.base.MPJBaseService; -import com.github.yulichang.extension.mapping.base.MPJDeepService; -import com.github.yulichang.extension.mapping.base.MPJRelationService; import com.xjrsoft.module.ship.entity.LngOpsPurInt; -import lombok.Data; -import java.util.List; +import com.xjrsoft.module.ship.vo.LngOpsPurIntVo; /** * @title: service @@ -16,4 +12,6 @@ import java.util.List; */ public interface IOpsPurIntService extends IService { + + LngOpsPurIntVo getOpsPurIntById(Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IOpsSalesIntService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IOpsSalesIntService.java index 550d760..f29c013 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IOpsSalesIntService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IOpsSalesIntService.java @@ -1,12 +1,8 @@ package com.xjrsoft.module.ship.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.yulichang.base.MPJBaseService; -import com.github.yulichang.extension.mapping.base.MPJDeepService; -import com.github.yulichang.extension.mapping.base.MPJRelationService; import com.xjrsoft.module.ship.entity.LngOpsSalesInt; -import lombok.Data; -import java.util.List; +import com.xjrsoft.module.ship.vo.LngOpsSalesIntVo; /** * @title: service @@ -16,4 +12,6 @@ import java.util.List; */ public interface IOpsSalesIntService extends IService { + + LngOpsSalesIntVo getOpsSalesIntById(Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IShipScheduleService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IShipScheduleService.java index 32a62c6..d15b70e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IShipScheduleService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/IShipScheduleService.java @@ -1,12 +1,8 @@ package com.xjrsoft.module.ship.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.yulichang.base.MPJBaseService; -import com.github.yulichang.extension.mapping.base.MPJDeepService; -import com.github.yulichang.extension.mapping.base.MPJRelationService; import com.xjrsoft.module.ship.entity.LngShipSchedule; -import lombok.Data; -import java.util.List; +import com.xjrsoft.module.ship.vo.LngShipScheduleVo; /** * @title: service @@ -16,4 +12,6 @@ import java.util.List; */ public interface IShipScheduleService extends IService { + + LngShipScheduleVo getShipScheduleById(Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/MeaPurIntServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/MeaPurIntServiceImpl.java index e02f833..249342d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/MeaPurIntServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/MeaPurIntServiceImpl.java @@ -1,17 +1,23 @@ package com.xjrsoft.module.ship.service.impl; +import java.util.List; + +import org.springframework.stereotype.Service; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.ship.entity.LngMeaPurInt; +import com.xjrsoft.module.ship.entity.LngOpsPurInt; import com.xjrsoft.module.ship.mapper.LngMeaPurIntMapper; import com.xjrsoft.module.ship.service.IMeaPurIntService; +import com.xjrsoft.module.ship.vo.LngMeaPurIntVo; +import com.xjrsoft.module.ship.vo.LngOpsPurIntVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** * @title: service @@ -22,4 +28,19 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @Service @AllArgsConstructor public class MeaPurIntServiceImpl extends ServiceImpl implements IMeaPurIntService { + + private final IFileClient fileClient; + + @Override + public LngMeaPurIntVo getMeaPurIntById(Long id) { + LngMeaPurInt lngMeaPurInt = this.getById(id); + if (lngMeaPurInt == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + LngMeaPurIntVo vo = BeanUtil.toBean(lngMeaPurInt, LngMeaPurIntVo.class); + List fileList = fileClient.getTableFiles("lng_mea_pur_int", "fileList", vo.getId()); + vo.setFileList(fileList); + return vo; + } + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsPurIntServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsPurIntServiceImpl.java index 98d89ea..d3ba389 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsPurIntServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsPurIntServiceImpl.java @@ -1,17 +1,21 @@ package com.xjrsoft.module.ship.service.impl; +import java.util.List; + +import org.springframework.stereotype.Service; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.ship.entity.LngOpsPurInt; import com.xjrsoft.module.ship.mapper.LngOpsPurIntMapper; import com.xjrsoft.module.ship.service.IOpsPurIntService; +import com.xjrsoft.module.ship.vo.LngOpsPurIntVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** * @title: service @@ -22,4 +26,19 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @Service @AllArgsConstructor public class OpsPurIntServiceImpl extends ServiceImpl implements IOpsPurIntService { + + private final IFileClient fileClient; + + @Override + public LngOpsPurIntVo getOpsPurIntById(Long id) { + LngOpsPurInt lngOpsPurInt = this.getById(id); + if (lngOpsPurInt == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + LngOpsPurIntVo vo = BeanUtil.toBean(lngOpsPurInt, LngOpsPurIntVo.class); + List fileList = fileClient.getTableFiles("lng_ops_pur_int", "fileList", vo.getId()); + vo.setFileList(fileList); + return vo; + } + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsSalesIntServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsSalesIntServiceImpl.java index 24799cd..c77c63f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsSalesIntServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsSalesIntServiceImpl.java @@ -1,17 +1,23 @@ package com.xjrsoft.module.ship.service.impl; +import java.util.List; + +import org.springframework.stereotype.Service; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.ship.entity.LngOpsSalesInt; +import com.xjrsoft.module.ship.entity.LngShipSchedule; import com.xjrsoft.module.ship.mapper.LngOpsSalesIntMapper; import com.xjrsoft.module.ship.service.IOpsSalesIntService; +import com.xjrsoft.module.ship.vo.LngOpsSalesIntVo; +import com.xjrsoft.module.ship.vo.LngShipScheduleVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** * @title: service @@ -22,4 +28,19 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @Service @AllArgsConstructor public class OpsSalesIntServiceImpl extends ServiceImpl implements IOpsSalesIntService { + + private final IFileClient fileClient; + + @Override + public LngOpsSalesIntVo getOpsSalesIntById(Long id) { + LngOpsSalesInt lngOpsSalesInt = this.getById(id); + if (lngOpsSalesInt == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + LngOpsSalesIntVo vo = BeanUtil.toBean(lngOpsSalesInt, LngOpsSalesIntVo.class); + List fileList = fileClient.getTableFiles("lng_ops_sales_int", "fileList", vo.getId()); + vo.setFileList(fileList); + return vo; + } + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/ShipScheduleServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/ShipScheduleServiceImpl.java index b7f02f7..aaa7a1f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/ShipScheduleServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/ShipScheduleServiceImpl.java @@ -1,12 +1,20 @@ package com.xjrsoft.module.ship.service.impl; +import java.util.List; + import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pictc.enums.BusinessCode; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.ship.entity.LngShipSchedule; import com.xjrsoft.module.ship.mapper.LngShipScheduleMapper; import com.xjrsoft.module.ship.service.IShipScheduleService; +import com.xjrsoft.module.ship.vo.LngShipScheduleVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; +import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; /** @@ -18,4 +26,18 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class ShipScheduleServiceImpl extends ServiceImpl implements IShipScheduleService { + + private final IFileClient fileClient; + + @Override + public LngShipScheduleVo getShipScheduleById(Long id) { + LngShipSchedule lngShipSchedule = this.getById(id); + if (lngShipSchedule == null) { + throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); + } + LngShipScheduleVo vo = BeanUtil.toBean(lngShipSchedule, LngShipScheduleVo.class); + List fileList = fileClient.getTableFiles("lng_ship_schedule", "fileList", vo.getId()); + vo.setFileList(fileList); + return vo; + } }