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 9e7a6d5..7384886 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 @@ -222,7 +222,7 @@ public class UpdateLngOpsPurIntDto implements Serializable { */ @LogField(name="币种",index=27) @ApiModelProperty("币种") - private String currCode; + private String curCode; /** * 汇率 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 0b4364f..54aaa21 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 @@ -222,7 +222,7 @@ public class UpdateLngOpsSalesIntDto implements Serializable { */ @LogField(name="币种",index=27) @ApiModelProperty("币种") - private String currCode; + private String curCode; /** * 汇率 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 a54348b..780b277 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 @@ -243,7 +243,7 @@ public class UpdateLngShipScheduleDto implements Serializable { */ @LogField(name="币种",index=29) @ApiModelProperty("币种") - private String currCode; + private String curCode; /** * 汇率 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntPageVo.java index aa114aa..8ff9e02 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntPageVo.java @@ -1,15 +1,10 @@ package com.xjrsoft.module.ship.vo; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.LocalDateTime; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; - /** * @title: 分页列表出参 * @Author 管理员 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 649f4c5..13fa1ca 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 @@ -211,7 +211,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ * 币种 */ @ApiModelProperty("币种") - private String currCode; + private String curCode; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngShipSchedulePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngShipSchedulePageVo.java index 56de6f5..2568fd9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngShipSchedulePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngShipSchedulePageVo.java @@ -1,15 +1,10 @@ package com.xjrsoft.module.ship.vo; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.LocalDateTime; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; - /** * @title: 分页列表出参 * @Author 管理员 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 e0adbbc..4e222bb 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 @@ -235,10 +235,10 @@ public class LngShipScheduleVo extends com.xjrsoft.common.model.base.BaseModel{ * 币种 */ @ApiModelProperty("币种") - @Trans(type = TransType.CURRENCY, transToFieldName = "currName") - private String currCode; + @Trans(type = TransType.CURRENCY, transToFieldName = "curName") + private String curCode; - private String currName; + private String curName; /** * 汇率 */ 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 42f8364..bfac4f0 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 @@ -15,6 +15,15 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.collect.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -23,6 +32,7 @@ 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.dto.UpdateLngOpsSalesIntDto; import com.xjrsoft.module.ship.entity.LngOpsPurInt; import com.xjrsoft.module.ship.service.IOpsPurIntService; import com.xjrsoft.module.ship.vo.LngOpsPurIntPageVo; @@ -94,22 +104,98 @@ public class OpsPurIntController { @ApiOperation(value = "新增LngOpsPurInt") @SaCheckPermission("opsPurInt:add") public R add(@Valid @RequestBody UpdateLngOpsPurIntDto dto){ - UpdateLngOpsPurIntDto res = dataService.insert(dto); - return R.ok(res.getId()); + + return R.ok(dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngOpsPurIntDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngOpsPurIntDto after(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?,?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + if(dto.getId() == null) { + params.add(JdbcParam.ofString("I")); + }else { + params.add(JdbcParam.ofString("U")); + } + + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + })); } @PutMapping @ApiOperation(value = "修改LngOpsPurInt") @SaCheckPermission("opsPurInt:edit") public R update(@Valid @RequestBody UpdateLngOpsPurIntDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngOpsPurIntDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngOpsPurIntDto after(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?,?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + if(dto.getId() == null) { + params.add(JdbcParam.ofString("I")); + }else { + params.add(JdbcParam.ofString("U")); + } + + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + })); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("opsPurInt:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngOpsPurIntDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngOpsPurIntDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngOpsPurIntDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngOpsPurIntDto after(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + })); } 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 b5a5d0e..a13f0bf 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 @@ -1,36 +1,47 @@ 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.google.common.collect.Lists; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.enums.BusinessCode; +import com.pictc.enums.ExceptionCommonCode; +import com.pictc.jdbc.JdbcTools; +import com.pictc.jdbc.model.JdbcParam; +import com.pictc.utils.StringUtils; +import com.xjrsoft.common.exception.BusinessException; +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.AddLngOpsSalesIntDto; -import com.xjrsoft.module.ship.dto.UpdateLngOpsSalesIntDto; -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.LngOpsSalesIntPageDto; +import com.xjrsoft.module.ship.dto.UpdateLngOpsSalesIntDto; import com.xjrsoft.module.ship.entity.LngOpsSalesInt; import com.xjrsoft.module.ship.service.IOpsSalesIntService; import com.xjrsoft.module.ship.vo.LngOpsSalesIntPageVo; -import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.datalog.service.DatalogService; -import com.xjrsoft.module.ship.vo.LngOpsSalesIntVo; + +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: 销售执行 @@ -90,22 +101,102 @@ public class OpsSalesIntController { @ApiOperation(value = "新增LngOpsSalesInt") @SaCheckPermission("opsSalesInt:add") public R add(@Valid @RequestBody UpdateLngOpsSalesIntDto dto){ - UpdateLngOpsSalesIntDto res = dataService.insert(dto); - return R.ok(res.getId()); + + UpdateLngOpsSalesIntDto res = dataService.insert(dto,new DataOperationListener() { + + @Override + public UpdateLngOpsSalesIntDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngOpsSalesIntDto after(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?,?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + if(dto.getId() == null) { + params.add(JdbcParam.ofString("I")); + }else { + params.add(JdbcParam.ofString("U")); + } + + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + + return content.getObj(); + + } + }); + return R.ok(res); } @PutMapping @ApiOperation(value = "修改LngOpsSalesInt") @SaCheckPermission("opsSalesInt:edit") public R update(@Valid @RequestBody UpdateLngOpsSalesIntDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngOpsSalesIntDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngOpsSalesIntDto after(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_save(?,?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + if(dto.getId() == null) { + params.add(JdbcParam.ofString("I")); + }else { + params.add(JdbcParam.ofString("U")); + } + + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + })); } @DeleteMapping @ApiOperation(value = "删除") @SaCheckPermission("opsSalesInt:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngOpsSalesIntDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngOpsSalesIntDto.class, ids, new DataOperationListener() { + @Override + public UpdateLngOpsSalesIntDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngOpsSalesIntDto after(DataOperationContent content) { + String sql = StringUtils.format("{? = call pc_{0}.f_before_delete(?)}", + content.getTableName()); + List params = Lists.newArrayList(); + JdbcParam outParam = JdbcParam.ofString(null).setOut(true); + params.add(outParam); + params.add(JdbcParam.ofLong(content.getIdValue())); + + JdbcTools.call(sql,params); + String error = outParam.getStringValue(); + if (StringUtils.isNotEmpty(error)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error)); + } + return content.getObj(); + } + })); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsSalesInt.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsSalesInt.java index d99a380..e8b4cc0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsSalesInt.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsSalesInt.java @@ -210,7 +210,7 @@ public class LngOpsSalesInt implements Serializable { * 币种 */ @ApiModelProperty("币种") - private String currCode; + private String curCode; /** * 汇率 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngShipSchedule.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngShipSchedule.java index 11c4fd7..06f16cb 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngShipSchedule.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngShipSchedule.java @@ -1,21 +1,18 @@ package com.xjrsoft.module.ship.entity; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; -import com.github.yulichang.annotation.EntityMapping; +import com.baomidou.mybatisplus.annotation.TableName; + import io.swagger.annotations.ApiModel; 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 java.util.List; /** @@ -223,7 +220,7 @@ public class LngShipSchedule implements Serializable { * 币种 */ @ApiModelProperty("币种") - private String currCode; + private String curCode; /** * 汇率