提交遗漏修改

.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="@localhost" uuid="ae9ddb7d-d7b5-4954-adf9-f873ecb1ac9f">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

src/main/java/com/gitlink/softbot/config/CustomMetaObjectHandler.java

@@ -0,0 +1,21 @@
+package com.gitlink.softbot.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Date;
+
+@Configuration
+public class CustomMetaObjectHandler implements MetaObjectHandler {
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.setFieldValByName("createTime", new Date(), metaObject);
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+}

src/main/java/com/gitlink/softbot/dao/db/MarketBotMapper.java

@@ -0,0 +1,9 @@
+package com.gitlink.softbot.dao.db;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gitlink.softbot.entity.db.MarketBot;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MarketBotMapper extends BaseMapper<MarketBot> {
+}

src/main/java/com/gitlink/softbot/dao/db/TransferBotMapper.java

@@ -0,0 +1,9 @@
+package com.gitlink.softbot.dao.db;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gitlink.softbot.entity.db.TransferBot;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TransferBotMapper extends BaseMapper<TransferBot> {
+}

src/main/java/com/gitlink/softbot/entity/db/MarketBot.java

@@ -0,0 +1,48 @@
+package com.gitlink.softbot.entity.db;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("market_bot")
+public class MarketBot {
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    private Integer botId;
+
+    private String marketName;
+
+    private String marketDesc;
+
+    private String firstFunc;
+
+    private String secondFunc;
+
+    private String webhook;
+
+    private Integer isReceiveAg1;
+
+    private Integer isReceiveAg2;
+
+    private Date marketTime;
+
+    private String logo;
+
+    private Integer installNum;
+
+    private String category;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}

src/main/java/com/gitlink/softbot/entity/db/TransferBot.java

@@ -0,0 +1,34 @@
+package com.gitlink.softbot.entity.db;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("transfer_bot")
+public class TransferBot {
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    private Integer botId;
+
+    private Integer transferFromId;
+
+    private Integer transferToId;
+
+    private Integer isSuccess;
+
+    private Date transferTime;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}

src/main/java/com/gitlink/softbot/vo/BotToMarketRequest.java

@@ -0,0 +1,37 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BotToMarketRequest implements Serializable {
+    private Integer userId;
+
+    private Integer botId;
+
+    private String marketName;
+
+    private String marketDesc;
+
+    private String firstFunc;
+
+    private String secondFunc;
+
+    private String webhook;
+
+    private Integer isReceiveAg1;
+
+    private Integer isReceiveAg2;
+
+    private Date marketTime;
+
+    private String logo;
+
+    private String category;
+}

src/main/java/com/gitlink/softbot/vo/CancelTransferBotRequest.java

@@ -0,0 +1,15 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CancelTransferBotRequest implements Serializable {
+    private Integer userId;
+    private Integer botId;
+}

src/main/java/com/gitlink/softbot/vo/DeleteBotRequest.java

@@ -0,0 +1,13 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class DeleteBotRequest {
+    private Integer userId;
+    private Integer botId;
+}

src/main/java/com/gitlink/softbot/vo/DeleteInstallBotRequest.java

@@ -0,0 +1,15 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeleteInstallBotRequest {
+    private Integer userId;
+    private Integer botId;
+    private String password;
+}

src/main/java/com/gitlink/softbot/vo/GetBotRequest.java

@@ -0,0 +1,14 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetBotRequest implements Serializable {
+    private Integer userId;
+}

src/main/java/com/gitlink/softbot/vo/GetBotResponse.java

@@ -0,0 +1,15 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetBotResponse {
+    private Integer userId;
+    private List<BotOutputVO> list;
+}

src/main/java/com/gitlink/softbot/vo/GetInstallBotRequest.java

@@ -0,0 +1,15 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetInstallBotRequest implements Serializable {
+    private Integer userId;
+    private Integer botId;
+}

src/main/java/com/gitlink/softbot/vo/GetInstallBotResponse.java

@@ -0,0 +1,20 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetInstallBotResponse implements Serializable {
+    private Integer userId;
+    private Integer botId;
+    private String marketName;
+    private Integer state;
+    private List<Integer> storeIdList;
+    private List<Integer> allStoreIdList;
+}

src/main/java/com/gitlink/softbot/vo/GetMarketBotsRequest.java

@@ -0,0 +1,14 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetMarketBotsRequest implements Serializable {
+    private Integer userId;
+}

src/main/java/com/gitlink/softbot/vo/GetMarketBotsResponse.java

