Merge remote-tracking branch 'origin/master'

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/classify/Classify.java

@@ -0,0 +1,54 @@
+package com.fjhx.entity.classify;
+
+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-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Classify extends BaseEntity {
+
+
+    /**
+     * 类型 （1产品分类 2物料分类）
+     */
+    private Integer type;
+
+    /**
+     * 父级分类id
+     */
+    private Long parentId;
+
+    /**
+     * 父级分类id集合，用,拼接
+     */
+    private String parentIdSet;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/material/Material.java

@@ -0,0 +1,64 @@
+package com.fjhx.entity.material;
+
+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-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Material extends BaseEntity {
+
+
+    /**
+     * 分类id
+     */
+    private Long classifyId;
+
+    /**
+     * 物料类型
+     */
+    private Integer type;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 单位 
+     */
+    private String unit;
+
+    /**
+     * 物料说明
+     */
+    private String introduce;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/classify/ClassifyEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.classify;
+
+import com.fjhx.entity.classify.Classify;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 分类
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ClassifyEx extends Classify {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/classify/ClassifyVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.classify;
+
+import com.fjhx.entity.classify.Classify;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 分类
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ClassifyVo extends Classify {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/material/MaterialEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.material;
+
+import com.fjhx.entity.material.Material;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物料
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaterialEx extends Material {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/material/MaterialVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.material;
+
+import com.fjhx.entity.material.Material;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物料
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaterialVo extends Material {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/classify/ClassifyController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.classify;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.classify.Classify;
+import com.fjhx.params.classify.ClassifyVo;
+import com.fjhx.service.classify.ClassifyService;
+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-24
+ */
+@RestController
+@RequestMapping("/classify")
+public class ClassifyController {
+
+    @Autowired
+    private ClassifyService classifyService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, Object> condition){
+        Page<Classify> result = classifyService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody ClassifyVo classifyVo){
+        classifyService.add(classifyVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody ClassifyVo classifyVo){
+        classifyService.edit(classifyVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody ClassifyVo classifyVo){
+        classifyService.delete(classifyVo);
+        return R.success();
+    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/controller/material/MaterialController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.material;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.material.Material;
+import com.fjhx.params.material.MaterialVo;
+import com.fjhx.service.material.MaterialService;
+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-24
+ */
+@RestController
+@RequestMapping("/material")
+public class MaterialController {
+
+    @Autowired
+    private MaterialService materialService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, Object> condition){
+        Page<Material> result = materialService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody MaterialVo materialVo){
+        materialService.add(materialVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody MaterialVo materialVo){
+        materialService.edit(materialVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody MaterialVo materialVo){
+        materialService.delete(materialVo);
+        return R.success();
+    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/classify/ClassifyMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.classify;
+
+import com.fjhx.entity.classify.Classify;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 分类 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+public interface ClassifyMapper extends BaseMapper<Classify> {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/classify/ClassifyMapper.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.classify.ClassifyMapper">
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/material/MaterialMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.material;
+
+import com.fjhx.entity.material.Material;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 物料 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+public interface MaterialMapper extends BaseMapper<Material> {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/material/MaterialMapper.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.material.MaterialMapper">
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/classify/ClassifyService.java

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

hx-service/victoriatourist/src/main/java/com/fjhx/service/classify/impl/ClassifyServiceImpl.java

@@ -0,0 +1,48 @@
+package com.fjhx.service.classify.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.classify.Classify;
+import com.fjhx.params.classify.ClassifyVo;
+import com.fjhx.mapper.classify.ClassifyMapper;
+import com.fjhx.service.classify.ClassifyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 分类 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+@Service
+public class ClassifyServiceImpl extends ServiceImpl<ClassifyMapper, Classify> implements ClassifyService {
+
+    @Override
+    public Page<Classify> getPage(Map<String, Object> condition) {
+
+        IWrapper<Classify> wrapper = IWrapper.getWrapper(condition);
+
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(ClassifyVo classifyVo) {
+        save(classifyVo);
+    }
+
+    @Override
+    public void edit(ClassifyVo classifyVo) {
+        updateById(classifyVo);
+    }
+
+    @Override
+    public void delete(ClassifyVo classifyVo) {
+        removeById(classifyVo.getId());
+    }
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/material/MaterialService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service.material;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.material.Material;
+import com.fjhx.params.material.MaterialVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+public interface MaterialService extends BaseService<Material> {
+
+    Page<Material> getPage(Map<String, Object> condition);
+
+    void add(MaterialVo materialVo);
+
+    void edit(MaterialVo materialVo);
+
+    void delete(MaterialVo materialVo);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/material/impl/MaterialServiceImpl.java

@@ -0,0 +1,48 @@
+package com.fjhx.service.material.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.material.Material;
+import com.fjhx.params.material.MaterialVo;
+import com.fjhx.mapper.material.MaterialMapper;
+import com.fjhx.service.material.MaterialService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 物料 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-24
+ */
+@Service
+public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService {
+
+    @Override
+    public Page<Material> getPage(Map<String, Object> condition) {
+
+        IWrapper<Material> wrapper = IWrapper.getWrapper(condition);
+
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(MaterialVo materialVo) {
+        save(materialVo);
+    }
+
+    @Override
+    public void edit(MaterialVo materialVo) {
+        updateById(materialVo);
+    }
+
+    @Override
+    public void delete(MaterialVo materialVo) {
+        removeById(materialVo.getId());
+    }
+
+}