字典翻译

src/main/java/com/bailuntec/ana/application/common/IDictService.java

+package com.bailuntec.ana.application.common;
+
+import com.bailuntec.ana.domain.common.Dict;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 字典表 服务类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-08-05
+ */
+public interface IDictService extends IService<Dict> {
+
+}

src/main/java/com/bailuntec/ana/application/common/impl/DictServiceImpl.java

+package com.bailuntec.ana.application.common.impl;
+
+import com.bailuntec.ana.domain.common.Dict;
+import com.bailuntec.ana.infrastructure.mapper.common.DictMapper;
+import com.bailuntec.ana.application.common.IDictService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 字典表 服务实现类
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-08-05
+ */
+@Service
+public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements IDictService {
+
+}

src/main/java/com/bailuntec/ana/domain/common/Dict.java

+package com.bailuntec.ana.domain.common;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-08-05
+ */
+@Data
+@ApiModel(value = "Dict对象", description = "字典表")
+public class Dict {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "字典描述")
+    private String dictDesc;
+
+    @ApiModelProperty(value = "字典编码")
+    private String dictCode;
+
+    @ApiModelProperty(value = "字典key")
+    private String dictKey;
+
+    @ApiModelProperty(value = "字典值")
+    private String dictValue;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "记录创建时间", hidden = true)
+    @TableField(fill = FieldFill.INSERT)
+    protected LocalDateTime createTime;
+
+    /**
+     * 最后修改时间
+     */
+    @ApiModelProperty(value = "记录最后修改时间", hidden = true)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    protected LocalDateTime lastUpdateTime;
+
+
+}

src/main/java/com/bailuntec/ana/domain/order/Order.java

@@ -143,7 +143,7 @@ public class Order extends BaseModel {
     private Integer deliveryStatus;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "发货状态 1-未发货 2-部分已发货 3-全部已采购")
+    @ApiModelProperty(value = "发货状态 1-未发货 2-部分已发货 3-全部已发货")
     private String deliveryStatusStr;
 
     @NotNull(groups = OrderValidGroup.PublishOrder.class)
@@ -156,8 +156,8 @@ public class Order extends BaseModel {
 
 
     @Valid
-    @NotEmpty(groups = {OrderValidGroup.PublishOrder.class,
-            OrderValidGroup.Purchase.class}, message = "订单详情不能为空")
+    @NotEmpty(groups = {OrderValidGroup.Purchase.class}, message = "订单详情不能为空")
+    @NotEmpty(groups = {OrderValidGroup.PublishOrder.class}, message = "没有未采购的sku")
     @ApiModelProperty(value = "订单待采购sku详情")
     @TableField(exist = false)
     private List<OrderDetail> orderDetailList;

src/main/java/com/bailuntec/ana/domain/order/OrderDetail.java

 package com.bailuntec.ana.domain.order;
 
+import com.bailuntec.ana.infrastructure.common.annotation.DictParam;
 import com.bailuntec.ana.infrastructure.common.base.BaseModel;
 import com.bailuntec.ana.interfaces.order.OrderValidGroup;
 import com.bailuntec.ana.vo.order.Currency;
@@ -101,14 +102,24 @@ public class OrderDetail extends BaseModel {
     @ApiModelProperty(value = "销售sku源链接")
     private String originalLink;
 
+    @DictParam(dictCode = "ORDER_DETAIL_PURCHASE_STATUS", dictValueParam = "purchaseStatusStr")
     @ApiModelProperty(value = "采购状态1-未采购 2-采购中 3-采购失败 4-采购完成")
     private Integer purchaseStatus;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "采购状态1-未采购 2-采购中 3-采购失败 4-采购完成")
+    private Integer purchaseStatusStr;
+
     private String purchaseMessage;
 
+    @DictParam(dictCode = "ORDER_DETAIL_DELIVERY_STATUS", dictValueParam = "deliveryStatusStr")
     @ApiModelProperty("发货状态 1-未发货 2-已发货")
     private Integer deliveryStatus;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "采购状态1-未采购 2-采购中 3-采购失败 4-采购完成")
+    private Integer deliveryStatusStr;
+
     /**
      * <p>
      * 规格可以传空列表 不不能传空

src/main/java/com/bailuntec/ana/infrastructure/common/config/config/DictConfig.java

+package com.bailuntec.ana.infrastructure.common.config.config;
+
+import com.bailuntec.ana.domain.common.Dict;
+import com.bailuntec.ana.infrastructure.mapper.common.DictMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 项目字典初始化配置
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/4/28 2:36 下午
+ */
+@Configuration
+@Slf4j
+public class DictConfig {
+
+    @Resource
+    DictMapper dictMapper;
+    @Resource
+    StringRedisTemplate stringRedisTemplate;
+
+    @PostConstruct
+    public void init() {
+        log.info("加载字典到redis...");
+        List<Dict> dictList = dictMapper.selectList(new LambdaQueryWrapper<>());
+        //分组
+        Map<String, List<Dict>> dictMap = dictList.stream().collect(Collectors.groupingBy(Dict::getDictCode));
+        //字典写入redis
+        dictMap.forEach((key, value) -> value.forEach(dict -> stringRedisTemplate.opsForHash().put(key, dict.getDictKey(), dict.getDictValue())));
+        log.info("加载字典到redis完成");
+    }
+}

src/main/java/com/bailuntec/ana/infrastructure/mapper/common/DictMapper.java

+package com.bailuntec.ana.infrastructure.mapper.common;
+
+import com.bailuntec.ana.domain.common.Dict;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 字典表 Mapper 接口
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-08-05
+ */
+public interface DictMapper extends BaseMapper<Dict> {
+
+}

src/main/java/com/bailuntec/ana/interfaces/common/DictController.java

+package com.bailuntec.ana.interfaces.common;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 字典表 前端控制器
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020-08-05
+ */
+@RestController
+@RequestMapping("//dict")
+public class DictController {
+
+}

src/main/resources/application-dev.yml

@@ -20,7 +20,7 @@ spring:
   #redis配置
   redis:
     #    host: host.docker.internal
-    host: 127.0.0.1
+    host: 106.55.55.253
     port: 6379
     database: 0
     lettuce:

src/main/resources/mapper/common/DictMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bailuntec.ana.infrastructure.mapper.common.DictMapper">
+
+</mapper>

src/test/java/com/bailuntec/ana/CodeGenerator.java

@@ -50,11 +50,11 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/ana-order?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull");
+        dsc.setUrl("jdbc:mysql://106.55.55.253:3306/ana-order?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull");
         // dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("123456");
+        dsc.setPassword("gogirl2020test.");
         mpg.setDataSource(dsc);
 
         // 包配置