Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.EsignDemoException;
+import com.ruoyi.common.utils.WxAppletNotifyUtils;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
 import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
         String result = caseApplicationService.sendRoomNoMessage(messageVO);
         return success(result);
     }
+    /**
+     * 获取UrlScheme
+     */
+    @Anonymous
+    @PostMapping("/getUrlScheme")
+    public AjaxResult getUrlScheme() {
+        String schemeUrl = WxAppletNotifyUtils.jumpAppletSchemeUrl();
+        return success(schemeUrl);
+    }
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/WxAppletNotifyUtils.java

+package com.ruoyi.common.utils;
+
+/**
+ * @author wangqiong
+ * @description
+ * @date 2023-10-13 10:16
+ */
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @Author: Tenk
+ */
+@RequiredArgsConstructor
+@Component
+public class WxAppletNotifyUtils {
+
+    /**
+     * scheme 跳转微信小程序，需中转H5
+
+     */
+    public static String jumpAppletSchemeUrl(){
+
+         String  token= getAccessToken();
+
+        //接口地址
+        String url = "https://api.weixin.qq.com/wxa/generatescheme?access_token="+token;
+        JSONObject body = JSONUtil.createObj();
+        JSONObject jumpWxa = JSONUtil.createObj();
+        jumpWxa.putOpt("path","pages/login");
+        jumpWxa.putOpt("query","");
+        jumpWxa.putOpt("env_version","release");
+        body.putOpt("jump_wxa",jumpWxa);
+        //链接过期类型：0时间戳 1间隔天数
+        body.putOpt("expire_type",1);
+        body.putOpt("is_expire",true);
+        //指定失效天数，最多30
+        body.putOpt("expire_interval",30);
+        String post = HttpUtil.post(url,body.toJSONString(2));
+        JSONObject result = JSONUtil.parseObj(post);
+        if(result!=null){
+            result.getStr("openlink");
+        }
+        return null;
+    }
+
+
+    //凭证调用
+    public static String getAccessToken(){
+        String token;
+        //小程序APPID
+        String appid="wx91cb8459dca561b4";//自行获取
+        //小程序secret
+        String secret="190aaa3bda96a65d25318fbb0e133fc6";//自己去公众号后台获取
+        String httpUrl="https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential";
+
+        httpUrl= httpUrl+"&appid="+appid+"&secret="+secret;
+        //get请求
+        String result = HttpUtil.get(httpUrl);
+        //解析结果
+        JSONObject jsonObject = JSONUtil.parseObj(result);
+        //get AccessToken
+        token=jsonObject.get("access_token",String.class,false);
+        return token;
+    }
+
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/SealSignRecord.java

     private String orgnizeNamePsnAccount;
     /** 机构经办人名称 */
     private String orgnizeNamepsnName;
+
+    String fileDownloadUrl;
+
+    public String getFileDownloadUrl() {
+        return fileDownloadUrl;
+    }
+
+    public void setFileDownloadUrl(String fileDownloadUrl) {
+        this.fileDownloadUrl = fileDownloadUrl;
+    }
+
     /** 流程状态 */
     private Integer signFlowStatus;
     /** 签名状态 */

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 
+
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.CaseApplicationConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
 import com.ruoyi.common.core.domain.entity.SysDept;
+
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.EsignDemoException;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
+
+
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.EsignDemoException;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.wisdomarbitrate.utils.CaseLogUtils;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.io.File;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
     private SysDeptMapper sysDeptMapper;
     @Autowired
     private SysUserMapper sysUserMapper;
-
     @Autowired
     private SealSignRecordMapper sealSignRecordMapper;
     // 手机号正则
                 caseAffiliate.setCaseAppliId(caseApplication.getId());
                 if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
                     // 将组织机构id设为申请人名称
-                    if (deptMap.containsKey(caseApplication.getName())) {
+                    if (deptMap.containsKey(caseAffiliate.getName())) {
                         caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
                     } else {
                         // 如果不存在则新增
                 caseAffiliate.setCaseAppliId(caseApplication.getId());
                 if(caseAffiliate.getIdentityType()==1&&StrUtil.isNotEmpty(caseAffiliate.getName())) {
                     // 将组织机构id设为申请人名称
-                    if (deptMap.containsKey(caseApplication.getName())) {
+                    if (deptMap.containsKey(caseAffiliate.getName())) {
                         caseAffiliate.setName(String.valueOf(deptMap.get(caseAffiliate.getName())));
                     } else {
                         // 如果不存在则新增
             rows = caseApplicationMapper.submitCaseApplication(caseApplication);
         }else {
             List<Arbitrator> arbitrators = caseApplication.getArbitrators();
+            // 仲裁员信息
             if(arbitrators!=null&&arbitrators.size()>0){
                 List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
                 List<String> arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList());
 
         //发送短信通知
         SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest();
-        request.setTemplateId("1948332");
+        request.setTemplateId("1952136");
         // 1948332 普通短信 开庭审理房间号通知 尊敬的{1}用户，您的{2}仲裁案件，开庭审理房间号为{3}，请知晓，如非本人操作，请忽略本短信。
         request.setPhone(caseAffiliate.getContactTelphone());
         request.setTemplateParamSet(new String[]{caseAffiliate.getName(), caseApplicationselect.getCaseNum(), messageVO.getRoomNo()});
         String hearDatestr = dateFormat.format(hearDate);
 
         String arbitratorId = caseApplicationselect.getArbitratorId();
-        List<Arbitrator> arbitratorList = new ArrayList<>();
+//        List<Arbitrator> arbitratorList = new ArrayList<>();
         if(StringUtils.isNotEmpty(arbitratorId)){
             String[] idStrList  = arbitratorId.split(",");
             List<Long> idList = new ArrayList<>();
             for(int i = 0;i < idStrList.length;i ++ ){
                 idList.add(Long.parseLong(idStrList[i]));
             }
-            Arbitrator arbitrator = new Arbitrator();
-            arbitrator.setIdList(idList);
-            arbitratorList = arbitratorMapper.selectArbitratorList(arbitrator);
-            if(arbitratorList!=null) {
-                for (int i = 0; i < arbitratorList.size(); i++) {
-                    Arbitrator arbitratorselect = arbitratorList.get(i);
-                    //给仲裁员发送短信通知
-                    request.setPhone(arbitratorselect.getTelephone());
-                    // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
-                    String name = arbitratorselect.getArbitratorName();
-                    request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
-                    SmsUtils.sendSms(request);
-                }
-            }
+                    // 查询仲裁员电话号
+                 List<SysUser> userList=   sysUserMapper.selectUserListByIds(idList);
+                 if(CollectionUtil.isNotEmpty(userList)) {
+                     for (SysUser user : userList) {
+                     //给仲裁员发送短信通知
+                     request.setPhone(user.getPhonenumber());
+                     // 1947342 普通短信 开庭日期通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已确定为{3}，请知晓，如非本人操作，请忽略本短信。
+                     String name = user.getNickName();
+                     request.setTemplateParamSet(new String[]{name, caseNum, hearDatestr});
+                     SmsUtils.sendSms(request);
+
+                     }
+                 }
+
         }
 
         CaseAffiliate caseAffiliate = new CaseAffiliate();
                     if(StrUtil.isNotEmpty(caseAffiliateselect.getName())&&deptMap.containsKey(caseAffiliateselect.getName())){
                         caseAffiliateselect.setName(deptMap.get(caseAffiliateselect.getName()));
                     }
-                    caseAffiliateselect.setName(caseAffiliateselect.getName());;
+
                 }
                 //给申请人、被申请人发送短信通知
                 request.setPhone(caseAffiliateselect.getContactTelphone());

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java

 import com.ruoyi.common.constant.CaseApplicationConstants;
 import com.ruoyi.common.core.domain.entity.EsignHttpResponse;
 import com.ruoyi.common.exception.EsignDemoException;
+import com.ruoyi.common.utils.file.SaaSAPIFileUtils;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.SealSignRecord;
 import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper;
         Gson gson = new Gson();
 
         SealSignRecord sealSignRecordselect = new SealSignRecord();
-        sealSignRecordselect.setSignFlowStatus(1);
-
+//        sealSignRecordselect.setSignFlowStatus(1);
         List<SealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecordbyStat(sealSignRecordselect);
         if(sealSignRecords!=null&&sealSignRecords.size()>0){
             for (int i = 0; i < sealSignRecords.size(); i++) {
                 JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
                 JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
                 JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
-
-                System.out.println("signFlowDetailJsonObject-----------"+signFlowDetailJsonObject.toString());
-
                 Integer psnsignStatus = null;
                 Integer orgsignStatus = null;
                 for (int j = 0; j < signersArray.size(); j++) {
                     }
 
                 }
-
-                System.out.println("psnsignStatus-----------"+psnsignStatus);
-                System.out.println("orgsignStatus-----------"+orgsignStatus);
-
                 if((psnsignStatus.intValue()==2)&&(orgsignStatus.intValue()==1)){
                     //更新立案申请状态为待用印
                     CaseApplication caseApplication = new CaseApplication();
                     caseApplication.setId(sealSignRecord.getCaseAppliId());
-                    caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
-                    caseApplicationMapper.submitCaseApplication(caseApplication);
 
-                    //修改"签署用印记录表"的状态为待用印
-                    sealSignRecord.setSignFlowStatus(2);
-                    sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
+                    CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
+                    if(caseApplicationselect.getCaseStatus().intValue()==CaseApplicationConstants.SIGN_ARBITRATION){
+                        caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
+                        caseApplicationMapper.submitCaseApplication(caseApplication);
+
+                        //修改"签署用印记录表"的状态为待用印
+                        sealSignRecord.setSignFlowStatus(2);
+                        sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
+                    }
+
+
                 }
                 if((psnsignStatus.intValue()==2)&&(orgsignStatus.intValue()==2)){
                     //更新立案申请状态为待送达
                     CaseApplication caseApplication = new CaseApplication();
                     caseApplication.setId(sealSignRecord.getCaseAppliId());
-                    caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
-                    caseApplicationMapper.submitCaseApplication(caseApplication);
-
-                    //修改"签署用印记录表"的状态为签署完成
-                    sealSignRecord.setSignFlowStatus(3);
-                    sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
 
-                    //下载审核完成的裁决书，
-//                  SaaSAPIFileUtils.fileDownloadUrl();
+                    CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
+                    if(caseApplicationselect.getCaseStatus().intValue()==CaseApplicationConstants.ARBITRATED_SEAL){
+                        caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATION_DELIVERY);
+                        caseApplicationMapper.submitCaseApplication(caseApplication);
+
+                        //下载审核完成的裁决书，
+                        String signFlowId = sealSignRecord.getSignFlowid();
+                        EsignHttpResponse fileDownload = SaaSAPIFileUtils.fileDownloadUrl(signFlowId);
+                        JsonObject fileDownloadJsonObject = gson.fromJson(fileDownload.getBody(),JsonObject.class);
+                        JsonObject fileDownloadData = fileDownloadJsonObject.getAsJsonObject("data");
+                        JsonArray filesArray = fileDownloadData.get("files").getAsJsonArray();
+                        if(filesArray!=null&&filesArray.size()>0){
+                            JsonObject fileObject = (JsonObject)filesArray.get(0);
+                            String fileDownloadUrl = fileObject.get("downloadUrl").toString();
+                            //修改"签署用印记录表"的状态为签署完成
+                            sealSignRecord.setSignFlowStatus(3);
+                            sealSignRecord.setFileDownloadUrl(fileDownloadUrl);
+                            sealSignRecordMapper.updataSealSignRecord(sealSignRecord);
 
-
-                    
+                        }
+                    }
                 }
             }
 
         }
 
-//        Gson gson = new Gson();
-//
-//        SealSignRecord sealSignRecord = new SealSignRecord();
-//        sealSignRecord.setSignFlowid("41e6732b48c54c63a91b2379c352212d");
-//        EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
-//        JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(),JsonObject.class);
-//        JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
-//        JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
-//        for (int i = 0; i < signersArray.size(); i++) {
-//            JsonObject signerObject = (JsonObject)signersArray.get(i);
-//            Integer psnsignStatus ;
-//            Integer orgsignStatus ;
-//            if(!(signerObject.get("psnSigner").toString()).equals("null")){
-//                JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
-//                if(psnSignerData!=null){
-//                    psnsignStatus = signerObject.get("signStatus").getAsInt();
-//                    sealSignRecord.setPsnsignStatus(psnsignStatus);
-//
-//                    if(psnsignStatus.intValue()==2){
-//                        //更新立案申请状态为待用印
-//                        CaseApplication caseApplication = new CaseApplication();
-//                        caseApplication.setCaseStatus(CaseApplicationConstants.ARBITRATED_SEAL);
-//                        caseApplicationMapper.submitCaseApplication(caseApplication);
-//
-//
-//
-//                    }
-//
-//
-//
-//                }
-//            }
-//            if(!(signerObject.get("orgSigner").toString()).equals("null")){
-//                JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
-//                if(orgSignerData!=null){
-//                    orgsignStatus = signerObject.get("signStatus").getAsInt();
-//                    sealSignRecord.setOrgsignStatus(orgsignStatus);
-//                }
-//
-//            }
-//
-//        }
 
 
     }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java

 
         SealSignRecord sealSignRecord = new SealSignRecord();
 
-        sealSignRecord.setFileid("a808f1f39a744357a2f018e4ab34c55d");
-        sealSignRecord.setFilename("23893bfd3f2249ffa5c82850c11c482e.pdf");
-        sealSignRecord.setSignFlowid("41e6732b48c54c63a91b2379c352212d");
-
-
-        sealSignRecord.setPensonAccount("18209231185");
-        sealSignRecord.setPensonName("秦桃则");
-        sealSignRecord.setOrgnizeName("西安云美电子科技有限公司");
-        sealSignRecord.setOrgnizeNamePsnAccount("17691338406");
-        sealSignRecord.setOrgnizeNamepsnName("韩超勃");
-        sealSignRecord.setPositionPagepsn("2");
-
-        sealSignRecord.setPositionXpsn(279+20);
-        sealSignRecord.setPositionYpsn(216.336-20);
-
-        sealSignRecord.setPositionPageorg("2");
-
-        sealSignRecord.setPositionXorg(342+30);
-        sealSignRecord.setPositionYorg(185.136);
-
-
-
 
         /* 发起签署*/
 //        EsignHttpResponse createByFile = createByFile(sealSignRecord);
         double positionXorg = sealSignRecord.getPositionXorg();
         double positionYorg = sealSignRecord.getPositionYorg();
 
-
         String jsonParm = "{\n" +
                 "    \"docs\": [\n" +
                 "        {\n" +
-
-//                "            \"fileId\": \"5bd34a81e8084acaab3287c019e82fe8\",\n" +
                 "            \"fileId\": \"" + fileId +  "\",\n" +
-
-//                "            \"fileName\": \"477470a7741b4536a200c792b6ddf966.pdf\"\n" +
                 "            \"fileName\": \"" + fileName +  "\"\n" +
 
                 "        }\n" +
                 "          {\n" +
 
                 "            \"psnSignerInfo\": {\n" +
-
-//                "                \"psnAccount\": \"18209231185\",\n" +
                 "                \"psnAccount\": \"" + psnAccount +  "\",\n" +
 
                 "                \"psnInfo\": {\n" +
-
-//                "                            \"psnName\": \"秦桃则\"\n" +
                 "                            \"psnName\": \"" + psnName +  "\"\n" +
                 "                        }\n" +
 
-
                 "            },\n" +
-
-
                 "            \"signFields\": [\n" +
                 "                {\n" +
 
-//                "                    \"fileId\": \"5bd34a81e8084acaab3287c019e82fe8\",\n" +
                 "                    \"fileId\": \"" + fileId +  "\",\n" +
 
                 "                    \"normalSignFieldConfig\": {\n" +
                 "                        \"freeMode\": false,\n" +
                 "                        \"movableSignField\": false,\n" +
                 "                        \"signFieldPosition\": {\n" +
-
-//                "                            \"positionPage\": \"2\",\n" +
                 "                            \"positionPage\": \"" + positionPagepsn +  "\",\n" +
-
-//                "                            \"positionX\": 310.0,\n" +
                 "                            \"positionX\": " + positionXpsn +  ",\n" +
-
-//                "                            \"positionY\": 247.536\n" +
                 "                            \"positionY\": " + positionYpsn +  "\n" +
-
                 "                        },\n" +
                 "                        \"signFieldStyle\": 1\n" +
                 "                    },\n" +
 
                 "        {\n" +
                 "            \"orgSignerInfo\": {\n" +
-
-//                "                \"orgName\": \"西安云美电子科技有限公司\",\n" +
                 "                \"orgName\": \"" + orgName +  "\",\n" +
-
                 "                \"transactorInfo\": {\n" +
-
-
-//                "                \"psnAccount\": \"17691338406\",\n" +
                 "                \"psnAccount\": \"" + orgNamePsnAccount +  "\",\n" +
 
                 "                \"psnInfo\": {\n" +
 
-//                "                            \"psnName\": \"韩超勃\"\n" +
                 "                            \"psnName\": \"" + orgNamepsnName +  "\"\n" +
                 "                        }\n" +
 
 
                 "            \"signFields\": [\n" +
                 "                {\n" +
-
-//                "                    \"fileId\": \"5bd34a81e8084acaab3287c019e82fe8\",\n" +
                 "                    \"fileId\": \"" + fileId +  "\",\n" +
 
                 "                    \"normalSignFieldConfig\": {\n" +
 
                 "                        \"signFieldPosition\": {\n" +
 
-//                "                            \"positionPage\": \"2\",\n" +
                 "                            \"positionPage\": \"" + positionPageorg +  "\",\n" +
-
-//                "                            \"positionX\": 340.0,\n" +
                 "                            \"positionX\": " + positionXorg +  ",\n" +
-
-//                "                            \"positionY\": 340.736\n" +
                 "                            \"positionY\": " + positionYorg +  "\n" +
                 "                        },\n" +
                 "                        \"signFieldStyle\": 1\n" +
         String apiaddr = "/v3/sign-flow/" + signFlowId + "/sign-url";
         String jsonParm = "{\n" +
                 "    \"operator\": {\n" +
-//                "        \"psnAccount\":\"18209231185\"\n" +
                 "        \"psnAccount\": \"" + psnAccount +  "\"\n" +
                 "    }\n" +
                 "}";
         String orgName = sealSignRecord.getOrgnizeName();
 
         String jsonParm = "{\n" +
-//                "    \"needLogin\": true,\n" +
                 "    \"operator\": {\n" +
 
-//                "        \"psnAccount\":\"17691338406\"\n" +
                 "        \"psnAccount\": \"" + psnAccount +  "\"\n" +
                 "    },\n" +
                 "    \"organization\": {\n" +
-
-//                "        \"orgName\": \"西安云美电子科技有限公司\"\n" +
                 "        \"orgName\": \"" + orgName +  "\"\n" +
 
                 "    }\n" +

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SealSignRecordMapper.xml

     <update id="updataSealSignRecord" parameterType="SealSignRecord">
         update seal_sign_record
         <set>
-            <if test="signFlowStatus != null">sign_flow_status = #{signFlowStatus}</if>
+            <if test="signFlowStatus != null">sign_flow_status = #{signFlowStatus},</if>
+            <if test="fileDownloadUrl != null and fileDownloadUrl != ''">file_download_url = #{fileDownloadUrl}</if>
         </set>
         where id = #{id}
     </update>