生产流程表生成

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionProcess.java

@@ -0,0 +1,44 @@
+package com.fjhx.entity.production;
+
+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-07-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductionProcess extends BaseEntity {
+
+
+    /**
+     * 生产流程名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionProcessWorkmanship.java

@@ -0,0 +1,50 @@
+package com.fjhx.entity.production;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 流程工艺关联表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+@Data
+public class ProductionProcessWorkmanship implements Serializable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 流程id
+     */
+    private Long productionProcessId;
+
+    /**
+     * 工艺id
+     */
+    private Long productionWorkmanshipId;
+
+    /**
+     * 是否自动流转
+     */
+    private Integer automaticCirculation;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+
+}

hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.production;
+
+import com.fjhx.entity.production.ProductionProcess;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 生产流程
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductionProcessEx extends ProductionProcess {
+
+}

hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.production;
+
+import com.fjhx.entity.production.ProductionProcess;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 生产流程
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductionProcessVo extends ProductionProcess {
+
+}

hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessWorkmanshipEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.production;
+
+import com.fjhx.entity.production.ProductionProcessWorkmanship;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 流程工艺关联表
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductionProcessWorkmanshipEx extends ProductionProcessWorkmanship {
+
+}

hx-service-api/iot-management-api/src/main/java/com/fjhx/params/production/ProductionProcessWorkmanshipVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.production;
+
+import com.fjhx.entity.production.ProductionProcessWorkmanship;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 流程工艺关联表
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProductionProcessWorkmanshipVo extends ProductionProcessWorkmanship {
+
+}

hx-service/iot-management/src/main/java/com/fjhx/production/controller/ProductionProcessController.java