@@ -0,0 +1,54 @@
+package com.gitlink.softbot.vo;
+
+import com.gitlink.softbot.entity.db.MarketBot;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetMarketBotsResponse implements Serializable {
+    private Integer userId;
+    private List<GetMarketBot> getMarketBots;
+
+    public GetMarketBot getMarketBot(MarketBot marketBot){
+        GetMarketBot getMarketBot = new GetMarketBot();
+        getMarketBot.setMarketDesc(marketBot.getMarketDesc());
+        getMarketBot.setMarketTime(marketBot.getMarketTime());
+        getMarketBot.setCategory(marketBot.getCategory());
+        getMarketBot.setFirstFunc(marketBot.getFirstFunc());
+        getMarketBot.setSecondFunc(marketBot.getSecondFunc());
+        getMarketBot.setInstallNum(marketBot.getInstallNum());
+        getMarketBot.setWebhook(marketBot.getWebhook());
+        return getMarketBot;
+    }
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+   public class GetMarketBot{
+        private String marketName;
+
+        private String marketDesc;
+
+        private String firstFunc;
+
+        private String secondFunc;
+
+        private String webhook;
+
+        private Date marketTime;
+
+        private String logo;
+
+        private Integer installNum;
+
+        private String category;
+    }
+
+}
+

src/main/java/com/gitlink/softbot/vo/GetTransferFromBotRequest.java

@@ -0,0 +1,16 @@
+package com.gitlink.softbot.vo;
+
+import io.swagger.models.auth.In;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetTransferFromBotRequest implements Serializable {
+    private Integer userId;
+    private Integer botId;
+}

src/main/java/com/gitlink/softbot/vo/GetTransferFromBotResponse.java

@@ -0,0 +1,17 @@
+package com.gitlink.softbot.vo;
+
+import com.gitlink.softbot.entity.db.RegisterBot;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetTransferFromBotResponse {
+    private Integer userId;
+    private Integer botId;
+    private Integer state;
+}

src/main/java/com/gitlink/softbot/vo/GetTransferToBotRequest.java

@@ -0,0 +1,15 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetTransferToBotRequest implements Serializable {
+    private Integer userId;
+    private Integer state;
+}

src/main/java/com/gitlink/softbot/vo/GetTransferToBotResponse.java

@@ -0,0 +1,32 @@
+package com.gitlink.softbot.vo;
+
+import com.gitlink.softbot.entity.db.MarketBot;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetTransferToBotResponse implements Serializable {
+    private Integer userId;
+    private List<GetTransferToBot> botList;
+    public GetTransferToBot getTransferToBot(MarketBot marketBot){
+        GetTransferToBot getTransferToBot = new GetTransferToBot();
+        getTransferToBot.setBotId(marketBot.getBotId());
+        getTransferToBot.setBotName(marketBot.getMarketName());
+        return getTransferToBot;
+    }
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class GetTransferToBot{
+        private Integer botId;
+        private String botName;
+    }
+}

src/main/java/com/gitlink/softbot/vo/InstallMarketBotRequest.java

@@ -0,0 +1,18 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class InstallMarketBotRequest implements Serializable {
+    private Integer userId;
+    private Integer botId;
+    private Integer state;
+    private List<Integer> storeList;
+}

src/main/java/com/gitlink/softbot/vo/MarketBotVO.java

@@ -0,0 +1,34 @@
+package com.gitlink.softbot.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MarketBotVO implements Serializable {
+
+    private Integer botId;
+
+    private String marketName;
+
+    private String marketDesc;
+
+    private String firstFunc;
+
+    private String secondFunc;
+
+    private Date marketTime;
+
+    private String logo;
+
+    private Integer installNum;
+
+    private String category;
+}

src/main/java/com/gitlink/softbot/vo/ReceiveTransferBotRequest.java

@@ -0,0 +1,16 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReceiveTransferBotRequest implements Serializable {
+    private Integer botId;
+    private Integer transferFromId;
+    private Integer transferToId;
+}

src/main/java/com/gitlink/softbot/vo/RefuseTransferBotRequest.java

@@ -0,0 +1,17 @@
+package com.gitlink.softbot.vo;
+
+import io.swagger.models.auth.In;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RefuseTransferBotRequest implements Serializable {
+    private Integer botId;
+    private Integer transferFromBot;
+    private Integer transferToBot;
+}

src/main/java/com/gitlink/softbot/vo/TransferBotRequest.java

@@ -0,0 +1,17 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TransferBotRequest implements Serializable {
+    private Integer userId;
+    private Integer userName;
+    private Integer botId;
+    private Integer transferToUserId;
+}

src/main/java/com/gitlink/softbot/vo/UpdateInstallBotRequest.java

@@ -0,0 +1,19 @@
+package com.gitlink.softbot.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UpdateInstallBotRequest implements Serializable {
+    private Integer userId;
+    private Integer botId;
+    private Integer state;
+    private String password;
+    private List<Integer> storeList;
+}