添加---市级的审核驳回短信发送功能，添加日志信息

src/main/java/com/bootdo/datas/domain/GyUnitDO.java

@@ -276,4 +276,31 @@ public class GyUnitDO implements Serializable {
     public void setNote(String note) {
         this.note = note;
     }
+
+    @Override
+    public String toString() {
+        return "GyUnitDO{" +
+                "id=" + id +
+                ", reporterUnit='" + reporterUnit + '\'' +
+                ", creditCode='" + creditCode + '\'' +
+                ", unitCharacter='" + unitCharacter + '\'' +
+                ", industryTypeOne='" + industryTypeOne + '\'' +
+                ", industryTypeTwo='" + industryTypeTwo + '\'' +
+                ", unitProvince='" + unitProvince + '\'' +
+                ", unitCity='" + unitCity + '\'' +
+                ", supervisoryOrg='" + supervisoryOrg + '\'' +
+                ", unitMan='" + unitMan + '\'' +
+                ", unitOffice='" + unitOffice + '\'' +
+                ", dataSecurityMan='" + dataSecurityMan + '\'' +
+                ", dataSecurityId='" + dataSecurityId + '\'' +
+                ", dataSecurityOffice='" + dataSecurityOffice + '\'' +
+                ", dataSecurityWay='" + dataSecurityWay + '\'' +
+                ", status='" + status + '\'' +
+                ", auditStatus='" + auditStatus + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", note='" + note + '\'' +
+                ", mobilePhone='" + mobilePhone + '\'' +
+                '}';
+    }
 }

src/main/java/com/bootdo/datas/dto/GyDataImportDTO.java

@@ -1000,4 +1000,87 @@ public class GyDataImportDTO {
     public void setDataDesc(String dataDesc) {
         this.dataDesc = dataDesc;
     }
+
+    @Override
+    public String toString() {
+        return "GyDataImportDTO{" +
+                "id=" + id +
+                ", reporterUnit='" + reporterUnit + '\'' +
+                ", status='" + status + '\'' +
+                ", creditCode='" + creditCode + '\'' +
+                ", supervisoryOrg='" + supervisoryOrg + '\'' +
+                ", unitCharacter='" + unitCharacter + '\'' +
+                ", industryTypeOne='" + industryTypeOne + '\'' +
+                ", industryTypeTwo='" + industryTypeTwo + '\'' +
+                ", unitProvince='" + unitProvince + '\'' +
+                ", unitCity='" + unitCity + '\'' +
+                ", unitMan='" + unitMan + '\'' +
+                ", unitOffice='" + unitOffice + '\'' +
+                ", dataSecurityMan='" + dataSecurityMan + '\'' +
+                ", dataSecurityId='" + dataSecurityId + '\'' +
+                ", dataSecurityOffice='" + dataSecurityOffice + '\'' +
+                ", dataSecurityWay='" + dataSecurityWay + '\'' +
+                ", dataName='" + dataName + '\'' +
+                ", dataTypeBase='" + dataTypeBase + '\'' +
+                ", dataTypeRoot='" + dataTypeRoot + '\'' +
+                ", dataTypeOne='" + dataTypeOne + '\'' +
+                ", dataTypeTwo='" + dataTypeTwo + '\'' +
+                ", dataTypeThree='" + dataTypeThree + '\'' +
+                ", dataTypeFour='" + dataTypeFour + '\'' +
+                ", dataLevel='" + dataLevel + '\'' +
+                ", dataCarrier='" + dataCarrier + '\'' +
+                ", dataSource='" + dataSource + '\'' +
+                ", dataNum=" + dataNum +
+                ", dataNumGb=" + dataNumGb +
+                ", dataScope='" + dataScope + '\'' +
+                ", dataProportion='" + dataProportion + '\'' +
+                ", dataPrecision='" + dataPrecision + '\'' +
+                ", dataPrecisionDes='" + dataPrecisionDes + '\'' +
+                ", dataHandleType='" + dataHandleType + '\'' +
+                ", dataResult='" + dataResult + '\'' +
+                ", isAlgorithmHandle='" + isAlgorithmHandle + '\'' +
+                ", isCross='" + isCross + '\'' +
+                ", crossAcceptName='" + crossAcceptName + '\'' +
+                ", dataCrossResult='" + dataCrossResult + '\'' +
+                ", dataCrossType='" + dataCrossType + '\'' +
+                ", isCrossEncrypt='" + isCrossEncrypt + '\'' +
+                ", isSecurityAss='" + isSecurityAss + '\'' +
+                ", assessResult='" + assessResult + '\'' +
+                ", reorganize='" + reorganize + '\'' +
+                ", isApproval='" + isApproval + '\'' +
+                ", isCrossMain='" + isCrossMain + '\'' +
+                ", crossmainAcceptName='" + crossmainAcceptName + '\'' +
+                ", dataCrossmainResult='" + dataCrossmainResult + '\'' +
+                ", dataCrossmainType='" + dataCrossmainType + '\'' +
+                ", isCrossmainEncrypt='" + isCrossmainEncrypt + '\'' +
+                ", isCrossmainFlow='" + isCrossmainFlow + '\'' +
+                ", isForeignData='" + isForeignData + '\'' +
+                ", crossmainNum='" + crossmainNum + '\'' +
+                ", infoSystemName='" + infoSystemName + '\'' +
+                ", infoSystemType='" + infoSystemType + '\'' +
+                ", infoSystemIpAddress='" + infoSystemIpAddress + '\'' +
+                ", infoSystemDomainName='" + infoSystemDomainName + '\'' +
+                ", infoSystemDes='" + infoSystemDes + '\'' +
+                ", infoSystemEncrypt='" + infoSystemEncrypt + '\'' +
+                ", securityCognizance='" + securityCognizance + '\'' +
+                ", comSecurityCognizance='" + comSecurityCognizance + '\'' +
+                ", isKetSystem='" + isKetSystem + '\'' +
+                ", isKeydataAss='" + isKeydataAss + '\'' +
+                ", assessOrg='" + assessOrg + '\'' +
+                ", assessBase='" + assessBase + '\'' +
+                ", assessTime='" + assessTime + '\'' +
+                ", dataAssessResult='" + dataAssessResult + '\'' +
+                ", securityReorganize='" + securityReorganize + '\'' +
+                ", dataStatus='" + dataStatus + '\'' +
+                ", uploadTime=" + uploadTime +
+                ", updateTime=" + updateTime +
+                ", gyUnitId='" + gyUnitId + '\'' +
+                ", roleId=" + roleId +
+                ", nextVerifyDept=" + nextVerifyDept +
+                ", sendVerify='" + sendVerify + '\'' +
+                ", deleteStatus='" + deleteStatus + '\'' +
+                ", dataDesc='" + dataDesc + '\'' +
+                ", auditStage='" + auditStage + '\'' +
+                '}';
+    }
 }

