From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java | 6 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java | 6 +
ruoyi-project/target/classes/com/ruoyi/project/domain/dto/SmsDTO.class | 0
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 4 +
ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class | 0
ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationCompletionBaseInfoDTO.java | 9 +++
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 | 89 +++++++++++++++++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java | 7 ++
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml | 4 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java | 5 -
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java | 8 ++
13 files changed, 149 insertions(+), 10 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..e204090
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
@@ -0,0 +1,89 @@
+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.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.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Base64;
+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= keyForMd5(loginName.toLowerCase(),passWord.toLowerCase());
+ key="5b2d0edb45ac3583543fbf55d8af1e6d";
+ String content="{\"LoginName\":\""+loginName+"\",\"PassWord\":\""+passWord+"\"," +
+ "\"Key\":\""+key+"\"," +
+ "\"Tel\":\""+DTO.getTel()+"\",\"MessageContent\":\""+DTO.getMessageContent()+"\"}";
+ String result= HttpUtils.sendPost(url, Base64.getEncoder().encodeToString(content.getBytes()) );
+ return AjaxResult.success(result);
+ } else {
+ return AjaxResult.error("鐢佃瘽鍜屾秷鎭笉鑳戒负绌�");
+ }
+ }
+ public String keyForMd5(String name, String pass)
+ {
+ return md5(md5(pass) + pass + md5(name));
+ }
+
+
+ public static String md5(String str) {
+
+ return hashPasswordForStoring(str,"MD5");
+ }
+
+ public static String SHA1(String str) {
+
+ return hashPasswordForStoring(str,"SHA1");
+ }
+
+ public static String hashPasswordForStoring(String password, String algorithm) {
+ try {
+ // 1. 鑾峰彇鍝堝笇绠楁硶瀹炰緥
+ MessageDigest md = MessageDigest.getInstance(algorithm);
+ // 2. 瀵嗙爜杞� UTF-8 瀛楄妭锛堝拰 .NET 瀹屽叏涓�鑷达級
+ byte[] passwordBytes = password.getBytes(StandardCharsets.UTF_8);
+ // 3. 璁＄畻鍝堝笇
+ byte[] hashBytes = md.digest(passwordBytes);
+ // 4. 杞负澶у啓鍗佸叚杩涘埗瀛楃涓诧紙鍜� .NET 杈撳嚭鏍煎紡涓�鑷达級
+ return bytesToHexUpperCase(hashBytes);
+
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException("涓嶆敮鎸佺殑鍝堝笇绠楁硶: " + algorithm, e);
+ }
+ }
+ private static String bytesToHexUpperCase(byte[] bytes) {
+ StringBuilder sb = new StringBuilder();
+ for (byte b : bytes) {
+ // 杞袱浣嶅ぇ鍐欏崄鍏繘鍒�
+ sb.append(String.format("%02X", b));
+ }
+ return sb.toString();
+ }
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
index c235d7d..d444ab8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
@@ -72,8 +72,7 @@
//琛ュ厖 闄勪欢
ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
serviceTransportFile.setDelFlag(0);
- serviceTransportFile.setTransportId(transport.getReportId());
- serviceTransportFile.setCaseNo(transport.getCaseNo());
+ serviceTransportFile.setTransportId(transport.getId());
List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
transport.setAnnexfilesList(serviceTransportFiles);
}
@@ -107,7 +106,7 @@
public AjaxResult edit(@RequestBody ServiceTransport serviceTransport) {
boolean b = serviceTransportService.updateById(serviceTransport);
if (b) {
- serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getReportId(), serviceTransport.getCaseNo(), getNickName());
+ serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getId(), serviceTransport.getCaseNo(), getNickName());
}
return toAjax(b);
}
diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class
new file mode 100644
index 0000000..9875c36
--- /dev/null
+++ b/ruoyi-admin/target/classes/com/ruoyi/web/controller/common/SmsController.class
Binary files differ
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..47825d3 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,13 @@
@ApiModelProperty("瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
@Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String completeState;
+
+ @ApiModelProperty("浜插睘鍏崇郴")
+ @Excel(name = "浜插睘鍏崇郴")
+ private String signfamilyrelations;
+
+ @ApiModelProperty("浜插睘濮撳悕")
+ @Excel(name = "浜插睘濮撳悕")
+ private String relationname;
}
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..575c86b 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,13 @@
@Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String completeState;
+ @ApiModelProperty("浜插睘鍏崇郴")
+ @Excel(name = "浜插睘鍏崇郴")
+ private String signfamilyrelations;
+
+ @ApiModelProperty("浜插睘濮撳悕")
+ @Excel(name = "浜插睘濮撳悕")
+ private String relationname;
+
+
}
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..e96382c 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,12 @@
@Excel(name = "瀹屾垚鐘舵��1寰呭埄鐢紝2杩涜涓紝3鎹愮尞瀹屾垚锛�4鏀惧純")
private String completeState;
+ @ApiModelProperty("浜插睘鍏崇郴")
+ @Excel(name = "浜插睘鍏崇郴")
+ private String signfamilyrelations;
+
+ @ApiModelProperty("浜插睘濮撳悕")
+ @Excel(name = "浜插睘濮撳悕")
+ private String relationname;
}
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/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
index 09e782c..aef9bcd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportFileServiceImpl.java
@@ -77,9 +77,9 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long reportId,String caseNo,String updateName) {
+ public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long transportId,String caseNo,String updateName) {
// 鍏堝皢鏁版嵁鏌ュ嚭鏉�
- List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, reportId));
+ List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, transportId));
// 鎻愬彇鐜版湁璁板綍鐨勮矾寰勯泦鍚堬紝鐢ㄤ簬楂樻晥姣旇緝
Set<String> existingPaths = list.stream().map(file -> file.getFileName() != null ? file.getPath().trim() : "").filter(StringUtils::isNotEmpty).collect(Collectors.toSet());
@@ -103,7 +103,7 @@
for (ServiceTransportFile serviceTransportFile : annexfilesList) {
if (StringUtils.isNotEmpty(serviceTransportFile.getFileName()) && !existingPaths.contains(serviceTransportFile.getFileName().trim())) {
serviceTransportFile.setId(null);
- serviceTransportFile.setTransportId(reportId);
+ serviceTransportFile.setTransportId(transportId);
serviceTransportFile.setCreateBy(updateName);
serviceTransportFile.setUpdateTime(new Date());
result &= save(serviceTransportFile);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
index 4c2c8d1..f457903 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
@@ -58,7 +58,6 @@
ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
serviceTransportFile.setDelFlag(0);
serviceTransportFile.setTransportId(serviceTransport1.getId());
- serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
serviceTransport1.setAnnexfilesList(serviceTransportFiles);
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 5ae8d56..51fb2f7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -208,7 +208,9 @@
sdc.CoordinatedUserNameT AS coordinatedusernamet,
sdc.AssessAnnex AS assessannex,
sdc.DonateOrgan AS donateorgan,
- sdc.complete_state as completeState
+ sdc.complete_state as completeState,
+ sdc.signfamilyrelations,
+ sdc.relationname
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
diff --git a/ruoyi-project/target/classes/com/ruoyi/project/domain/dto/SmsDTO.class b/ruoyi-project/target/classes/com/ruoyi/project/domain/dto/SmsDTO.class
new file mode 100644
index 0000000..094f94f
--- /dev/null
+++ b/ruoyi-project/target/classes/com/ruoyi/project/domain/dto/SmsDTO.class
Binary files differ
--
Gitblit v1.9.3