@@ -0,0 +1,56 @@
+package com.fjhx.production.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.production.ProductionProcess;
+import com.fjhx.params.production.ProductionProcessVo;
+import com.fjhx.production.service.ProductionProcessService;
+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-07-13
+ */
+@RestController
+@RequestMapping("/productionProcess")
+public class ProductionProcessController {
+
+    @Autowired
+    private ProductionProcessService productionProcessService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition){
+        Page<ProductionProcess> result = productionProcessService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody ProductionProcessVo productionProcessVo){
+        productionProcessService.add(productionProcessVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody ProductionProcessVo productionProcessVo){
+        productionProcessService.edit(productionProcessVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody ProductionProcessVo productionProcessVo){
+        productionProcessService.delete(productionProcessVo);
+        return R.success();
+    }
+
+}
+

hx-service/iot-management/src/main/java/com/fjhx/production/controller/ProductionWorkmanshipController.java

@@ -1,16 +1,17 @@
 package com.fjhx.production.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
 import com.fjhx.entity.production.ProductionWorkmanship;
 import com.fjhx.params.production.ProductionWorkmanshipVo;
 import com.fjhx.production.service.ProductionWorkmanshipService;
+import org.springblade.core.tool.api.R;
 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.List;
 import java.util.Map;
 
 /**
@@ -29,28 +30,34 @@ public class ProductionWorkmanshipController {
     private ProductionWorkmanshipService productionWorkmanshipService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition){
+    public R page(@RequestBody Map<String, String> condition) {
         Page<ProductionWorkmanship> result = productionWorkmanshipService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo){
+    public R add(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo) {
         productionWorkmanshipService.add(productionWorkmanshipVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo){
+    public R edit(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo) {
         productionWorkmanshipService.edit(productionWorkmanshipVo);
         return R.success();
     }
 
     @PostMapping("/delete")
-    public R delete(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo){
+    public R delete(@RequestBody ProductionWorkmanshipVo productionWorkmanshipVo) {
         productionWorkmanshipService.delete(productionWorkmanshipVo);
         return R.success();
     }
 
+    @PostMapping("/list")
+    public R list() {
+        List<ProductionWorkmanship> result = productionWorkmanshipService.getList();
+        return R.success(result);
+    }
+
 }
 

hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.production.mapper;
+
+import com.fjhx.entity.production.ProductionProcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 生产流程 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+public interface ProductionProcessMapper extends BaseMapper<ProductionProcess> {
+
+}

hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessMapper.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.production.mapper.ProductionProcessMapper">
+
+</mapper>

hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessWorkmanshipMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.production.mapper;
+
+import com.fjhx.entity.production.ProductionProcessWorkmanship;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 流程工艺关联表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+public interface ProductionProcessWorkmanshipMapper extends BaseMapper<ProductionProcessWorkmanship> {
+
+}

hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionProcessWorkmanshipMapper.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.production.mapper.ProductionProcessWorkmanshipMapper">
+
+</mapper>

hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionProcessService.java

@@ -0,0 +1,28 @@
+package com.fjhx.production.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.production.ProductionProcess;
+import com.fjhx.params.production.ProductionProcessVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 生产流程 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+public interface ProductionProcessService extends BaseService<ProductionProcess> {
+
+    Page<ProductionProcess> getPage(Map<String, String> condition);
+
+    void add(ProductionProcessVo productionProcessVo);
+
+    void edit(ProductionProcessVo productionProcessVo);
+
+    void delete(ProductionProcessVo productionProcessVo);
+
+}

hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionProcessWorkmanshipService.java

@@ -0,0 +1,28 @@
+package com.fjhx.production.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.production.ProductionProcessWorkmanship;
+import com.fjhx.params.production.ProductionProcessWorkmanshipVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 流程工艺关联表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+public interface ProductionProcessWorkmanshipService extends BaseService<ProductionProcessWorkmanship> {
+
+    Page<ProductionProcessWorkmanship> getPage(Map<String, String> condition);
+
+    void add(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo);
+
+    void edit(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo);
+
+    void delete(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo);
+
+}

hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionWorkmanshipService.java

@@ -5,6 +5,7 @@ import com.fjhx.entity.production.ProductionWorkmanship;
 import com.fjhx.params.production.ProductionWorkmanshipVo;
 import com.fjhx.base.BaseService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,4 +26,6 @@ public interface ProductionWorkmanshipService extends BaseService<ProductionWork
 
     void delete(ProductionWorkmanshipVo productionWorkmanshipVo);
 
+    List<ProductionWorkmanship> getList();
+
 }

hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionProcessServiceImpl.java

@@ -0,0 +1,55 @@
+package com.fjhx.production.service.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.production.ProductionProcess;
+import com.fjhx.params.production.ProductionProcessVo;
+import com.fjhx.production.mapper.ProductionProcessMapper;
+import com.fjhx.production.service.ProductionProcessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 生产流程 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+@Service
+public class ProductionProcessServiceImpl extends ServiceImpl<ProductionProcessMapper, ProductionProcess> implements ProductionProcessService {
+
+    @Override
+    public Page<ProductionProcess> getPage(Map<String, String> condition) {
+
+        QueryWrapper<ProductionProcess> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .createTimeDesc();
+
+        Page<ProductionProcess> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(ProductionProcessVo productionProcessVo) {
+        save(productionProcessVo);
+    }
+
+    @Override
+    public void edit(ProductionProcessVo productionProcessVo) {
+        updateById(productionProcessVo);
+    }
+
+    @Override
+    public void delete(ProductionProcessVo productionProcessVo) {
+        removeById(productionProcessVo.getId());
+    }
+
+}

hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionProcessWorkmanshipServiceImpl.java

@@ -0,0 +1,55 @@
+package com.fjhx.production.service.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.production.ProductionProcessWorkmanship;
+import com.fjhx.params.production.ProductionProcessWorkmanshipVo;
+import com.fjhx.production.mapper.ProductionProcessWorkmanshipMapper;
+import com.fjhx.production.service.ProductionProcessWorkmanshipService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 流程工艺关联表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-13
+ */
+@Service
+public class ProductionProcessWorkmanshipServiceImpl extends ServiceImpl<ProductionProcessWorkmanshipMapper, ProductionProcessWorkmanship> implements ProductionProcessWorkmanshipService {
+
+    @Override
+    public Page<ProductionProcessWorkmanship> getPage(Map<String, String> condition) {
+
+        QueryWrapper<ProductionProcessWorkmanship> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .createTimeDesc();
+
+        Page<ProductionProcessWorkmanship> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo) {
+        save(productionProcessWorkmanshipVo);
+    }
+
+    @Override
+    public void edit(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo) {
+        updateById(productionProcessWorkmanshipVo);
+    }
+
+    @Override
+    public void delete(ProductionProcessWorkmanshipVo productionProcessWorkmanshipVo) {
+        removeById(productionProcessWorkmanshipVo.getId());
+    }
+
+}

hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionWorkmanshipServiceImpl.java

@@ -4,15 +4,18 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.BaseEntity;
 import com.fjhx.entity.production.ProductionWorkmanship;
 import com.fjhx.params.production.ProductionWorkmanshipVo;
 import com.fjhx.production.mapper.ProductionWorkmanshipMapper;
 import com.fjhx.production.service.ProductionWorkmanshipService;
 import com.fjhx.utils.FileClientUtil;
 import com.fjhx.utils.WrapperUtil;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -62,4 +65,13 @@ public class ProductionWorkmanshipServiceImpl extends ServiceImpl<ProductionWork
         FileClientUtil.relieveBindingFile(id);
     }
 
+    @Override
+    public List<ProductionWorkmanship> getList() {
+        return lambdaQuery()
+                .select(BaseEntity::getId, ProductionWorkmanship::getName, ProductionWorkmanship::getWhetherPacking)
+                .eq(BaseEntity::getTenantId, AuthUtil.getTenantId())
+                .orderByDesc(BaseEntity::getId)
+                .list();
+    }
+
 }