fix sdk

zjugis-business/src/main/java/com/zjugis/business/flow/common/event/CommonEvent.java

@@ -1,7 +1,6 @@
 package com.zjugis.business.flow.common.event;
 
 import com.alibaba.nacos.common.utils.StringUtils;
-import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.workflow.exception.BusinessException;
 import com.zjugis.framework.workflow.model.BaseController;
@@ -12,6 +11,7 @@ import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
 import com.zjugis.framework.workflow.spring.resovler.ParamModel;
 import com.zjugis.module.infra.api.ding.DingApi;
 import com.zjugis.module.infra.api.ding.dto.DingMessageDto;
+import com.zjugis.module.infra.api.ding.dto.OA;
 import com.zjugis.module.infra.api.ding.enums.DingMsg;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import lombok.extern.slf4j.Slf4j;
@@ -75,16 +75,16 @@ public class CommonEvent extends BaseController {
                         content += "【" + flowName + "】："+describtion.toString() +"。";
                     }
                     if(StringUtils.isNotBlank(mobileUrl)){
-                        OapiMessageCorpconversationAsyncsendV2Request.OA oa = new OapiMessageCorpconversationAsyncsendV2Request.OA();
+                        OA oa = new OA();
                         oa.setMessageUrl(mobileUrl);
                         if(StringUtils.isNotBlank(pcUrl)){
                             oa.setPcMessageUrl(pcUrl);
                         }
-                        OapiMessageCorpconversationAsyncsendV2Request.Head head = new OapiMessageCorpconversationAsyncsendV2Request.Head();
+                        OA.Head head = new OA.Head();
                         head.setBgcolor("FFBBBBBB");
                         head.setText("浙江万维OA");
                         oa.setHead(head);
-                        OapiMessageCorpconversationAsyncsendV2Request.Body body = new OapiMessageCorpconversationAsyncsendV2Request.Body();
+                        OA.Body body = new OA.Body();
                         body.setContent(content);
                         oa.setBody(body);
                         DingMessageDto message = new DingMessageDto(item.getUserId());

zjugis-module-infra/zjugis-module-infra-api/pom.xml

@@ -42,14 +42,6 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <optional>true</optional>
         </dependency>
-
-        <dependency>
-            <groupId>com.zjugis</groupId>
-            <artifactId>taobao-sdk-java-auto</artifactId>
-            <version>1479188381469-20200507</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/lib/ding/taobao-sdk-java-auto-1479188381469-20200507.jar</systemPath>
-        </dependency>
     </dependencies>
 
 </project>

zjugis-module-infra/zjugis-module-infra-api/src/main/java/com/zjugis/module/infra/api/ding/dto/DingMessageDto.java

@@ -1,6 +1,5 @@
 package com.zjugis.module.infra.api.ding.dto;
 
-import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
 import com.zjugis.module.infra.api.ding.enums.DingMsg;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -24,9 +23,9 @@ public class DingMessageDto implements Serializable {
 
     String content;
 
-    OapiMessageCorpconversationAsyncsendV2Request.Link link;
+    Link link;
 
-    OapiMessageCorpconversationAsyncsendV2Request.OA oa;
+    OA oa;
 
     public DingMessageDto(String userId){
         this.userId = userId;

zjugis-module-infra/zjugis-module-infra-api/src/main/java/com/zjugis/module/infra/api/ding/dto/Form.java

@@ -0,0 +1,15 @@
+package com.zjugis.module.infra.api.ding.dto;
+
+import lombok.Data;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/5/15 9:25
+ */
+@Data
+public class Form {
+
+    private String key;
+    private String value;
+}

zjugis-module-infra/zjugis-module-infra-api/src/main/java/com/zjugis/module/infra/api/ding/dto/Link.java

@@ -0,0 +1,16 @@
+package com.zjugis.module.infra.api.ding.dto;
+
+import lombok.Data;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/5/15 9:20
+ */
+@Data
+public class Link {
+    private String messageUrl;
+    private String picUrl;
+    private String text;
+    private String title;
+}

zjugis-module-infra/zjugis-module-infra-api/src/main/java/com/zjugis/module/infra/api/ding/dto/OA.java

@@ -0,0 +1,35 @@
+package com.zjugis.module.infra.api.ding.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/5/15 9:21
+ */
+@Data
+public class OA {
+    private Body body;
+    private Head head;
+    private String messageUrl;
+    private String pcMessageUrl;
+
+    @Data
+    public static class Head {
+        private String bgcolor;
+        private String text;
+    }
+
+    @Data
+    public static class Body {
+        private String author;
+        private String content;
+        private String fileCount;
+        private List<Form> form;
+        private String image;
+        private Rich rich;
+        private String title;
+    }
+}

zjugis-module-infra/zjugis-module-infra-api/src/main/java/com/zjugis/module/infra/api/ding/dto/Rich.java

@@ -0,0 +1,12 @@
+package com.zjugis.module.infra.api.ding.dto;
+
+import lombok.Data;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/5/15 9:25
+ */
+@Data
+public class Rich {
+}

zjugis-module-infra/zjugis-module-infra-biz/src/main/java/com/zjugis/module/infra/service/ding/DingServiceImpl.java

@@ -10,7 +10,10 @@ import com.dingtalk.api.response.OapiMessageCorpconversationAsyncsendV2Response;
 import com.dingtalk.api.response.OapiUserGetByMobileResponse;
 import com.taobao.api.ApiException;
 import com.zjugis.module.infra.api.ding.dto.DingMessageDto;
+import com.zjugis.module.infra.api.ding.dto.Link;
+import com.zjugis.module.infra.api.ding.dto.OA;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -63,9 +66,11 @@ public class DingServiceImpl implements DingService{
         return rsp.toString();
     }
 
-    private void buildOA(OapiMessageCorpconversationAsyncsendV2Request.Msg msg, OapiMessageCorpconversationAsyncsendV2Request.OA oa) {
+    private void buildOA(OapiMessageCorpconversationAsyncsendV2Request.Msg msg, OA oa) {
         msg.setMsgtype("oa");
-        msg.setOa(oa);
+        OapiMessageCorpconversationAsyncsendV2Request.OA entity = new OapiMessageCorpconversationAsyncsendV2Request.OA();
+        BeanUtils.copyProperties(oa,entity);
+        msg.setOa(entity);
     }
 
     private void buildText(OapiMessageCorpconversationAsyncsendV2Request.Msg msg,String content){
@@ -74,9 +79,11 @@ public class DingServiceImpl implements DingService{
         msg.getText().setContent(content);
     }
 
-    private void buildLink( OapiMessageCorpconversationAsyncsendV2Request.Msg msg,OapiMessageCorpconversationAsyncsendV2Request.Link link) throws ApiException {
+    private void buildLink(OapiMessageCorpconversationAsyncsendV2Request.Msg msg, Link link) throws ApiException {
         msg.setMsgtype("link");
-        msg.setLink(link);
+        OapiMessageCorpconversationAsyncsendV2Request.Link entity = new OapiMessageCorpconversationAsyncsendV2Request.Link();
+        BeanUtils.copyProperties(link,entity);
+        msg.setLink(entity);
     }