18792927508 2 vuotta sitten
vanhempi
commit
69fbcd4b4b

+ 2
- 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Näytä tiedosto

122
     }
122
     }
123
 
123
 
124
     /**
124
     /**
125
-     * 查询立案信息 todo 必须传version
125
+     * 查询立案信息
126
      */
126
      */
127
 //     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
127
 //     @PreAuthorize("@ss.hasPermi('caseManagement:list:detail')")
128
     @PostMapping("/selectCaseApplication")
128
     @PostMapping("/selectCaseApplication")
129
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
129
     public AjaxResult selectCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
130
-        if(caseApplication.getVersion()==null){
131
-            return error("参数校验失败");
132
-        }
130
+
133
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication);
131
         CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplication(caseApplication);
134
         return success(caseApplicationselect);
132
         return success(caseApplicationselect);
135
     }
133
     }

+ 11
- 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java Näytä tiedosto

107
 
107
 
108
         return  videoService.dissolveRoom(reservedConferenceVO.getRoomId());
108
         return  videoService.dissolveRoom(reservedConferenceVO.getRoomId());
109
     }
109
     }
110
+    /**
111
+     * 根据userId查询该用户是否是秘书
112
+     * @param userId
113
+     * @return
114
+     */
115
+    @Anonymous
116
+    @GetMapping("secretaryRoleByUserId")
117
+    public AjaxResult secretaryRoleByUserId(   @RequestParam(value = "userId",required = true) Long userId) {
118
+
119
+        return  videoService.secretaryRoleByUserId(userId);
120
+    }
110
 
121
 
111
 
122
 
112
 }
123
 }

+ 6
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/VideoService.java Näytä tiedosto

33
      * @return
33
      * @return
34
      */
34
      */
35
     AjaxResult dissolveRoom( Long roomId);
35
     AjaxResult dissolveRoom( Long roomId);
36
+    /**
37
+     * 根据userId查询该用户是否是秘书
38
+     * @param userId
39
+     * @return
40
+     */
41
+    AjaxResult secretaryRoleByUserId(Long userId);
36
 }
42
 }

+ 29
- 6
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/VideoServiceImpl.java Näytä tiedosto

9
 import com.ruoyi.common.config.RuoYiConfig;
9
 import com.ruoyi.common.config.RuoYiConfig;
10
 import com.ruoyi.common.constant.CacheConstants;
10
 import com.ruoyi.common.constant.CacheConstants;
11
 import com.ruoyi.common.core.domain.AjaxResult;
11
 import com.ruoyi.common.core.domain.AjaxResult;
12
+import com.ruoyi.common.core.domain.entity.SysRole;
12
 import com.ruoyi.common.core.domain.entity.SysUser;
13
 import com.ruoyi.common.core.domain.entity.SysUser;
13
 import com.ruoyi.common.core.domain.model.LoginUser;
14
 import com.ruoyi.common.core.domain.model.LoginUser;
14
 import com.ruoyi.common.core.redis.RedisCache;
15
 import com.ruoyi.common.core.redis.RedisCache;
16
 import com.ruoyi.common.utils.SmsUtils;
17
 import com.ruoyi.common.utils.SmsUtils;
17
 import com.ruoyi.common.utils.StringUtils;
18
 import com.ruoyi.common.utils.StringUtils;
18
 import com.ruoyi.common.utils.spring.SpringUtils;
19
 import com.ruoyi.common.utils.spring.SpringUtils;
20
+import com.ruoyi.system.mapper.SysRoleMapper;
19
 import com.ruoyi.system.mapper.SysUserMapper;
21
 import com.ruoyi.system.mapper.SysUserMapper;
22
+import com.ruoyi.system.mapper.SysUserRoleMapper;
20
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
23
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
21
 import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
24
 import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
22
 import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
25
 import com.ruoyi.wisdomarbitrate.domain.IdentityAuthentication;
56
 import java.util.concurrent.Executors;
59
 import java.util.concurrent.Executors;
57
 import java.util.concurrent.TimeUnit;
60
 import java.util.concurrent.TimeUnit;
58
 
61
 
62
+import static com.ruoyi.common.core.domain.AjaxResult.success;
59
 import static com.ruoyi.common.utils.file.FileUploadUtils.getAbsoluteFile;
63
 import static com.ruoyi.common.utils.file.FileUploadUtils.getAbsoluteFile;
60
 import static com.ruoyi.common.utils.file.FileUploadUtils.getPathFileName;
64
 import static com.ruoyi.common.utils.file.FileUploadUtils.getPathFileName;
61
 
65
 
83
     private CaseApplicationMapper caseApplicationMapper;
87
     private CaseApplicationMapper caseApplicationMapper;
84
     @Autowired
88
     @Autowired
85
     private CaseAttachMapper caseAttachMapper;
89
     private CaseAttachMapper caseAttachMapper;
90
+    @Autowired
91
+    private SysRoleMapper roleMapper;
86
 
92
 
