diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java new file mode 100644 index 00000000..7829fda1 --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/CacheApi.java @@ -0,0 +1,47 @@ +package com.nflg.product.bomnew.api.user; + +import com.nflg.product.base.core.api.BaseApi; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import nflg.product.common.vo.ResultVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.lang.NonNull; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * @author 曹鹏飞 + * @date 2024/4/9 09:22:09 + */ +@Api(tags = "缓存接口") +@RestController +@RequestMapping("bom/new/cache") +public class CacheApi extends BaseApi { + + private static final String PREFIX = "frontend:"; + + @Autowired + private RedisTemplate redisTemplate; + + @PostMapping("set") + @ApiOperation("设置缓存") + public ResultVO setCache(@Valid @RequestParam @NonNull String key, @Valid @RequestParam @NonNull String content) { + redisTemplate.boundValueOps(PREFIX + key).set(content); + return ResultVO.success(); + } + + @GetMapping("get") + @ApiOperation("获取缓存") + public ResultVO getCache(@Valid @RequestParam @NonNull String key) { + return ResultVO.success(redisTemplate.boundValueOps(PREFIX + key).get()); + } + + @PostMapping("del") + @ApiOperation("删除缓存") + public ResultVO delCache(@Valid @RequestParam @NonNull String key) { + redisTemplate.delete(PREFIX + key); + return ResultVO.success(); + } +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomStatusEnum.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomStatusEnum.java index f7c8951b..aca4b0f9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomStatusEnum.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/EBomStatusEnum.java @@ -12,10 +12,10 @@ public enum EBomStatusEnum implements ValueEnum { CHECKED(2,"已复核"), RETURNED(3,"已退回"), PUBLISHED(4,"定版(已发布PBOM)"), - BORROWED_PARTS(99, "借用件"), + BORROWED_PARTS(99, "借用件"); //非自己创建的 - REFERENCE(100, "引用件"); + //REFERENCE(100, "引用件"); private final Integer value; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java index d2fd6cbc..b403de79 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java @@ -1,19 +1,18 @@ package com.nflg.product.bomnew.pojo.entity; -import java.math.BigDecimal; - import cn.hutool.core.util.NumberUtil; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; - import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDate; /** * t_bom_new_original_child @@ -136,7 +135,7 @@ public class BomNewOriginalChildEntity implements Serializable { private Long bomVersionRowId; public BigDecimal getTotalWeight() { - return NumberUtil.mul(this.getUnitWeight(), this.num); + return NumberUtil.mul(this.unitWeight, this.num); } private static final long serialVersionUID = -61829104329368344L; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 4022db9a..a5896263 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -340,10 +340,10 @@ public class BomNewEbomParentService extends ServiceImpl { syncToFormal(convert.getHasHandlerParentIds()); - },syncOriginalBomToFormalPool ); + }, syncOriginalBomToFormalPool); } //记录子级BOM版本行ID @@ -573,6 +573,8 @@ public class BomNewOriginalParentService extends ServiceImpl - update t_bom_new_pbom_parent set status=#{status} , release_user_name=#{releaseUserName} , release_time=now() + update t_bom_new_pbom_parent set status=#{status} ,edit_status=3, release_user_name=#{releaseUserName} , + release_time=now() where row_id in #{rowId}