ljy121 před 1 rokem
rodič
revize
4943c91a92

+ 2 - 0
zjugis-business/src/main/java/com/zjugis/business/bean/dto/ProjectDto.java

@@ -41,6 +41,8 @@ public class ProjectDto extends PageParam {
 
     private String userId;
 
+    private String xmjlId;
+
     private Integer isRelContract;
 
 

+ 3 - 0
zjugis-business/src/main/resources/mapper/oracle/ProjectMapper.xml

@@ -75,6 +75,9 @@
             <if test="params != null and params.deptId != null and params.deptId != ''">
                 AND P.ZRBM_ID = #{params.deptId}
             </if>
+            <if test="params != null and params.xmjlId != null and params.xmjlId != ''">
+                AND P.XMJL_ID = #{params.xmjlId}
+            </if>
         </where>
         ORDER BY
         <choose>

+ 25 - 0
zjugis-module-infra/zjugis-module-infra-api/src/main/java/com/zjugis/module/infra/api/ding/DingApi.java

@@ -0,0 +1,25 @@
+package com.zjugis.module.infra.api.ding;
+
+import com.zjugis.framework.common.pojo.CommonResult;
+import com.zjugis.module.infra.api.ding.dto.DingMessageDto;
+import com.zjugis.module.infra.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import javax.validation.Valid;
+
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿:fallbackFactory =
+@Tag(name = "RPC 服务 - 钉钉")
+public interface DingApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/ding";
+
+
+    @PostMapping(PREFIX + "/send-message")
+    @Operation(summary = "发送钉钉消息")
+    CommonResult<String> sendMessage(@Valid @RequestBody DingMessageDto dingMessageDto);
+
+}

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

@@ -0,0 +1,19 @@
+package com.zjugis.module.infra.api.ding.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/4/10 17:35
+ */
+@Data
+public class DingMessageDto {
+
+    @NotBlank
+    String userId;
+
+    String content;
+}

binární
zjugis-module-infra/zjugis-module-infra-biz/src/lib/ding/taobao-sdk-java-auto_1479188381469-20200507.jar


+ 49 - 0
zjugis-module-infra/zjugis-module-infra-biz/src/main/java/com/zjugis/module/infra/api/ding/DingApiImpl.java

@@ -0,0 +1,49 @@
+package com.zjugis.module.infra.api.ding;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zjugis.framework.common.pojo.CommonResult;
+import com.zjugis.module.infra.api.ding.dto.DingMessageDto;
+import com.zjugis.module.infra.service.ding.DingService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/4/10 17:22
+ */
+@RestController // 提供 RESTful API 接口,给 Feign 调用
+@Validated
+public class DingApiImpl implements DingApi {
+
+        @Autowired
+        DingService dingService;
+
+        /**
+         * @param dingMessageDto
+         * @return
+         */
+        @Override
+        public CommonResult<String> sendMessage(DingMessageDto dingMessageDto) {
+                Map<String, String> params = new HashMap<>();
+                params.put("id", dingMessageDto.getUserId());
+                // TODO
+//                String userApiUrl = ApiUtils.getzUserOrgRightUrl() + "/UsersApi/getUserById";
+//                //调用接口获取数据
+//                String userResult = ServiceApiUtils.getDataFromServiceApi(userApiUrl, params);
+//                JSONObject userJsonObject = JSONObject.parseObject(userResult);
+//                Map<String, Object> userObject = (Map) userJsonObject;
+//                String phone = (String) userObject.get("mobilePhone");
+//                if(StringUtils.isBlank(phone)){
+//                        return "用户手机号不存在,无法获取钉钉用户";
+//                }
+//                return dingService.sendNotification(phone, content);
+                return null;
+        }
+}
+

+ 9 - 0
zjugis-module-infra/zjugis-module-infra-biz/src/main/java/com/zjugis/module/infra/service/ding/DingService.java

@@ -0,0 +1,9 @@
+package com.zjugis.module.infra.service.ding;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/4/10 17:40
+ */
+public interface DingService {
+}

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

@@ -0,0 +1,17 @@
+package com.zjugis.module.infra.service.ding;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+/**
+ * @author ljy
+ * @version 1.0
+ * @date 2024/4/10 17:40
+ */
+@Service
+@Validated
+@Slf4j
+public class DingServiceImpl implements DingService{
+
+}