src/main/java/com/bootdo/datas/service/MessageService.java

@@ -6,6 +6,9 @@ import cn.com.scca.api.data.request.message.SendSmsByTemplateRequest;
 import cn.com.scca.api.data.response.message.SendSmsByTemplateResponse;
 import cn.com.scca.api.error.ApiException;
 import cn.com.scca.api.result.ResponseResult;
+import com.bootdo.datas.controller.GyDataImportController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +17,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class MessageService {
+    private static Logger log = LoggerFactory.getLogger(MessageService.class);
 
     @Value("${message_gateway.prefix:#{null}}")
     private String gateWayPrefix;
@@ -37,6 +41,8 @@ public class MessageService {
      * @return
      */
     public Integer importance(String phoneNumberList, String templateParams) {
+        log.error("========短信的参数phoneNumberList："+phoneNumberList);
+        log.error("========短信的参数templateParams："+templateParams);
         SccaClient sccaClient = new DefaultSccaClient(
                 this.gateWayPrefix,
                 this.gatewayAppId,

src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -566,19 +566,26 @@ public class GyDataServiceImpl implements GyDataService {
                 examineLogService.save(dto);
             }
 
-            //发送短息
-            if("1".equals(data.getAuditStage())){
-                //审核阶段：   1:市级，2：省级
-                GyUnitDO gyUnitDO = gyUnitDao.getGyUnitByCreditCode(data.getGyUnitId());
-                if(Objects.nonNull(gyUnitDO)){
-                    log.error("=====================发送短信了======"+gyUnitDO.toString());
-                    messageService.importance(gyUnitDO.getDataSecurityWay()+","+gyUnitDO.getMobilePhone(),
-                            data.getDataName());
-                }else {
-                    log.error("=========企业的组织机构代码："+data.getGyUnitId()+",查询不到对应的企业信息===========");
+            //通过数据id，查询数据信息
+            GyDataImportDTO importDTO = gyDataDao.get(data.getId());
+            if(Objects.nonNull(importDTO)){
+                log.error("=====================发送短信了===数据信息查询==="+importDTO.toString());
+                //发送短息
+                if("1".equals(importDTO.getAuditStage())){
+                    //审核阶段：   1:市级，2：省级
+                    GyUnitDO gyUnitDO = gyUnitDao.getGyUnitByCreditCode(importDTO.getGyUnitId());
+                    log.error("=====================发送短信了===企业信息查询==="+gyUnitDO.toString());
+                    if(Objects.nonNull(gyUnitDO)){
+                        log.error("=====================发送短信了======"+gyUnitDO.toString());
+                        messageService.importance(gyUnitDO.getDataSecurityWay()+","+gyUnitDO.getMobilePhone(),
+                                importDTO.getDataName());
+                    }else {
+                        log.error("=========企业的组织机构代码："+importDTO.getGyUnitId()+",查询不到对应的企业信息===========");
+                    }
                 }
+            }else {
+                log.error("=========数据id："+data.getId()+",查询不到对应的数据信息===========");
             }
-
         }
     }