基础模块

hx-saas-project/pom.xml

@@ -9,7 +9,6 @@
         <version>3.2.0</version>
     </parent>
 
-    <groupId>com.fjhx</groupId>
     <artifactId>hx-saas-project</artifactId>
     <version>2.8.2.RELEASE</version>
     <packaging>pom</packaging>
@@ -41,6 +40,7 @@
 		<module>saas-feign-api</module>
         <module>saas-entity</module>
         <module>saas-storage</module>
+        <module>saas-rocketmq</module>
     </modules>
 
     <dependencyManagement>
@@ -91,7 +91,6 @@
             <artifactId>blade-starter-tenant</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
-
         <!-- 引入feign api -->
         <dependency>
             <groupId>org.springblade</groupId>

hx-saas-project/saas-entity/src/main/java/com/fjhx/attachment/StockAttachment.java

@@ -0,0 +1,59 @@
+package com.fjhx.attachment;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fjhx.base.BasicEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 业务附件表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockAttachment extends BasicEntity {
+
+
+    /**
+     * 业务表id，0表示空
+     */
+    @TableField("busiId")
+    private String busiId;
+
+    /**
+     * 业务类型：（1、面料问题反馈图片）
+     */
+    @TableField("busiType")
+    private Integer busiType;
+
+    /**
+     * 附件的真实名称
+     */
+    @TableField("realName")
+    private String realName;
+
+    /**
+     * 附件的临时名称
+     */
+    @TableField("temName")
+    private String temName;
+
+    /**
+     * 路径
+     */
+    private String path;
+
+    /**
+     * 文件后缀
+     */
+    private String format;
+
+    /**
+     * 大小
+     */
+    private Long size;
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/attachment/StockAttachmentEx.java

@@ -0,0 +1,16 @@
+package com.fjhx.attachment;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 业务附件表
+ *
+ * @author ${author}
+ * @since 2022-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockAttachmentEx extends StockAttachment {
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/attachment/StockAttachmentVo.java

@@ -0,0 +1,16 @@
+package com.fjhx.attachment;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 业务附件表
+ *
+ * @author ${author}
+ * @since 2022-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockAttachmentVo extends StockAttachment {
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/attachment/enums/AttachmentTypeEnum.java

@@ -0,0 +1,64 @@
+package com.fjhx.attachment.enums;
+
+import org.apache.commons.collections4.MapUtils;
+import org.springblade.core.tool.utils.StringPool;
+
+import java.util.LinkedHashMap;
+
+/**
+ * 文件类型枚举
+ */
+public enum AttachmentTypeEnum {
+    TYPE_ONE (1, "面料问题反馈图片"),
+    TYPE_TWO (2, "供应商其他资质"),
+    ;
+
+    private int key;
+
+    private String value;
+
+    private static LinkedHashMap<Integer, String> map = new LinkedHashMap<>();
+
+    AttachmentTypeEnum(int key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    /**
+     * 获取枚举map
+     *
+     * @return
+     */
+    public static LinkedHashMap<Integer, String> getMap() {
+        if (MapUtils.isNotEmpty(map)) {
+            return map;
+        }
+        for (AttachmentTypeEnum ms : values()) {
+            map.put(ms.key, ms.value);
+        }
+        return map;
+    }
+
+    /**
+     * 通过key获取名称
+     *
+     * @param key
+     * @return
+     */
+    public static String getNameByKey(Integer key) {
+        if (key == null || key < 0) {
+            return StringPool.EMPTY;
+        }
+        LinkedHashMap<Integer, String> map = getMap();
+        return map.getOrDefault(key, StringPool.EMPTY);
+    }
+
+    public int getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}

hx-saas-project/saas-entity/src/main/java/com/fjhx/base/BasicEntity.java

@@ -0,0 +1,34 @@
+package com.fjhx.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class BasicEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date CreatedTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("UpdatedTime")
+    private Date UpdatedTime;
+
+}

hx-saas-project/saas-rocketmq/pom.xml

@@ -9,7 +9,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.fjhx</groupId>
     <artifactId>saas-rocketmq</artifactId>
     <name>${project.artifactId}</name>
     <version>2.8.2.RELEASE</version>
@@ -29,11 +28,6 @@
             <artifactId>rocketmq-client</artifactId>
             <version>${rocketmq.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>saas-entity</artifactId>
-            <version>${bladex.project.version}</version>
-        </dependency>
     </dependencies>
 
     <build>

hx-saas-project/saas-rocketmq/src/main/java/com/fjhx/rocketmq/consumer/ConsumerServiceERP.java

@@ -29,11 +29,11 @@ public class ConsumerServiceERP {
 
     public ConsumerServiceERP() throws MQClientException {
         consumer = new DefaultMQPushConsumer(consumerGroup);
-        consumer.setNamesrvAddr("124.70.202.81:9876;124.70.177.208:9876;124.70.207.0:9876;124.70.188.19:9876");
+        consumer.setNamesrvAddr("127.0.0.1:9876");
         // 设置消费地点,从最后一个进行消费(其实就是消费策略)
         consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_LAST_OFFSET);
         // 订阅主题的哪些标签
-        consumer.subscribe("rocketmq_erp", "erp");
+        consumer.subscribe("testone", "erp");
         // 注册监听器
         consumer.registerMessageListener((MessageListenerConcurrently)
                 (msgs, context) -> {

hx-saas-project/saas-storage/pom.xml

@@ -24,6 +24,11 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-excel</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>saas-feign-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

hx-saas-project/saas-storage/src/main/java/com/fjhx/attachment/controller/StockAttachmentController.java

@@ -0,0 +1,62 @@
+package com.fjhx.attachment.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.attachment.StockAttachment;
+import com.fjhx.attachment.StockAttachmentVo;
+import com.fjhx.attachment.service.StockAttachmentService;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 业务附件表 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-12
+ */
+@RestController
+@RequestMapping("/stockAttachment")
+public class StockAttachmentController {
+
+    @Autowired
+    private StockAttachmentService stockAttachmentService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition){
+        Page<StockAttachment> result = stockAttachmentService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody StockAttachmentVo stockAttachmentVo){
+        stockAttachmentService.add(stockAttachmentVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody StockAttachmentVo stockAttachmentVo){
+        stockAttachmentService.edit(stockAttachmentVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody StockAttachmentVo stockAttachmentVo){
+        stockAttachmentService.delete(stockAttachmentVo);
+        return R.success();
+    }
+
+    /**
+     * 根据业务ID查询文件列表
+     * @param busi
+     * @return
+     */
+    @GetMapping("/getListByBusi")
+    public R getListByBusi(@RequestParam("busi")String busi){
+        return R.success(stockAttachmentService.getListByBusi(busi));
+    }
+}
+

hx-saas-project/saas-storage/src/main/java/com/fjhx/attachment/mapper/StockAttachmentMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.attachment.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.attachment.StockAttachment;
+
+/**
+ * <p>
+ * 业务附件表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-12
+ */
+public interface StockAttachmentMapper extends BaseMapper<StockAttachment> {
+
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/attachment/mapper/StockAttachmentMapper.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.attachment.mapper.StockAttachmentMapper">
+
+</mapper>

hx-saas-project/saas-storage/src/main/java/com/fjhx/attachment/service/StockAttachmentService.java

@@ -0,0 +1,31 @@
+package com.fjhx.attachment.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.attachment.StockAttachment;
+import com.fjhx.attachment.StockAttachmentVo;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务附件表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-12
+ */
+public interface StockAttachmentService extends IService<StockAttachment> {
+
+    void add(StockAttachmentVo stockAttachmentVo);
+
+    void edit(StockAttachmentVo stockAttachmentVo);
+
+    void delete(StockAttachmentVo stockAttachmentVo);
+
+    /**
+     * 根据业务ID查询文件
+     * @param busi
+     * @return
+     */
+    List<StockAttachment> getListByBusi(String busi);
+}

hx-saas-project/saas-storage/src/main/java/com/fjhx/attachment/service/impl/StockAttachmentServiceImpl.java

@@ -0,0 +1,89 @@
+package com.fjhx.attachment.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.attachment.StockAttachment;
+import com.fjhx.attachment.StockAttachmentVo;
+import com.fjhx.attachment.mapper.StockAttachmentMapper;
+import com.fjhx.attachment.service.StockAttachmentService;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 业务附件表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-12
+ */
+@Service
+public class StockAttachmentServiceImpl extends ServiceImpl<StockAttachmentMapper, StockAttachment> implements StockAttachmentService {
+
+    /**
+     * 添加
+     * @param stockAttachmentVo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @TenantIgnore
+    @Override
+    public void add(StockAttachmentVo stockAttachmentVo) {
+        if(StringUtil.isEmpty(stockAttachmentVo.getBusiId())||
+        StringUtil.isEmpty(stockAttachmentVo.getPath())){
+            throw new ServiceException("参数异常");
+        }
+        stockAttachmentVo.setCreatedTime(new Date());
+        save(stockAttachmentVo);
+    }
+
+    /**
+     * 修改
+     * @param stockAttachmentVo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @TenantIgnore
+    @Override
+    public void edit(StockAttachmentVo stockAttachmentVo) {
+        if(StringUtil.isEmpty(stockAttachmentVo.getId())){
+            throw new ServiceException("参数异常");
+        }
+        updateById(stockAttachmentVo);
+    }
+
+    /**
+     * 删除
+     * @param stockAttachmentVo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @TenantIgnore
+    @Override
+    public void delete(StockAttachmentVo stockAttachmentVo) {
+        if(StringUtil.isEmpty(stockAttachmentVo.getId())){
+            throw new ServiceException("参数异常");
+        }
+        removeById(stockAttachmentVo.getId());
+    }
+
+    /**
+     * 根据业务ID查询文件
+     * @param busi
+     * @return
+     */
+    @TenantIgnore
+    @Override
+    public List<StockAttachment> getListByBusi(String busi) {
+        if(StringUtil.isEmpty(busi)){
+            throw new ServiceException("参数异常");
+        }
+        return list(Wrappers.<StockAttachment>query().lambda().eq(StockAttachment::getBusiId,busi));
+    }
+}