捐献完成表新增亲属关系 新开发短信接口

sinake

4 天以前 e5b661a2f8afde7423c5e9e6b0b0e295832776d0

捐献完成表新增亲属关系
新开发短信接口

 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("电话和消息不能为空");
        }
    }
}

 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;
}


 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;


}

 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;
}

 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;
}


 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);
                    }
                }
            }
        }

 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

 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