维多利亚

bladex/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -40,7 +40,7 @@ public interface LauncherConstant {
 	/**
 	 * nacos dev 地址
 	 */
-	String NACOS_DEV_ADDR = "36.134.91.96:8848";
+	String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
 	/**
 	 * nacos prod 地址

hx-common/code-generator/src/main/java/com/fjhx/modular/Victoriatourist.java

@@ -12,7 +12,7 @@ public class Victoriatourist {
         CodeGenerator.MODULAR_NAME = "victoriatourist";
 
         // 需要生成的表名称,多表用,隔开
-        CodeGenerator.INCLUDE = "supplier_price";
+        CodeGenerator.INCLUDE = "product_spu";
 
         // mysql连接
         CodeGenerator.MYSQL_URL = "36.134.91.96:17330";

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/product/ProductSpu.java

@@ -0,0 +1,49 @@
+package com.fjhx.entity.product;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductSpu extends BaseEntity {
+
+
+    /**
+     * spu编码
+     */
+    private String code;
+
+    /**
+     * spu名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/product/ProductSpuEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.product;
+
+import com.fjhx.entity.product.ProductSpu;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductSpuEx extends ProductSpu {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/product/ProductSpuVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.product;
+
+import com.fjhx.entity.product.ProductSpu;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductSpuVo extends ProductSpu {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/product/ProductSpuController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.product;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.product.ProductSpu;
+import com.fjhx.params.product.ProductSpuVo;
+import com.fjhx.service.product.ProductSpuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-25
+ */
+@RestController
+@RequestMapping("/productSpu")
+public class ProductSpuController {
+
+    @Autowired
+    private ProductSpuService productSpuService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, Object> condition){
+        Page<ProductSpu> result = productSpuService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody ProductSpuVo productSpuVo){
+        productSpuService.add(productSpuVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody ProductSpuVo productSpuVo){
+        productSpuService.edit(productSpuVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody ProductSpuVo productSpuVo){
+        productSpuService.delete(productSpuVo);
+        return R.success();
+    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductSpuMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.product;
+
+import com.fjhx.entity.product.ProductSpu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-25
+ */
+public interface ProductSpuMapper extends BaseMapper<ProductSpu> {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductSpuMapper.xml

@@ -0,0 +1,5 @@
+<?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.fjhx.mapper.product.ProductSpuMapper">
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/product/ProductSpuService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service.product;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.product.ProductSpu;
+import com.fjhx.params.product.ProductSpuVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-25
+ */
+public interface ProductSpuService extends BaseService<ProductSpu> {
+
+    Page<ProductSpu> getPage(Map<String, Object> condition);
+
+    void add(ProductSpuVo productSpuVo);
+
+    void edit(ProductSpuVo productSpuVo);
+
+    void delete(ProductSpuVo productSpuVo);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/product/impl/ProductSpuServiceImpl.java

@@ -0,0 +1,54 @@
+package com.fjhx.service.product.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.product.ProductSpu;
+import com.fjhx.mapper.product.ProductSpuMapper;
+import com.fjhx.params.product.ProductSpuVo;
+import com.fjhx.service.product.ProductSpuService;
+import com.fjhx.uitl.code.CodeEnum;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.fjhx.utils.wrapperUtil.KeywordData;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-25
+ */
+@Service
+public class ProductSpuServiceImpl extends ServiceImpl<ProductSpuMapper, ProductSpu> implements ProductSpuService {
+
+    @Override
+    public Page<ProductSpu> getPage(Map<String, Object> condition) {
+        IWrapper<ProductSpu> wrapper = IWrapper.getWrapper(condition);
+        wrapper.keyword(new KeywordData(ProductSpu::getName), new KeywordData(ProductSpu::getCode))
+                .orderByDesc(ProductSpu::getId);
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(ProductSpuVo productSpuVo) {
+        synchronized (this) {
+            productSpuVo.setCode(CodeEnum.SPU.getCode());
+            save(productSpuVo);
+        }
+    }
+
+    @Override
+    public void edit(ProductSpuVo productSpuVo) {
+        updateById(productSpuVo);
+    }
+
+    @Override
+    public void delete(ProductSpuVo productSpuVo) {
+        // TODO 产品正在使用此spu不让删除
+        removeById(productSpuVo.getId());
+    }
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/supplier/impl/SupplierPriceServiceImpl.java

@@ -31,7 +31,8 @@ public class SupplierPriceServiceImpl extends ServiceImpl<SupplierPriceMapper, S
     public Page<SupplierPrice> getPage(Map<String, Object> condition) {
 
         IWrapper<SupplierPrice> wrapper = IWrapper.getWrapper(condition);
-        wrapper.keyword(new KeywordData("s", Supplier::getName),
+        wrapper.orderByDesc(Supplier::getId)
+                .keyword(new KeywordData("s", Supplier::getName),
                         new KeywordData("m", Material::getName),
                         new KeywordData("m", Material::getCode))
                 .eq("s", Supplier::getId, condition.get("supplierId"))

hx-service/victoriatourist/src/main/java/com/fjhx/service/supplier/impl/SupplierServiceImpl.java

@@ -42,7 +42,8 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
     public Page<Map<String, Object>> getPage(Map<String, Object> condition) {
 
         IWrapper<Supplier> wrapper = IWrapper.getWrapper(condition);
-        wrapper.keyword(new KeywordData(Supplier::getName), new KeywordData(Supplier::getContacts))
+        wrapper.orderByDesc(Supplier::getId)
+                .keyword(new KeywordData(Supplier::getName), new KeywordData(Supplier::getContacts))
                 .eq(Supplier::getType)
                 .like(Supplier::getCode)
                 .like(Supplier::getName)

hx-service/victoriatourist/src/main/java/com/fjhx/uitl/code/CodeEnum.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.service.material.MaterialService;
+import com.fjhx.service.product.ProductSpuService;
 import com.fjhx.service.supplier.SupplierService;
 import lombok.Getter;
 
@@ -18,14 +19,16 @@ public enum CodeEnum {
     // 供应商code
     SUPPLIER("GY", null, "code", 5, SupplierService.class),
     // 物料code
-    MATERIAL("M", null, "code", 5, MaterialService.class);
+    MATERIAL("M", null, "code", 5, MaterialService.class),
+    // 物料code
+    SPU("SPU", null, "code", 5, ProductSpuService.class);
 
-    CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> entityCls) {
+    CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
         this.prefix = prefix;
         this.dateFormat = dateFormat;
         this.length = length;
         this.codeFieldName = codeFieldName;
-        this.service = SpringUtil.getBean(entityCls);
+        this.service = SpringUtil.getBean(serviceCls);
     }
 
     // 编码前缀