SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

仲裁系统修改

Browse Source
This commit is contained in:
18792927508
2024-05-24 15:39:58 +08:00
parent 34524284d4
commit 084c22a00f
45 changed files with 4202 additions and 4458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/AdjudicationController.java
+20 -28
View File
@@ -45,14 +45,14 @@ public class AdjudicationController extends BaseController {
/**
* 根据批号查询批量签名链接
*/
@PostMapping("/getSignUrlBatch")
public AjaxResult getSignUrlBatch(@RequestBody StringIdsReq idsReq) {
if(StrUtil.isEmpty(idsReq.getBatchNumber().toString())|| StrUtil.isEmpty(idsReq.getPsnAccount())){
return error("参数校验失败");
}
SealSignRecord sealSignRecordselect = adjudicationService.getSignUrlBatch(idsReq);
return success(sealSignRecordselect);
}
// @PostMapping("/getSignUrlBatch")
// public AjaxResult getSignUrlBatch(@RequestBody StringIdsReq idsReq) {
// if(StrUtil.isEmpty(idsReq.getBatchNumber().toString())|| StrUtil.isEmpty(idsReq.getPsnAccount())){
// return error("参数校验失败");
// }
// SealSignRecord sealSignRecordselect = adjudicationService.getSignUrlBatch(idsReq);
// return success(sealSignRecordselect);
// }
/**
* 根据签署流程id查询批量用印链接
@@ -127,15 +127,7 @@ public class AdjudicationController extends BaseController {
return adjudicationService.batchDocument(caseApplication.getIds());
}
/**
* 重新生成裁决书
* @param caseApplication
* @return
*/
@PostMapping("/regenerationDocument")
public AjaxResult regenerationDocument(@Validated @RequestBody CaseApplication caseApplication){
return adjudicationService.regenerationDocument(caseApplication);
}
/**
* 裁决书送达(电子邮件)
@@ -152,12 +144,12 @@ public class AdjudicationController extends BaseController {
* @param caseApplication
* @return
*/
@GetMapping("/logistics")
// @PreAuthorize("@ss.hasPermi('delivery:detail')")
public AjaxResult getLogisticsInfo(CaseApplication caseApplication){
List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
return AjaxResult.success(logisticsInfo);
}
// @GetMapping("/logistics")
//// @PreAuthorize("@ss.hasPermi('delivery:detail')")
// public AjaxResult getLogisticsInfo(CaseApplication caseApplication){
// List<LogisticsInfoVO> logisticsInfo = adjudicationService.getLogisticsInfo(caseApplication);
// return AjaxResult.success(logisticsInfo);
// }
@@ -220,11 +212,11 @@ public class AdjudicationController extends BaseController {
* @param id 案件id
* @return
*/
@GetMapping("/archives")
public AjaxResult getArchivesDetail(Long id){
return adjudicationService.getArchivesDetail(id);
}
// @GetMapping("/archives")
// public AjaxResult getArchivesDetail(Long id){
//
// return adjudicationService.getArchivesDetail(id);
// }
/**
* 根据案件id获取邮箱
* @param id 案件id
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/ArbitrateApplicationController.java
+3 -2
View File
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.CheckSignatuerUtils;
import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
import com.ruoyi.wisdomarbitrate.domain.dto.CaseApplicationDTO;
import com.ruoyi.wisdomarbitrate.domain.vo.CaseApplicationVO;
import com.ruoyi.wisdomarbitrate.service.ICaseApplicationService;
import org.springframework.beans.BeanUtils;
@@ -32,10 +33,10 @@ public class ArbitrateApplicationController extends BaseController {
String paramsbody = JSONUtil.toJsonStr(caseApplicationVO);
boolean checkResult= CheckSignatuerUtils.checkSignuter(paramsbody);
if(checkResult){
CaseApplication caseApplication = new CaseApplication();
CaseApplicationDTO caseApplication = new CaseApplicationDTO();
BeanUtils.copyProperties(caseApplicationVO,caseApplication);
caseApplication.setCreateBy(getUsername());
return toAjax(caseApplicationService.insertcaseApplication1(caseApplication));
return caseApplicationService.insertOrUpdate(caseApplication);
}else {
return AjaxResult.error("签名验证失败");
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java
+39 -38
View File
@@ -12,6 +12,7 @@ import com.ruoyi.common.exception.EsignDemoException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.WxAppletNotifyUtils;
import com.ruoyi.wisdomarbitrate.domain.*;
import com.ruoyi.wisdomarbitrate.domain.dto.CaseApplicationDTO;
import com.ruoyi.wisdomarbitrate.domain.vo.ReservedConferenceVO;
import com.ruoyi.wisdomarbitrate.domain.vo.SendRoomNoMessageVO;
import com.ruoyi.wisdomarbitrate.domain.vo.ToDoCount;
@@ -37,8 +38,17 @@ public class CaseApplicationController extends BaseController {
private ICaseApplicationService caseApplicationService;
@Autowired
private IAdjudicationService adjudicationService;
/**
* 根据登录人返回用户信息
*/
@GetMapping("/getUserInfo")
public AjaxResult getUserInfo()
{
return success(caseApplicationService.getUserInfo());
}
/**
* 查询立案数据
*/
@@ -53,15 +63,15 @@ public class CaseApplicationController extends BaseController {
return getDataTable(list);
}
/**
* 查询批量管理案件列表
*/
@GetMapping("/listBatch")
public TableDataInfo listBatch(CaseApplication caseApplication) {
startPage();
List<CaseApplication> list = caseApplicationService.selectCaseApplicationListBatchByRole(caseApplication);
return getDataTable(list);
}
// /**
// * 查询批量管理案件列表
// */
// @GetMapping("/listBatch")
// public TableDataInfo listBatch(CaseApplication caseApplication) {
// startPage();
// List<CaseApplication> list = caseApplicationService.selectCaseApplicationListBatchByRole(caseApplication);
// return getDataTable(list);
// }
/**
* 根据角色查询待办数量
@@ -81,24 +91,24 @@ public class CaseApplicationController extends BaseController {
// @PreAuthorize("@ss.hasPermi('caseManagement:list:add')")
@Log(title = "新增立案数据", businessType = BusinessType.INSERT)
@PostMapping("/addCaseApplication")
public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
public AjaxResult addCaseApplication(@Validated @RequestBody CaseApplicationDTO caseApplication)
{
caseApplication.setCreateBy(getUsername());
return toAjax(caseApplicationService.insertcaseApplication(caseApplication));
return caseApplicationService.insertOrUpdate(caseApplication);
}
/**
* 修改立案数据
*/
// @PreAuthorize("@ss.hasPermi('caseManagement:list:update')")
@Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
@PostMapping("/editCaseApplication")
public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplication caseApplication) {
caseApplication.setUpdateBy(getUsername());
return caseApplicationService.editCaseApplication(caseApplication);
}
// @Log(title = "修改立案数据", businessType = BusinessType.UPDATE)
// @PostMapping("/editCaseApplication")
// public AjaxResult editCaseApplication(@Validated @RequestBody CaseApplicationDTO caseApplication) {
//
// caseApplication.setUpdateBy(getUsername());
// return caseApplicationService.editCaseApplication(caseApplication);
// }
/**
* 修改立案数据自定义字段
@@ -132,7 +142,7 @@ public class CaseApplicationController extends BaseController {
if(StringUtils.isEmpty(batchCaseApplication.getBatchNumber())){
return error("参数校验失败");
}
return toAjax(caseApplicationService.submitCaseApplicationBatch(batchCaseApplication.getBatchNumber()));
return caseApplicationService.submitCaseApplicationBatch(batchCaseApplication.getBatchNumber());
}
@@ -411,15 +421,6 @@ public class CaseApplicationController extends BaseController {
return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getCaseCheckReject()));
}
/**
* 确认缴费查询立案信息
*/
// @PreAuthorize("@ss.hasPermi('paymentManagement:list:detail')")
@PostMapping("/selectCaseApplicationConfirm")
public AjaxResult selectCaseApplicationConfirm(@Validated @RequestBody CaseApplication caseApplication) {
CaseApplication caseApplicationselect = caseApplicationService.selectCaseApplicationConfirm(caseApplication);
return success(caseApplicationselect);
}
/**
* 批量提交立案审查
@@ -430,18 +431,18 @@ public class CaseApplicationController extends BaseController {
if(StringUtils.isEmpty(batchCaseApplication.getBatchNumber()) || batchCaseApplication.getAgreeOrNotCheck()==null){
return error("参数校验失败");
}
return success(caseApplicationService.submitCaseApplicationCheckBatch(batchCaseApplication.getBatchNumber(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getCaseCheckReject()));
return caseApplicationService.submitCaseApplicationCheckBatch(batchCaseApplication.getBatchNumber(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getCaseCheckReject());
}
/**
* 下载案件压缩包
*/
@PostMapping("/downloadCaseZipFile")
public AjaxResult downloadCaseZipFile(@Validated @RequestBody CaseApplication caseApplication) {
CaseAttach caseAttach = caseApplicationService.downloadCaseZipFile(caseApplication);
return success(caseAttach);
}
// /**
// * 下载案件压缩包
// */
// @PostMapping("/downloadCaseZipFile")
// public AjaxResult downloadCaseZipFile(@Validated @RequestBody CaseApplication caseApplication) {
//
// CaseAttach caseAttach = caseApplicationService.downloadCaseZipFile(caseApplication);
// return success(caseAttach);
// }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java
+17 -17
View File
@@ -33,17 +33,17 @@ public class CaseEvidenceController extends BaseController {
this.caseEvidenceService = caseEvidenceService;
}
/**
* 根据案件id查询案件详情
*
* @param id
* @return
*/
@GetMapping("/{id}")
public AjaxResult getCaseDetailsById(@PathVariable Long id) {
String username = this.getUsername();
return caseEvidenceService.getCaseDetailsById(id, username);
}
// /**
// * 根据案件id查询案件详情
// *
// * @param id
// * @return
// */
// @GetMapping("/{id}")
// public AjaxResult getCaseDetailsById(@PathVariable Long id) {
// String username = this.getUsername();
// return caseEvidenceService.getCaseDetailsById(id, username);
// }
/**
* 案件证据上传
@@ -121,12 +121,12 @@ public class CaseEvidenceController extends BaseController {
* @param caseStatus
* @return
*/
@GetMapping("/all")
public AjaxResult getCaseListAll(@RequestParam("caseStatus") Integer caseStatus) {
return success(caseEvidenceService.getCaseListAll(caseStatus));
}
// @GetMapping("/all")
// public AjaxResult getCaseListAll(@RequestParam("caseStatus") Integer caseStatus) {
//
// return success(caseEvidenceService.getCaseListAll(caseStatus));
//
// }
/**
* 证据确认
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/VideoController.java
+15 -11
View File
@@ -133,7 +133,6 @@ public class VideoController extends BaseController {
@Anonymous
@GetMapping("secretaryRoleByUserId")
public AjaxResult secretaryRoleByUserId( @RequestParam(value = "userId",required = true) Long userId,@RequestParam(value = "caseId",required = true) Long caseId) {
return videoService.secretaryRoleByUserId(userId,caseId);
}
/**
@@ -186,6 +185,7 @@ public class VideoController extends BaseController {
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
String name=file.getOriginalFilename();
// 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file);
String suffix = getFileExtension(fileName);
@@ -205,18 +205,22 @@ public class VideoController extends BaseController {
CaseAttach caseAttach=null;
for (Object obj : jsonArray) {
JSONObject jsonObject = (JSONObject) obj;
String path = jsonObject.get("filePath")!=null?jsonObject.getString("filePath"):"";
path=path.replace("/home/ruoyi/uploadPath/","profile/");
caseAttach = CaseAttach.builder()
.caseAppliId(caseId)
.annexName(jsonObject.get("fileName")!=null?jsonObject.getString("fileName"):"")
// .annexName(jsonObject.get("fileName")!=null?jsonObject.getString("fileName"):"")
.annexName(name)
.annexType(annexType)
.onlyOfficeFileId(jsonObject.getString("fileId"))
.annexPath(path)
.build();
if(jsonObject.get("filePath")!=null){
String officePath = jsonObject.getString("filePath");
String replace = officePath.replace("/home/ruoyi/uploadPath/", "/profile/");
caseAttach.setAnnexPath(replace);
}
// if(jsonObject.get("filePath")!=null){
// String officePath = jsonObject.getString("filePath");
// String replace = officePath.replace("/home/ruoyi/uploadPath/", "/profile/");
// caseAttach.setAnnexPath(replace);
//
// }
caseAttachMapper.save(caseAttach);
}
if(caseAttach==null){
@@ -226,7 +230,7 @@ public class VideoController extends BaseController {
ajax.put("annexId", caseAttach.getAnnexId());
ajax.put("annexType", annexType);
// ajax.put("url", url);
ajax.put("fileName", fileName);
ajax.put("fileName", name);
ajax.put("newFileName", FileUtils.getName(fileName));
ajax.put("originalFilename", file.getOriginalFilename());
return ajax;
@@ -245,13 +249,13 @@ public class VideoController extends BaseController {
caseAttachMapper.deleteCaseAttachByCasedIdAndType(caseId, annexType);
}
}
Long annexId = saveCaseAttach(annexType, fileName, file.getOriginalFilename(), caseId);
Long annexId = saveCaseAttach(annexType, name, file.getOriginalFilename(), caseId);
AjaxResult ajax = AjaxResult.success();
ajax.put("annexId", annexId);
ajax.put("annexType", annexType);
ajax.put("url", url);
ajax.put("fileName", fileName);
ajax.put("fileName", name);
ajax.put("newFileName", FileUtils.getName(fileName));
ajax.put("originalFilename", file.getOriginalFilename());
return ajax;