Merge branch 'feature/REQ-1899' into 'pre'

Feature/req 1899

See merge request universal/infrastructure/backend/im-center!32

.gitignore

@@ -1,35 +1,51 @@
-### STS ###
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### eclipse ###
 .apt_generated
 .classpath
 .factorypath
 .project
 .settings
 .springBeans
-.sts4-cache
-
 
 ### IntelliJ IDEA ###
-*/target/
-.idea/
+.idea
 *.iws
 *.iml
 *.ipr
 
 ### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
 
-### VS Code ###
-.vscode/
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+.DS_Store
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
+
+### JRebel ###
 rebel.xml
-.flattened-pom.xml
-**/target
-/.idea/
-/.idea/
-/.idea/libraries/
+
+
+.flattened-pom.xml

im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagReq.java

@@ -1,12 +1,15 @@
 package cn.axzo.im.center.api.vo.req;
 
-import lombok.*;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
 /**
  * 机器人标签创建请求
  *
@@ -50,4 +53,9 @@ public class RobotTagReq {
      */
     @NotNull(message = "机器人标签颜色不能为空")
     private String color;
+
+    /**
+     * 标签文字颜色
+     */
+    private String borderColor;
 }

im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java

@@ -1,10 +1,13 @@
 package cn.axzo.im.center.api.vo.req;
 
-import lombok.*;
-import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-
 import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
 
 /**
  * 机器人标签更新
@@ -52,4 +55,9 @@ public class UpdateRobotTagReq {
      * 机器人Tag颜色
      */
     private String color;
+
+    /**
+     * 标签文字颜色
+     */
+    private String borderColor;
 }

im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java

@@ -39,6 +39,11 @@ public class RobotTagResp {
      */
     private String color;
 
+    /**
+     * 标签文字颜色
+     */
+    private String borderColor;
+
 
     /**
      * 被机器人使用数量

im-center-server/pom.xml

@@ -94,10 +94,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>cn.axzo.apollo</groupId>
-            <artifactId>apollo-workspace-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>cn.axzo.im.center</groupId>
             <artifactId>im-center-api</artifactId>

im-center-server/src/main/java/cn/axzo/im/entity/RobotTag.java

@@ -51,5 +51,9 @@ public class RobotTag extends BaseEntity<RobotTag> implements Serializable {
     @TableField("color")
     private String color;
 
-
+    /**
+     * 机器人Tag 边框颜色
+     */
+    @TableField("border_color")
+    private String borderColor;
 }

im-center-server/src/main/java/cn/axzo/im/service/RobotInfoService.java

@@ -164,6 +164,9 @@ public class RobotInfoService {
                 return;
             }
             List<Long> tagIdList = robotInfo.getTagNameList();
+            if(CollectionUtils.isEmpty(tagIdList)){
+                return;
+            }
             List<RobotTag> robotTags = robotTagDao.queryRobotTagValidList(tagIdList);
             List<RobotTagResp> robotTagsResp = BeanMapper.copyList(robotTags, RobotTagResp.class);
             robotInfoResp.setRobotTagList(robotTagsResp);