87
     /**
93
     /**
88
      *  功能:第三方回调sign校验
94
      *  功能:第三方回调sign校验
137
     @Override
143
     @Override
138
     public AjaxResult bindCaseId(Long caseId, String roomId) {
144
     public AjaxResult bindCaseId(Long caseId, String roomId) {
139
         caseApplicationMapper .bindCaseId(caseId,roomId);
145
         caseApplicationMapper .bindCaseId(caseId,roomId);
140
-        return AjaxResult.success();
146
+        return success();
141
     }
147
     }
142
 
148
 
143
     @Override
149
     @Override
147
         caseApplication.setAnnexType(9);
153
         caseApplication.setAnnexType(9);
148
         List<CaseAttach> caseAttachList = caseAttachMapper.queryCaseAttachList(caseApplication);
154
         List<CaseAttach> caseAttachList = caseAttachMapper.queryCaseAttachList(caseApplication);
149
         if(CollectionUtil.isEmpty(caseAttachList)){
155
         if(CollectionUtil.isEmpty(caseAttachList)){
150
-            return AjaxResult.success();
156
+            return success();
151
         }
157
         }
152
         for (CaseAttach caseAttach : caseAttachList) {
158
         for (CaseAttach caseAttach : caseAttachList) {
153
             String annexName = caseAttach.getAnnexName();
159
             String annexName = caseAttach.getAnnexName();
162
                 caseAttach.setAnnexName(annexNamenew);
168
                 caseAttach.setAnnexName(annexNamenew);
163
             }
169
             }
164
         }
170
         }
165
-        return  AjaxResult.success(caseAttachList);
171
+        return  success(caseAttachList);
166
     }
172
     }
167
 
173
 
168
     /**
174
     /**
227
             // 返回的resp是一个CreateCloudRecordingResponse的实例,与请求对象对应
233
             // 返回的resp是一个CreateCloudRecordingResponse的实例,与请求对象对应
228
             CreateCloudRecordingResponse resp = client.CreateCloudRecording(req);
234
             CreateCloudRecordingResponse resp = client.CreateCloudRecording(req);
229
 
235
 
230
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
236
+            return success((JSONObject) JSON.toJSON(resp));
231
         } catch (TencentCloudSDKException e) {
237
         } catch (TencentCloudSDKException e) {
232
             return AjaxResult.error(e.toString());
238
             return AjaxResult.error(e.toString());
233
         }
239
         }
259
             // 返回的resp是一个DeleteCloudRecordingResponse的实例,与请求对象对应
265
             // 返回的resp是一个DeleteCloudRecordingResponse的实例,与请求对象对应
260
             DeleteCloudRecordingResponse resp = client.DeleteCloudRecording(req);
266
             DeleteCloudRecordingResponse resp = client.DeleteCloudRecording(req);
261
             // 输出json格式的字符串回包
267
             // 输出json格式的字符串回包
262
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
268
+            return success((JSONObject) JSON.toJSON(resp));
263
         } catch (TencentCloudSDKException e) {
269
         } catch (TencentCloudSDKException e) {
264
             return AjaxResult.error(e.toString());
270
             return AjaxResult.error(e.toString());
265
         }
271
         }
282
         req.setRoomId(roomId);
288
         req.setRoomId(roomId);
283
         try {
289
         try {
284
             DismissRoomResponse resp = client.DismissRoom(req);
290
             DismissRoomResponse resp = client.DismissRoom(req);
285
-            return AjaxResult.success((JSONObject) JSON.toJSON(resp));
291
+            return success((JSONObject) JSON.toJSON(resp));
286
         } catch (TencentCloudSDKException e) {
292
         } catch (TencentCloudSDKException e) {
287
             return AjaxResult.error("解散房间失败");
293
             return AjaxResult.error("解散房间失败");
288
         }
294
         }
289
 
295
 
290
     }
296
     }
291
 
297
 
298
+    @Override
299
+    public AjaxResult secretaryRoleByUserId(Long userId) {
300
+        List<SysRole> roles = roleMapper.selectRolePermissionByUserId(userId);
301
+        JSONObject jsonObject = new JSONObject();
302
+        boolean isSecretaryRole=false;
303
+        if(CollectionUtil.isNotEmpty(roles)){
304
+            for (SysRole role : roles) {
305
+                if("法律顾问".equals(role.getRoleName()) || "秘书".equals(role.getRoleName())){
306
+                    isSecretaryRole=true;
307
+                    break;
308
+                }
309
+            }
310
+        }
311
+        jsonObject.put("isSecretaryRole",isSecretaryRole);
312
+        return success(jsonObject);
313
+    }
314
+
292
 
315
 
293
     /**
316
     /**
294
      *  查询出音视频集合,并下载,在将云点播上面的音视频删除
317
      *  查询出音视频集合,并下载,在将云点播上面的音视频删除

+ 2
- 3
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml Näytä tiedosto

471
         c.hear_date ,c.arbitrat_claims ,
471
         c.hear_date ,c.arbitrat_claims ,
472
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
472
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag ,c.fee_payable ,
473
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
473
         c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
474
-        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url
474
+        c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId ,ca.application_organ_name as applicantName,c.filearbitra_url,c.version
475
         from case_log_record r
475
         from case_log_record r
476
         join case_application c on r.case_appli_id=c.id
476
         join case_application c on r.case_appli_id=c.id
477
          JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
477
          JOIN case_affiliate ca ON ca.case_appli_id = c.id AND ca.identity_type=1
1573
                    END paymentStatusName,c.pay_type,
1573
                    END paymentStatusName,c.pay_type,
1574
                CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName
1574
                CASE c.pay_type when 0 then '线上支付' when 0 then '线下支付' else '' end payTypeName
1575
         from case_application c left join case_payment_record p on c.id  = p.case_id
1575
         from case_application c left join case_payment_record p on c.id  = p.case_id
1576
-        where c.case_status  = 3
1577
-          AND c.id = #{id} and p.payment_status=1 limit 1
1576
+        where  c.id = #{id} and p.payment_status=1 limit 1
1578
 
1577
 
1579
     </select>
1578
     </select>
1580
     <select id="selectCaseNumLike" resultType="java.lang.Integer">
1579
     <select id="selectCaseNumLike" resultType="java.lang.Integer">