杰生重构

.gitignore

@@ -2,5 +2,3 @@
 .idea
 target
 **/target
-# 自动生成不提交
-hx-common/code-generator/src/main/java/com/fjhx/modular/**

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

@@ -0,0 +1,25 @@
+package com.fjhx.modular;
+
+import com.fjhx.generator.CodeGenerator;
+
+public class StorageRestructure {
+
+    public static void main(String[] args) {
+        // 数据库名
+        CodeGenerator.DATABASE_NAME = "storage_test";
+
+        // 模块名称
+        CodeGenerator.MODULAR_NAME = "storage-restructure";
+
+        // 需要生成的表名称,多表用,隔开
+        CodeGenerator.INCLUDE = "v3_plan";
+
+        // mysql连接
+        CodeGenerator.MYSQL_URL = "36.134.91.96:17330";
+        CodeGenerator.USER_NAME = "fjhx2012mysql";
+        CodeGenerator.PASSWORD = "3PN-Mzn#vnP&q6d";
+
+        CodeGenerator.execute();
+    }
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/v3/V3Plan.java

@@ -0,0 +1,46 @@
+package com.fjhx.entity.v3;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fjhx.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class V3Plan extends BaseEntity {
+
+
+    /**
+     * 排班物料
+     */
+    private String planMaterial;
+
+    /**
+     * 排班日期
+     */
+    private Date planTime;
+
+    /**
+     * 领料面积
+     */
+    private BigDecimal area;
+
+    /**
+     * 工号
+     */
+    private Long jobNo;
+
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/v3/V3PlanEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.v3;
+
+import com.fjhx.entity.v3.V3Plan;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class V3PlanEx extends V3Plan {
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/v3/V3PlanVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.v3;
+
+import com.fjhx.entity.v3.V3Plan;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class V3PlanVo extends V3Plan {
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/controller/v3/V3PlanController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.v3;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.v3.V3Plan;
+import com.fjhx.params.v3.V3PlanVo;
+import com.fjhx.service.v3.V3PlanService;
+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-10-26
+ */
+@RestController
+@RequestMapping("/v3Plan")
+public class V3PlanController {
+
+    @Autowired
+    private V3PlanService v3PlanService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition){
+        Page<V3Plan> result = v3PlanService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody V3PlanVo v3PlanVo){
+        v3PlanService.add(v3PlanVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody V3PlanVo v3PlanVo){
+        v3PlanService.edit(v3PlanVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody V3PlanVo v3PlanVo){
+        v3PlanService.delete(v3PlanVo);
+        return R.success();
+    }
+
+}
+

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/v3/V3PlanMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.v3;
+
+import com.fjhx.entity.v3.V3Plan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-26
+ */
+public interface V3PlanMapper extends BaseMapper<V3Plan> {
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/v3/V3PlanMapper.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.v3.V3PlanMapper">
+
+</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/service/v3/V3PlanService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service.v3;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.v3.V3Plan;
+import com.fjhx.params.v3.V3PlanVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-26
+ */
+public interface V3PlanService extends BaseService<V3Plan> {
+
+    Page<V3Plan> getPage(Map<String, String> condition);
+
+    void add(V3PlanVo v3PlanVo);
+
+    void edit(V3PlanVo v3PlanVo);
+
+    void delete(V3PlanVo v3PlanVo);
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/service/v3/impl/V3PlanServiceImpl.java

@@ -0,0 +1,54 @@
+package com.fjhx.service.v3.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.utils.WrapperUtil;
+import com.fjhx.entity.v3.V3Plan;
+import com.fjhx.params.v3.V3PlanVo;
+import com.fjhx.mapper.v3.V3PlanMapper;
+import com.fjhx.service.v3.V3PlanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-26
+ */
+@Service
+public class V3PlanServiceImpl extends ServiceImpl<V3PlanMapper, V3Plan> implements V3PlanService {
+
+    @Override
+    public Page<V3Plan> getPage(Map<String, String> condition) {
+
+        QueryWrapper<V3Plan> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .createTimeDesc();
+
+        Page<V3Plan> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(V3PlanVo v3PlanVo) {
+        save(v3PlanVo);
+    }
+
+    @Override
+    public void edit(V3PlanVo v3PlanVo) {
+        updateById(v3PlanVo);
+    }
+
+    @Override
+    public void delete(V3PlanVo v3PlanVo) {
+        removeById(v3PlanVo.getId());
+    }
+
+}