车辆远程控制新增接口开发

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java

@@ -27,6 +27,7 @@ public enum LoanFileEnum {
     BECOLLECTIONRECORD("018", "逾期催收附件"),
     BECOLLECTIONAPPLY("019", "催收措施附件"),
     BECOLLECTIONVEHHKXY("020", "催收措施车辆还款协议附件"),
+    VEHCLEARANCE("021", "车辆远程解控附件"),
     ;
 
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyDto.java

@@ -26,12 +26,18 @@
 package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
 
 
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto;
 import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(车辆远程解控申请) <br/>
  * File: LoanVehClearanceApplyDto.java <br/>
@@ -75,5 +81,8 @@ public class LoanVehClearanceApplyDto implements Dto {
     private String nodeState; // 流程状态
 	@ApiModelProperty("任务id")
     private String taskId; // 任务id
-
+    @ApiModelProperty("附件")
+    private List<LoanVehClearanceFileVo> files = new ArrayList<>();
+    @ApiModelProperty("逾期车辆列表")
+    private List<LoanVehClearanceVehDto> loanVehClearanceVehDtoList;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceFileVo.java

@@ -0,0 +1,51 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请) <br/>
+ * File: LoanBeCollectionApplyVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo <br/>
+ * Description: 逾期催收申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-12-12 16:06:20 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收申请 视图数据对象", description = "逾期催收申请 视图数据对象")
+public class LoanVehClearanceFileVo implements Vo {
+
+    private String url;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java

@@ -62,4 +62,6 @@ public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearance
 	
 	@Select("select * from loan_veh_clearance_apply")
 	List<LoanVehClearanceApplyVo> selectListVo();
+
+	String selectNum(String billNo);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml

@@ -10,4 +10,12 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyVo">
 		SELECT * FROM loan_veh_clearance_apply <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="selectNum" resultType="java.lang.String">
+		select RIGHT (billNo, 4)
+		from loan_veh_clearance_apply
+		where billNo LIKE concat(#{billNo}, '%')
+		order by billNo desc
+				limit 1
+	</select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyRest.java

@@ -82,7 +82,7 @@ public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		loanVehClearanceApplyService.delBySids(sids);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

@@ -26,27 +26,35 @@
 package com.yxt.anrui.riskcenter.biz.loanvehclearanceapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
+import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDto;
+import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanvehclearanceveh.LoanVehClearanceVehService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApply;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyQuery;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyDto;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyFeign;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -67,6 +75,14 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
 
 	@Autowired
 	private SysUserFeign sysUserFeign;
+	@Resource
+	private SysOrganizationFeign sysOrganizationFeign;
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+	@Autowired
+	private LoanFileService loanFileService;
+	@Autowired
+	private LoanVehClearanceVehService loanVehClearanceVehService;
 
 	public PagerVo<LoanVehClearanceApplyVo> listPageVo(PagerQuery<LoanVehClearanceApplyQuery> pq) {
 		LoanVehClearanceApplyQuery query = pq.getParams();
@@ -133,19 +149,73 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
 		return p;
 	}
 	
-	public void saveOrUpdateDto(LoanVehClearanceApplyDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
+	public String saveOrUpdateDto(LoanVehClearanceApplyDto dto){
+		String dtoSid = dto.getSid();
+		List<LoanVehClearanceVehDto> loanVehClearanceVehDtoList = dto.getLoanVehClearanceVehDtoList();
+		List<LoanVehClearanceFileVo> files = dto.getFiles();
+		if (StringUtils.isBlank(dtoSid)) {
+			//生成单据编号
+			String billNo = "";
+			String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+			billNo = "CLYCJK" + sysOrganizationVo.getOrgCode() + date;
+			String i = baseMapper.selectNum(billNo);
+			if (StringUtils.isNotBlank(i)) {
+				billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+			} else {
+				billNo = Rule.getBillNo(billNo, 0);
+			}
+			dto.setBillNo(billNo);
+			String sid = this.insertByDto(dto);
+			if (files != null && files.size() > 0){
+				for (LoanVehClearanceFileVo file : files) {
+					LoanFile loanFile = new LoanFile();
+					loanFile.setLinkSid(sid);
+					loanFile.setAttachType(LoanFileEnum.VEHCLEARANCE.getAttachType());
+					String filePath = file.getUrl();
+					if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+						filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+					}
+					loanFile.setFilePath(filePath);
+					loanFileService.save(loanFile);
+				}
+			}
+			for (LoanVehClearanceVehDto loanVehClearanceVehDto : loanVehClearanceVehDtoList) {
+				loanVehClearanceVehDto.setMainSid(sid);
+				loanVehClearanceVehService.saveOrUpdateDto(loanVehClearanceVehDto);
+			}
+			return sid;
+		}
 		this.updateByDto(dto);
+		loanFileService.delByLinkSidOrType(dtoSid,LoanFileEnum.VEHCLEARANCE.getAttachType());
+		if (files != null && files.size() > 0){
+			for (LoanVehClearanceFileVo file : files) {
+				LoanFile loanFile = new LoanFile();
+				loanFile.setLinkSid(dtoSid);
+				loanFile.setAttachType(LoanFileEnum.VEHCLEARANCE.getAttachType());
+				String filePath = file.getUrl();
+				if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+					filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+				}
+				loanFile.setFilePath(filePath);
+				loanFileService.save(loanFile);
+			}
+		}
+		loanVehClearanceVehService.delByMainSid(dtoSid);
+		for (LoanVehClearanceVehDto loanVehClearanceVehDto : loanVehClearanceVehDtoList) {
+			loanVehClearanceVehDto.setMainSid(dtoSid);
+			loanVehClearanceVehDto.setSid("");
+			loanVehClearanceVehService.saveOrUpdateDto(loanVehClearanceVehDto);
+		}
+		return dtoSid;
 	}
 	
-	public void insertByDto(LoanVehClearanceApplyDto dto){
+	public String insertByDto(LoanVehClearanceApplyDto dto){
 		LoanVehClearanceApply entity = new LoanVehClearanceApply();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setNodeState("待提交");
 		baseMapper.insert(entity);
+		return entity.getSid();
 	}
 	
 	public void updateByDto(LoanVehClearanceApplyDto dto){

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,7 @@ public interface LoanVehClearanceVehMapper extends BaseMapper<LoanVehClearanceVe
 	
 	@Select("select * from loan_veh_clearance_veh")
 	List<LoanVehClearanceVehVo> selectListVo();
+
+	@Delete("delete from loan_veh_clearance_veh where mainSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceveh/LoanVehClearanceVehService.java

@@ -107,4 +107,8 @@ public class LoanVehClearanceVehService extends MybatisBaseService<LoanVehCleara
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
 }