no message

nc_wms_java/pom.xml

@@ -48,7 +48,7 @@
         <jjwt.version>0.9.1</jjwt.version>
         <jwks-rsa.version>0.9.0</jwks-rsa.version>
         <velocity-tools.version>3.1</velocity-tools.version>
-        <sa-token.version>1.37.0</sa-token.version>
+        <sa-token.version>1.41.0</sa-token.version>
         <ip2region.version>2.7.0</ip2region.version>
         <bcprov.version>1.80</bcprov.version>
         <jackson-datatype-jsr310.version>2.13.4</jackson-datatype-jsr310.version>

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/interceptor/AdminInterceptor.java

@@ -2,9 +2,8 @@ package net.lab1024.sa.admin.interceptor;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.exception.SaTokenException;
-import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.dev33.satoken.strategy.SaAnnotationStrategy;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -84,7 +83,7 @@ public class AdminInterceptor implements HandlerInterceptor {
             // --------------- 第三步： 校验 权限 ---------------
 
             SmartRequestUtil.setRequestUser(requestEmployee);
-            if (SaStrategy.instance.isAnnotationPresent.apply(method, SaIgnore.class)) {
+            if (SaAnnotationStrategy.instance.isAnnotationPresent.apply(method, SaIgnore.class)) {
                 return true;
             }
 
@@ -93,7 +92,7 @@ public class AdminInterceptor implements HandlerInterceptor {
                 return true;
             }
 
-            SaStrategy.instance.checkMethodAnnotation.accept(method);
+            SaAnnotationStrategy.instance.checkMethodAnnotation.accept(method);
 
         } catch (SaTokenException e) {
             /*
@@ -126,7 +125,6 @@ public class AdminInterceptor implements HandlerInterceptor {
      * 检测：token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结
      */
     private void checkActiveTimeout(RequestEmployee requestEmployee) {
-
         // 用户不在线，也不用检测
         if (requestEmployee == null) {
             return;
@@ -137,12 +135,9 @@ public class AdminInterceptor implements HandlerInterceptor {
     }
 
 
-
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
         // 清除上下文
         SmartRequestUtil.remove();
     }
-
-
 }

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/domain/form/ItemAddForm.java

@@ -9,7 +9,7 @@ import jakarta.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 import lombok.Data;
-import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;
+import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;
 
 /**
  * 物料信息 新建表单

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/item/service/ItemQueryService.java

@@ -14,7 +14,7 @@ import net.lab1024.sa.admin.module.business.base.item.manager.ItemManager;
 import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
 import net.lab1024.sa.base.module.support.dict.constant.DictConst;
-import net.lab1024.sa.base.module.support.dict.service.DictCacheService;
+import net.lab1024.sa.base.module.support.dict.service.DictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -33,7 +33,7 @@ public class ItemQueryService {
     private ItemManager itemManager;
 
     @Resource
-    private DictCacheService dictCacheService;
+    private DictService dictService;
 
     /**
      * 分页查询
@@ -135,8 +135,8 @@ public class ItemQueryService {
                         ItemsExcelVO.builder()
                                 .itemCode(item.getItemCode())
                                 .itemName(item.getItemName())
-                                .itemType(dictCacheService.selectValueNameByValueCode(DictConst.ITEM_TYPE.getValue(), item.getItemType()))
+                                .itemType(dictService.getDictDataLabel(DictConst.ITEM_TYPE.getValue(), item.getItemType()))
-                                .unit(dictCacheService.selectValueNameByValueCode(DictConst.ITEM_UNIT.getValue(), item.getUnit()))
+                                .unit(dictService.getDictDataLabel(DictConst.ITEM_UNIT.getValue(), item.getUnit()))
                                 .disabledFlag(item.getDisabledFlag() ? "启用" : "禁用")
                                 .build()
                 )

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationAddForm.java

@@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.admin.constant.UsageStatusEnum;
-import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;
+import net.lab1024.sa.base.common.json.deserializer.DictDataDeserializer;
 import net.lab1024.sa.base.common.swagger.SchemaEnum;
 import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
 

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/LocationQueryForm.java

@@ -1,15 +1,9 @@
 package net.lab1024.sa.admin.module.business.base.location.domain.form;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import net.lab1024.sa.admin.constant.UsageStatusEnum;
-import net.lab1024.sa.admin.module.business.goods.constant.GoodsStatusEnum;
 import net.lab1024.sa.base.common.domain.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;
-import net.lab1024.sa.base.common.swagger.SchemaEnum;
-import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
 
 /**
  * 库位信息 分页查询表单

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/domain/form/MultipleInsert.java

@@ -1,11 +1,9 @@
 package net.lab1024.sa.admin.module.business.base.location.domain.form;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;
 
 import java.util.List;
 
@@ -21,6 +19,5 @@ public class MultipleInsert {
 
     @Schema(description = "库位类型")
     @NotBlank(message = "库位类型 不能为空 ")
-    @JsonDeserialize(using = DictValueVoDeserializer.class)
     private String locationType;
 }

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/location/service/LocationQueryService.java

@@ -20,7 +20,7 @@ import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.util.SmartEnumUtil;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
 import net.lab1024.sa.base.module.support.dict.constant.DictConst;
-import net.lab1024.sa.base.module.support.dict.service.DictCacheService;
+import net.lab1024.sa.base.module.support.dict.service.DictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -46,7 +46,7 @@ public class LocationQueryService {
     private AreaQueryService areaQueryService;
 
     @Resource
-    private DictCacheService dictCacheService;
+    private DictService dictService;
 
     /**
      * 分页查询
@@ -221,7 +221,7 @@ public class LocationQueryService {
                         LocationsExcelVO.builder()
                                 .areaName(areaMap.get(location.getAreaId()).getAreaName())
                                 .locationCode(location.getLocationCode())
-                                .locationType(dictCacheService.selectValueNameByValueCode(DictConst.LOC_TYPE.getValue(), location.getLocationType()))
+                                .locationType(dictService.getDictDataLabel(DictConst.LOC_TYPE.getValue(), location.getLocationType()))
                                 .status(SmartEnumUtil.getEnumDescByValue(location.getStatus(), UsageStatusEnum.class))
                                 .disabledFlag(location.getDisabledFlag() ? "启用" : "禁用")
                                 .build()

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockAddForm.java

@@ -1,11 +1,9 @@
 package net.lab1024.sa.admin.module.business.base.stock.domain.form;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;
 
 /**
  * 容器信息 新建表单

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/domain/form/StockUpdateForm.java

@@ -1,11 +1,8 @@
 package net.lab1024.sa.admin.module.business.base.stock.domain.form;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;
 
 /**
  * 容器信息 更新表单

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/base/stock/service/StockQueryService.java

@@ -17,7 +17,7 @@ import net.lab1024.sa.admin.module.business.base.stock.domain.vo.StocksExcelVO;
 import net.lab1024.sa.base.common.domain.PageResult;
 import net.lab1024.sa.base.common.util.SmartPageUtil;
 import net.lab1024.sa.base.module.support.dict.constant.DictConst;
-import net.lab1024.sa.base.module.support.dict.service.DictCacheService;
+import net.lab1024.sa.base.module.support.dict.service.DictService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -37,7 +37,7 @@ public class StockQueryService {
     private LocationManager locationManager;
 
     @Resource
-    private DictCacheService dictCacheService;
+    private DictService dictService;
 
     @Resource
     private LocationQueryService locationQueryService;
@@ -146,7 +146,7 @@ public class StockQueryService {
                 .map(stock ->
                         StocksExcelVO.builder()
                                 .stockCode(stock.getStockCode())
-                                .stockType(dictCacheService.selectValueNameByValueCode(DictConst.STOCK_TYPE.getValue(), stock.getStockType()))
+                                .stockType(dictService.getDictDataLabel(DictConst.STOCK_TYPE.getValue(), stock.getStockType()))
                                 .locationCode(locationManager.queryLocation(stock.getLocationId()) == null ? "" : locationManager.queryLocation(stock.getLocationId()).getLocationCode())
                                 .disabledFlag(stock.getDisabledFlag() ? "启用" : "禁用")
                                 .build()

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/dao/CategoryDao.java

@@ -18,7 +18,6 @@ import java.util.List;
  * @Email lab1024@163.com
  * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
  */
-@Component
 @Mapper
 public interface CategoryDao extends BaseMapper<CategoryEntity> {
 

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/category/domain/entity/CategoryEntity.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
@@ -15,11 +16,13 @@ import java.time.LocalDateTime;
  * @Date 2021/08/05 21:26:58
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Data
 @TableName("t_category")
-public class CategoryEntity {
+public class CategoryEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     @TableId(type = IdType.AUTO)
     private Long categoryId;
@@ -42,7 +45,7 @@ public class CategoryEntity {
     private Long parentId;
 
     /**
-     * 是否启用
+     * 是否禁用
      */
     private Boolean disabledFlag;