From e5b661a2f8afde7423c5e9e6b0b0e295832776d0 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 21 五月 2026 11:28:35 +0800
Subject: [PATCH] 捐献完成表新增亲属关系 新开发短信接口
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java | 3 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 3 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java | 6 ++
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 4 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java | 5 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/SmsDTO.java | 20 ++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 46 +++++++++++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java | 4 ++
8 files changed, 88 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
new file mode 100644
index 0000000..93e92a4
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
@@ -0,0 +1,46 @@
+package com.ruoyi.web.controller.common;
+
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.common.utils.sign.Base64;
+import com.ruoyi.common.utils.sign.Md5Utils;
+import com.ruoyi.project.domain.GiApi;
+import com.ruoyi.project.domain.dto.ApiDTO;
+import com.ruoyi.project.domain.dto.SmsDTO;
+import com.ruoyi.project.service.IApiService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Api(description = "鐭俊鏈嶅姟")
+@RestController
+@RequestMapping("/sms")
+public class SmsController {
+ private String url="http://103.21.119.249:3131/http/send.aspx";
+ private String loginName="qddxfsyy";
+ private String passWord="Qyfy_0718";
+ @ApiOperation("鐭俊鏈嶅姟->鍙戦�佺煭淇�")
+ @PostMapping("/send")
+ public AjaxResult getApiList(@RequestBody SmsDTO DTO) {
+ if (ObjectUtils.isNotEmpty(DTO.getTel())&&ObjectUtils.isNotEmpty(DTO.getMessageContent())) {
+ String key= Md5Utils.hash(Md5Utils.hash(passWord.toLowerCase())+passWord.toLowerCase()+Md5Utils.hash(loginName.toLowerCase()));
+ key="5b2d0edb45ac3583543fbf55d8af1e6d";
+ String content="{\"LoginName\":\""+loginName+"\",\"PassWord\":\""+passWord+"\"," +
+ "\"Key\":\""+key+"\"," +
+ "\"Tel\":\""+DTO.getTel()+"\",\"MessageContent\":\""+DTO.getMessageContent()+"\"}";
+ String result= HttpUtils.sendPost(url, Base64.encode(content.getBytes()) );
+ return AjaxResult.success(result);
+ } else {
+ return AjaxResult.error("鐢佃瘽鍜屾秷鎭笉鑳戒负绌�");
+ }
+ }
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java
index 5af0226..866c114 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java
@@ -134,5 +134,9 @@
@ApiModelProperty("瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
@Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String completeState;
+
+ @ApiModelProperty("浜插睘鍏崇郴")
+ @Excel(name = "浜插睘鍏崇郴")
+ private String signfamilyrelations;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
index 9528af4..ea04e9a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java
@@ -215,4 +215,9 @@
@Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String completeState;
+ @ApiModelProperty("浜插睘鍏崇郴")
+ @Excel(name = "浜插睘鍏崇郴")
+ private String signfamilyrelations;
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/SmsDTO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/SmsDTO.java
new file mode 100644
index 0000000..c1ce47a
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/SmsDTO.java
@@ -0,0 +1,20 @@
+package com.ruoyi.project.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@NoArgsConstructor
+@ApiModel("鐭俊")
+public class SmsDTO {
+
+ @ApiModelProperty("鐢佃瘽鍙风爜")
+ private String tel;
+
+ @ApiModelProperty("鐢佃瘽鍙风爜")
+ private String messageContent;
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java
index 6e09c48..b0a233f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java
@@ -139,5 +139,8 @@
@Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String completeState;
+ @ApiModelProperty("浜插睘鍏崇郴")
+ @Excel(name = "浜插睘鍏崇郴")
+ private String signfamilyrelations;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
index d1a21d1..5db6561 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
@@ -152,7 +152,11 @@
b = updateById(serviceDonateorganBase);
if (b == true && CollectionUtils.isNotEmpty(serviceDonateorganBaseVO.getServiceDonateorganList())) {
for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganBaseVO.getServiceDonateorganList()) {
- serviceDonateorganMapper.updateById(serviceDonateorgan);
+ if(ObjectUtils.isNotEmpty(serviceDonateorgan.getId()) ) {
+ serviceDonateorganMapper.updateById(serviceDonateorgan);
+ }else {
+ serviceDonateorganMapper.insert(serviceDonateorgan);
+ }
}
}
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 5ae8d56..33156c6 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -208,7 +208,8 @@
sdc.CoordinatedUserNameT AS coordinatedusernamet,
sdc.AssessAnnex AS assessannex,
sdc.DonateOrgan AS donateorgan,
- sdc.complete_state as completeState
+ sdc.complete_state as completeState,
+ sdc.signfamilyrelations
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 0c66ac5..de7c323 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -158,7 +158,9 @@
st.OrganDonation_Other as organdonationOther,
st.DonationCategory as donationcategory,
st.DeathJudgeAnnex as deathjudgeannex,
- st.witness_state as witnessState
+ st.witness_state as witnessState,
+ st.IsSpendRemember as isspendremember,
+ st.IsRestoreRemains as isrestoreremains
FROM
service_donatebaseinfo sd
LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
--
Gitblit v1.9.3