20240202更新

master
RENCHAO 2 years ago
parent 7a37ae66e4
commit 34300f8cde

@ -334,6 +334,239 @@ public class Test01 {
}
@Test
public void test16() {
List<Integer> intList = new ArrayList<>();
int n = 100000000;
for (int i = 0; i < n; i++) {
intList.add((int) (Math.random() * 10));
}
int aa = 0;
long l1 = System.currentTimeMillis();
for (Integer integer : intList) {
aa += (integer * 10);
}
System.out.println(aa + "::耗时1" + (System.currentTimeMillis() - l1));
aa = 0;
long l2 = System.currentTimeMillis();
for (Integer integer : intList) {
aa += x10(integer);
}
System.out.println(aa + "::耗时2" + (System.currentTimeMillis() - l2));
aa = 0;
long l3 = System.currentTimeMillis();
for (Integer integer : intList) {
aa += x102(integer);
}
System.out.println(aa + "::耗时3" + (System.currentTimeMillis() - l3));
}
private int x10(int a) {
int c = a;
for (int i = 0; i < 9; i++) {
c += a;
}
return c;
}
private int x102(int a) {
int c = a;
for (int i = 0; i < 3; i++) {
c = c << 1;
}
c = (a << 1) + c;
return c;
}
@Test
public void test17() {
// List<Integer> intList = new ArrayList<>();
// int n = 10000000;
// for (int i = 0; i < n; i++) {
// intList.add((int) (Math.random() * 10));
// }
// long l1 = System.currentTimeMillis();
// for (Integer integer : intList) {
// reverse(integer);
// }
// System.out.println("::耗时1" + (System.currentTimeMillis() - l1));
//
// long l2 = System.currentTimeMillis();
// for (Integer integer : intList) {
// reverse2(integer);
// }
// System.out.println("::耗时2" + (System.currentTimeMillis() - l2));
//
// long l3 = System.currentTimeMillis();
// for (Integer integer : intList) {
// reverse3(integer);
// }
// System.out.println("::耗时3" + (System.currentTimeMillis() - l3));
//
// long l4 = System.currentTimeMillis();
// for (Integer integer : intList) {
// reverse4(integer);
// }
// System.out.println("::耗时4" + (System.currentTimeMillis() - l4));
//
// long l5 = System.currentTimeMillis();
// for (Integer integer : intList) {
// reverse5(integer);
// }
// System.out.println("::耗时5" + (System.currentTimeMillis() - l5));
int i = -2147483648;
System.out.println(reverse2(i));
System.out.println(reverse3(i));
System.out.println(reverse4(i));
System.out.println(Integer.MAX_VALUE);
}
public int reverse(int x) {
int b = x >>> 31;
int bit = 0;
int k = 0;
while (x != 0) {
if (bit == 9 && k / 100000000 > 2) {
return 0;
}
bit++;
k = k * 10 + x % 10;
x = x / 10;
}
if (b != k >>> 31) {
k = 0;
}
return k;
}
public int reverse2(int x) {
int b = x >>> 31;
int k = 0;
while (x != 0) {
int a = k;
for (int i = 0; i < 3; i++) {
a = a << 1;
if (b != a >>> 31) {
return 0;
}
}
a = (k << 1) + a;
if (b != a >>> 31) {
return 0;
}
k = a + x % 10;
x = x / 10;
}
return k;
}
public int reverse3(int x) {
int b = x >>> 31;
int k = x % 10;
x = x / 10;
while (x != 0) {
int a = k;
for (int i = 0; i < 4; i++) {
if (i < 3) {
a = a << 1;
} else {
a = (k << 1) + a;
}
if (b != a >>> 31) {
return 0;
}
}
k = a + x % 10;
if (b != k >>> 31) {
return 0;
}
x = x / 10;
}
return k;
}
public int reverse4(int x) {
int b = x >>> 31;
int k = x % 10;
x = x / 10;
while (x != 0) {
if (k > -1000000000 && k < 1000000000) {
k = k * 10 + x % 10;
} else {
int a = k;
for (int i = 0; i < 4; i++) {
if (i < 3) {
a = a << 1;
} else {
a = (k << 1) + a;
}
if (b != a >>> 31) {
return 0;
}
}
k = a + x % 10;
if (b != k >>> 31) {
return 0;
}
}
x = x / 10;
}
return k;
}
public int reverse41(int x) {
int sign = x >>> 31;
int result = x % 10;
x = x / 10;
while (x != 0) {
if (result > -100000000 && result < 100000000) {
result = result * 10 + x % 10;
} else {
int tem = result;
for (int i = 0; i < 4; i++) {
if (i < 3) {
tem = tem << 1;
} else {
tem = (result << 1) + tem;
}
if (sign != tem >>> 31) {
return 0;
}
}
result = tem + x % 10;
if (sign != result >>> 31) {
return 0;
}
}
x = x / 10;
}
return result;
}
public int reverse5(int x) {
int result = 0;
while (x != 0) {
int m = x % 10;
x = x / 10;
int n = result * 10;
if (n / 10 != result) {
return 0;
}
int var = n + m;
result = var;
}
return result;
}
}

@ -3,7 +3,7 @@
<parent>
<artifactId>agile-portal</artifactId>
<groupId>com.jiuyv.sptcc.agile</groupId>
<version>0.2.5-SNAPSHOT</version>
<version>0.2.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -3,7 +3,7 @@
<parent>
<groupId>com.jiuyv.sptcc.agile</groupId>
<artifactId>agile-portal</artifactId>
<version>0.2.5-SNAPSHOT</version>
<version>0.2.6-SNAPSHOT</version>
</parent>
<artifactId>agile-portal-gateway</artifactId>

@ -1,24 +0,0 @@
package com.jiuyv.sptccc.agile.portal.dto;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author ren_chao
*/
public class DtoTest {
@Test
void test01() {
}
}

@ -3,7 +3,7 @@
<parent>
<artifactId>agile-portal</artifactId>
<groupId>com.jiuyv.sptcc.agile</groupId>
<version>0.2.5-SNAPSHOT</version>
<version>0.2.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -3,7 +3,7 @@
<parent>
<groupId>com.jiuyv.sptcc.agile</groupId>
<artifactId>agile-portal</artifactId>
<version>0.2.5-SNAPSHOT</version>
<version>0.2.6-SNAPSHOT</version>
</parent>
<artifactId>agile-portal-service</artifactId>

@ -4,7 +4,7 @@
<parent>
<groupId>com.jiuyv.sptcc.agile</groupId>
<artifactId>agile-portal</artifactId>
<version>0.2.5-SNAPSHOT</version>
<version>0.2.6-SNAPSHOT</version>
</parent>
<artifactId>agile-portal-ui</artifactId>

@ -10,7 +10,7 @@
<el-table-column align="center" label="文件名称" prop="fileName" :show-overflow-tooltip="true" />
<el-table-column align="center" label="上传时间" prop="createTime" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column align="center" label="文件大小" prop="fileSize" :show-overflow-tooltip="true" >
<el-table-column align="center" label="文件大小" prop="fileSize" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ convertFileSize(scope.row.fileSize) }}</span>
</template>

@ -21,23 +21,32 @@
</el-form>
</div>
<div class="tale-list">
<el-table v-loading="loading" stripe :data="myLablyList" max-height="500px"
style="min-height: 355px;max-height: 500px;">
<div slot="empty" style="text-align: left;"><el-empty description="暂无数据"></el-empty>
<el-table v-loading="loading" :data="myLablyList" max-height="500px" style="min-height: 355px;max-height: 500px;">
<div slot=" empty" style="text-align: left;"><el-empty description="暂无数据"></el-empty>
</div>
<el-table-column align="center" label="实验室编号" prop="applyId" :show-overflow-tooltip="true" width='180' />
<el-table-column align="center" label="实验室名称" prop="labTitle" :show-overflow-tooltip="true" width='180' />
<el-table-column align="center" label="生效时间" prop="startDate" :show-overflow-tooltip="true" width='180'>
<el-table-column align="center" label="实验室编号" prop="applyId" :show-overflow-tooltip="true" width="180" />
<el-table-column align="center" label="实验室名称" prop="labTitle" :show-overflow-tooltip="true" />
<el-table-column align="center" label="状态" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span class="review-status" v-if="scope.row.busStatus === '01'">
<i class="icon-circle green"></i>{{ busStatusspan(scope.row.busStatus) }}
</span>
<span class="review-status" v-else>
<i class="icon-circle red"></i>{{ busStatusspan(scope.row.busStatus) }}
</span>
</template>
</el-table-column>
<el-table-column align="center" label="生效时间" prop="startDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="到期时间" prop="endDate" :show-overflow-tooltip="true" width='180'>
<el-table-column align="center" label="到期时间" prop="endDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="硬件资源" prop="dockerImageName" :show-overflow-tooltip="true" width='180'>
<el-table-column align="center" label="硬件资源" prop="dockerImageName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>
{{ 'CPU' + scope.row.cpuLimits + ';内存:' + scope.row.memoryLimits + 'G硬盘' + scope.row.discLimits + 'G' }}
@ -45,27 +54,35 @@
</template>
</el-table-column>
<el-table-column align="center" label="状态" :show-overflow-tooltip="true" width='180'>
<template slot-scope="scope">
<span class="review-status" v-if="scope.row.busStatus === '01'">
<i class="icon-circle green"></i>{{ busStatusspan(scope.row.busStatus) }}
</span>
<span class="review-status" v-else>
<i class="icon-circle red"></i>{{ busStatusspan(scope.row.busStatus) }}
</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" class-name="small-padding fixed-width" width="230">
<el-table-column align="center" label="操作">
<template slot-scope="scope">
<!-- <el-button v-if="scope.row.busStatus === '01'" size="small" type="text"
@click="loginUrl(scope.row.loginUrl)">进入</el-button> -->
<el-button v-if="scope.row.busStatus === '01'" size="small" type="text"
<!-- <el-button v-if="scope.row.busStatus === '01'" size="small" type="text"
@click="myResourcesList(scope.row)">数据注入</el-button>
<el-button v-if="scope.row.busStatus === '01'" size="small" type="text"
@click="myfileList(scope.row)">申请下载</el-button>
@click="myfileList(scope.row)">申请下载</el-button> -->
<el-button size="small" type="text" @click="goLabDetail(scope.row.applyId)"></el-button>
<el-button v-if="scope.row.busStatus === '01'" size="small" type="text"
@click="restart(scope.row)">重启</el-button>
<!-- <el-button v-if="scope.row.busStatus === '01'" size="small" type="text"
@click="restart(scope.row)">重启</el-button> -->
<el-dropdown v-if="scope.row.busStatus === '01'" size="mini"
@command="(command) => handleCommands(command, scope.row)">
<span class="el-dropdown-link" style="color: #409EFF;cursor: pointer;">
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="myResourcesList">
数据注入
</el-dropdown-item>
<el-dropdown-item command="myfileList">
申请下载
</el-dropdown-item>
<el-dropdown-item command="restart">
重启
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
@ -91,10 +108,10 @@
<div slot="empty" style="text-align: center;">暂无数据
</div>
<el-table-column align="center" type="selection" width="55"></el-table-column>
<el-table-column align="center" label="文件名称" prop="fileName" :show-overflow-tooltip="true" width='180' />
<el-table-column align="center" label="上传时间" prop="createTime" :show-overflow-tooltip="true" width='180' />
<el-table-column align="center" label="文件说明" prop="remarks" :show-overflow-tooltip="true" width='180' />
<el-table-column align="center" label="文件类型" prop="fileType" :show-overflow-tooltip="true" width='180'>
<el-table-column align="center" label="文件名称" prop="fileName" :show-overflow-tooltip="true" />
<el-table-column align="center" label="上传时间" prop="createTime" :show-overflow-tooltip="true" />
<el-table-column align="center" label="文件说明" prop="remarks" :show-overflow-tooltip="true" />
<el-table-column align="center" label="文件类型" prop="fileType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.fileType == 'data' ? '数据文件' : 'python组件' }}</span>
</template>
@ -190,7 +207,7 @@ export default {
}, {
label: "重新初始化中",
value: "07",
},{
}, {
label: "错误",
value: "08"
}],
@ -277,6 +294,22 @@ export default {
this.queryParamss.pageNum = 1;
this.myResourcesLists();
},
//
handleCommands(command, row) {
switch (command) {
case "myResourcesList":
this.myResourcesList(row);
break;
case "myfileList":
this.myfileList(row);
break;
case "restart":
this.restart(row);
break;
default:
break;
}
},
myResourcesLists() {
myResourcesList(this.queryParamss).then(response => {
this.resourcesList = response.rows;

@ -10,7 +10,7 @@
<groupId>com.jiuyv.sptcc.agile</groupId>
<artifactId>agile-portal</artifactId>
<version>0.2.5-SNAPSHOT</version>
<version>0.2.6-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>

@ -12,6 +12,7 @@ import com.jiuyv.business.domain.TblFileInfo;
import com.jiuyv.business.mapper.TblFileInfoMapper;
import com.jiuyv.common.exception.ServiceException;
import com.jiuyv.common.utils.CarcheckDateUtils;
import com.jiuyv.common.utils.SecurityUtils;
import com.jiuyv.common.utils.uuid.IdUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -43,9 +44,8 @@ public class FileServiceImpl implements IFileService {
@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
@Override
public ResFileUploadVO fileUpload(MultipartFile file) {
RedisUserDTO redisUserDTO = null;//LoginInterceptor.threadLocalOuter.get();
Date now = new Date();
String userId = redisUserDTO.getId();
String userId = SecurityUtils.getUserId().toString();
String newFileName = IdUtils.fastSimpleUUID();
String dateStr = CarcheckDateUtils.dateTimeNow();
@ -104,7 +104,11 @@ public class FileServiceImpl implements IFileService {
String filePath1 = dbFile.getFilePath();
File file1 = new File(filePath1);
if(file1.exists()){
file1.delete();
try {
java.nio.file.Files.delete(file1.toPath());
} catch (IOException e) {
LOGGER.error("文件删除失败:{}", e.getMessage(), e);
}
}
fileInfoMapper.deleteTblFileInfoById(fileId);
}

@ -54,6 +54,7 @@ import com.jiuyv.business.mapper.TblInspectRecordInfoMapper;
import com.jiuyv.business.mapper.TblInspectSiteInfoMapper;
import com.jiuyv.business.mapper.TblNgPartInfoMapper;
import com.jiuyv.business.mapper.TblPollutantInfoMapper;
import com.jiuyv.business.service.CarOrderFormalDetailHisInfoService;
import com.jiuyv.common.exception.ServiceException;
import com.jiuyv.common.utils.CarcheckDateUtils;
import com.jiuyv.common.utils.JsonUtil;
@ -110,7 +111,7 @@ public class InspectServiceImpl implements IInspectService {
private TblCarOrderFormalDetailInfoMapper orderFormalDetailInfoMapper;
@Autowired
private TblCarOrderFormalDetailHisInfoMapper orderFormalDetailHisInfoMapper;
private CarOrderFormalDetailHisInfoService carOrderFormalDetailHisInfoService;
@Autowired
private TblCompanyInfoMapper companyInfoMapper;
@ -1016,31 +1017,6 @@ public class InspectServiceImpl implements IInspectService {
carInspectHisInfoMapper.insertTblCarInspectHisInfo(inspectHis);
}
/**
*
*
* @param orderDetail
*/
private void saveOrderFormalDetailHis(TblCarOrderFormalDetailInfo orderDetail) {
TblCarOrderFormalDetailHisInfo orderDetailHis = new TblCarOrderFormalDetailHisInfo();
orderDetailHis.setId(orderDetail.getId());
orderDetailHis.setVersion(orderDetail.getVersion());
orderDetailHis.setOrgId(orderDetail.getOrgId());
orderDetailHis.setInspectOrgId(orderDetail.getInspectOrgId());
orderDetailHis.setPreOrderId(orderDetail.getPreOrderId());
orderDetailHis.setOrderId(orderDetail.getOrderId());
orderDetailHis.setCompanyId(orderDetail.getCompanyId());
orderDetailHis.setCarVin(orderDetail.getCarVin());
orderDetailHis.setShipName(orderDetail.getShipName());
orderDetailHis.setCarNumber(orderDetail.getCarNumber());
orderDetailHis.setSrcType(orderDetail.getSrcType());
orderDetailHis.setStatus(orderDetail.getStatus());
orderDetailHis.setCreateTime(orderDetail.getCreateTime());
orderDetailHis.setCreateUserId(orderDetail.getCreateUserId());
orderDetailHis.setUpdateTime(orderDetail.getUpdateTime());
orderDetailHis.setUpdateUserId(orderDetail.getUpdateUserId());
orderFormalDetailHisInfoMapper.insertTblCarOrderFormalDetailHisInfo(orderDetailHis);
}
private TblCarOrderFormalDetailInfo saveOrderFormalDetail(TblCarOrderFormalInfo dbOrder,String orderId,String carVin,String userId,Date now){
TblCarOrderFormalDetailInfo orderDetail = new TblCarOrderFormalDetailInfo();
@ -1417,7 +1393,7 @@ public class InspectServiceImpl implements IInspectService {
// 插入tbl_car_order_formal_detail_info
TblCarOrderFormalDetailInfo orderDetail = saveOrderFormalDetail(dbOrder, orderId, carVin, userId, now);
// 插入tbl_car_order_formal_detail_his_info
saveOrderFormalDetailHis(orderDetail);
carOrderFormalDetailHisInfoService.saveFormDetailHisBean(orderDetail);
// 更新主表 tbl_car_order_formal_info car_count
TblCarOrderFormalInfo orderFormal = orderFormalInfoMapper.selectTblCarOrderFormalInfoById(dbOrder.getId());

@ -75,7 +75,7 @@ public class InspectInfoController extends BaseController {
/**
*
*/
@PreAuthorize("@ss.hasPermi('business:inspect:delete')")
@PreAuthorize("@ss.hasPermi('business:inspect:remove')")
@Log(title = "车辆检查信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public AjaxResult delete(@PathVariable("id") String id) {

@ -0,0 +1,297 @@
package com.jiuyv.business.domain;
import java.io.Serializable;
import java.util.Date;
/**
* tbl_car_pre_record_detail_his_info
*
*/
public class TblCarPreRecordDetailHisInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
private String id;
/**
*
*/
private Integer version;
/**
* id
*/
private String orgId;
/**
*
*/
private String preOrderId;
/**
*
*/
private String companyId;
/**
*
*/
private String carVin;
/**
*
*/
private String shipName;
/**
*
*/
private String waybillNumber;
/**
*
*/
private String departPort;
/**
*
*/
private String carNumber;
/**
*
*/
private String carModel;
/**
*
*/
private String destinationPort;
/**
*
*/
private String destinationCountry;
/**
* 00 01
*/
private String status;
/**
*
*/
private Date createTime;
/**
*
*/
private String createUserId;
/**
*
*/
private Date updateTime;
/**
*
*/
private String updateUserId;
/**
* 1
*/
private String rsv1;
/**
* 2
*/
private String rsv2;
/**
* 3
*/
private String rsv3;
/**
*
*/
private String remarks;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getPreOrderId() {
return preOrderId;
}
public void setPreOrderId(String preOrderId) {
this.preOrderId = preOrderId;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getCarVin() {
return carVin;
}
public void setCarVin(String carVin) {
this.carVin = carVin;
}
public String getShipName() {
return shipName;
}
public void setShipName(String shipName) {
this.shipName = shipName;
}
public String getWaybillNumber() {
return waybillNumber;
}
public void setWaybillNumber(String waybillNumber) {
this.waybillNumber = waybillNumber;
}
public String getDepartPort() {
return departPort;
}
public void setDepartPort(String departPort) {
this.departPort = departPort;
}
public String getCarNumber() {
return carNumber;
}
public void setCarNumber(String carNumber) {
this.carNumber = carNumber;
}
public String getCarModel() {
return carModel;
}
public void setCarModel(String carModel) {
this.carModel = carModel;
}
public String getDestinationPort() {
return destinationPort;
}
public void setDestinationPort(String destinationPort) {
this.destinationPort = destinationPort;
}
public String getDestinationCountry() {
return destinationCountry;
}
public void setDestinationCountry(String destinationCountry) {
this.destinationCountry = destinationCountry;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public String getRsv1() {
return rsv1;
}
public void setRsv1(String rsv1) {
this.rsv1 = rsv1;
}
public String getRsv2() {
return rsv2;
}
public void setRsv2(String rsv2) {
this.rsv2 = rsv2;
}
public String getRsv3() {
return rsv3;
}
public void setRsv3(String rsv3) {
this.rsv3 = rsv3;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
}

@ -25,7 +25,7 @@ public class TblCarPreRecordDetailInfo {
*
*/
@Excel(name = "版本号")
private String version;
private Integer version;
/**
* id
@ -172,11 +172,11 @@ public class TblCarPreRecordDetailInfo {
this.id = id;
}
public String getVersion() {
public Integer getVersion() {
return version;
}
public void setVersion(String version) {
public void setVersion(Integer version) {
this.version = version;
}

@ -0,0 +1,232 @@
package com.jiuyv.business.domain;
import java.io.Serializable;
import java.util.Date;
/**
* tbl_car_pre_record_his_info
*
*/
public class TblCarPreRecordHisInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
private String id;
/**
*
*/
private Integer version;
/**
* id
*/
private String orgId;
/**
*
*/
private String preOrderId;
/**
*
*/
private String companyId;
/**
*
*/
private String shipName;
/**
* 00 01
*/
private String status;
/**
* id
*/
private String fileId;
/**
*
*/
private String fileName;
/**
*
*/
private Integer carCount;
/**
*
*/
private Date createTime;
/**
*
*/
private String createUserId;
/**
*
*/
private Date updateTime;
/**
*
*/
private String updateUserId;
/**
* 1
*/
private String rsv1;
/**
* 2
*/
private String rsv2;
/**
* 3
*/
private String rsv3;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public String getPreOrderId() {
return preOrderId;
}
public void setPreOrderId(String preOrderId) {
this.preOrderId = preOrderId;
}
public String getCompanyId() {
return companyId;
}
public void setCompanyId(String companyId) {
this.companyId = companyId;
}
public String getShipName() {
return shipName;
}
public void setShipName(String shipName) {
this.shipName = shipName;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getFileId() {
return fileId;
}
public void setFileId(String fileId) {
this.fileId = fileId;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public Integer getCarCount() {
return carCount;
}
public void setCarCount(Integer carCount) {
this.carCount = carCount;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public String getRsv1() {
return rsv1;
}
public void setRsv1(String rsv1) {
this.rsv1 = rsv1;
}
public String getRsv2() {
return rsv2;
}
public void setRsv2(String rsv2) {
this.rsv2 = rsv2;
}
public String getRsv3() {
return rsv3;
}
public void setRsv3(String rsv3) {
this.rsv3 = rsv3;
}
}

@ -25,7 +25,7 @@ public class TblCarPreRecordInfo {
*
*/
@Excel(name = "版本号")
private String version;
private Integer version;
/**
* id
@ -129,11 +129,11 @@ public class TblCarPreRecordInfo {
this.id = id;
}
public String getVersion() {
public Integer getVersion() {
return version;
}
public void setVersion(String version) {
public void setVersion(Integer version) {
this.version = version;
}

@ -2,6 +2,7 @@ package com.jiuyv.business.mapper;
import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -19,7 +20,7 @@ public interface TblCarOrderFormalDetailInfoMapper {
* @param id
* @return
*/
TblCarOrderFormalDetailInfo selectTblCarOrderFormalDetailInfoById(String id);
TblCarOrderFormalDetailInfo selectTblCarOrderFormalDetailInfoById(@Param("id") String id);
/**
*
@ -47,7 +48,10 @@ public interface TblCarOrderFormalDetailInfoMapper {
/**
* id
*
*/
void deleteByOrderId(String orderId);
void deleteByOrderId(@Param("orderId") String orderId);
void deleteById(@Param("id") String id);
TblCarOrderFormalDetailInfo selectByOrderIdAndCarVin(@Param("orderId") String orderId, @Param("carVin") String carVin);
}

@ -0,0 +1,15 @@
package com.jiuyv.business.mapper;
import com.jiuyv.business.domain.TblCarPreRecordDetailHisInfo;
import org.apache.ibatis.annotations.Mapper;
/**
* tbl_car_pre_record_detail_his_info()Mapper
*
*/
@Mapper
public interface TblCarPreRecordDetailHisInfoMapper {
int insert(TblCarPreRecordDetailHisInfo record);
}

@ -19,7 +19,7 @@ public interface TblCarPreRecordDetailInfoMapper {
* @param preOrderId
* @return
*/
List<TblCarPreRecordDetailInfo> selectTblCarPreRecordDetailInfoById(String preOrderId);
List<TblCarPreRecordDetailInfo> selectTblCarPreRecordDetailInfoByPreOrderId(String preOrderId);
/**
*

@ -0,0 +1,15 @@
package com.jiuyv.business.mapper;
import com.jiuyv.business.domain.TblCarPreRecordHisInfo;
import org.apache.ibatis.annotations.Mapper;
/**
* tbl_car_pre_record_his_info()Mapper
*
*/
@Mapper
public interface TblCarPreRecordHisInfoMapper {
int insert(TblCarPreRecordHisInfo record);
}

@ -1,8 +1,6 @@
package com.jiuyv.business.service;
import com.jiuyv.business.domain.TblCarInspectHisInfo;
import java.util.List;
import com.jiuyv.business.domain.TblCarInspectInfo;
/**
* Service
@ -11,35 +9,11 @@ import java.util.List;
* @date 2023-07-18
*/
public interface CarInspectHisInfoService {
/**
*
*
* @param id
* @return
*/
TblCarInspectHisInfo selectTblCarInspectHisInfoById(String id);
/**
*
*
* @param tblCarInspectHisInfo
* @return
*/
List<TblCarInspectHisInfo> selectTblCarInspectHisInfoList(TblCarInspectHisInfo tblCarInspectHisInfo);
/**
*
*
* @param tblCarInspectHisInfo
* @return
*/
int insertTblCarInspectHisInfo(TblCarInspectHisInfo tblCarInspectHisInfo);
void saveInspectHisBean(TblCarInspectInfo inspectInfo);
/**
*
*
* @param tblCarInspectHisInfo
* @return
*/
int updateTblCarInspectHisInfo(TblCarInspectHisInfo tblCarInspectHisInfo);
}

@ -1,8 +1,6 @@
package com.jiuyv.business.service;
import com.jiuyv.business.domain.TblCarOrderFormalDetailHisInfo;
import java.util.List;
import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
/**
* Service
@ -11,35 +9,6 @@ import java.util.List;
* @date 2023-07-18
*/
public interface CarOrderFormalDetailHisInfoService {
/**
*
*
* @param id
* @return
*/
TblCarOrderFormalDetailHisInfo selectTblCarOrderFormalDetailHisInfoById(String id);
/**
*
*
* @param tblCarOrderFormalDetailHisInfo
* @return
*/
List<TblCarOrderFormalDetailHisInfo> selectTblCarOrderFormalDetailHisInfoList(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
/**
*
*
* @param tblCarOrderFormalDetailHisInfo
* @return
*/
int insertTblCarOrderFormalDetailHisInfo(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
/**
*
*
* @param tblCarOrderFormalDetailHisInfo
* @return
*/
int updateTblCarOrderFormalDetailHisInfo(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo);
void saveFormDetailHisBean(TblCarOrderFormalDetailInfo formalDetailInfo);
}

@ -35,4 +35,9 @@ public interface CarOrderFormalDetailInfoService {
*/
int updateTblCarOrderFormalDetailInfo(TblCarOrderFormalDetailInfo tblCarOrderFormalDetailInfo);
/**
*
*
*/
void deleteByOrderIdAndCarVin(String orderId, String carVin);
}

@ -0,0 +1,13 @@
package com.jiuyv.business.service;
import com.jiuyv.business.domain.TblCarPreRecordDetailInfo;
/**
* Service
*
*/
public interface CarPreRecordDetailHisInfoService {
void savePreRecordDetailHisBean(TblCarPreRecordDetailInfo recordDetailInfo);
}

@ -0,0 +1,12 @@
package com.jiuyv.business.service;
import com.jiuyv.business.domain.TblCarPreRecordInfo;
/**
* Service
*
*/
public interface CarPreRecordHisInfoService {
void savePreRecordHisBean(TblCarPreRecordInfo tblCarPreRecordInfo);
}

@ -1,6 +1,7 @@
package com.jiuyv.business.service.impl;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.util.MapUtils;
import com.alibaba.excel.write.metadata.WriteSheet;
@ -193,6 +194,8 @@ public class CarInspectDetailInfoServiceImpl implements CarInspectDetailInfoServ
} else if (null != deptId && !CarConstants.PARENT_DEPT_ID.equals(deptId + "")) {
//兄弟公司查询条件
tblCarInspectDetailInfo.setInspectOrgId(deptId + "");
} else {
LOGGER.info("未查询到检验单位id");
}
//外部用户(委托单位)查询条件
@ -208,8 +211,6 @@ public class CarInspectDetailInfoServiceImpl implements CarInspectDetailInfoServ
public ResExportSumFileVO exportSum(ReqExportSumInfoVO req) {
ResExportSumFileVO result = new ResExportSumFileVO();
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletResponse response = servletRequestAttributes.getResponse();
String shipName = req.getShipName();
if (StringUtils.isBlank(shipName)) {
throw new ServiceException("船名航次不能为空");
@ -227,8 +228,8 @@ public class CarInspectDetailInfoServiceImpl implements CarInspectDetailInfoServ
String fileName = "表2-装船前生物安全风险检验情况清单_" + System.currentTimeMillis() + ".xls";
String generalFileName = tempExcelDir + fileName;
// 方案1
try (ExcelWriter excelWriter = EasyExcel.write(generalFileName).withTemplate(templateFileName).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
try (ExcelWriter excelWriter = EasyExcelFactory.write(generalFileName).withTemplate(templateFileName).build()) {
WriteSheet writeSheet = EasyExcelFactory.writerSheet().build();
// 这里注意 入参用了forceNewRow 代表在写入list的时候不管list下面有没有空行 都会创建一行,然后下面的数据往后移动。默认 是false会直接使用下一行如果没有则创建。
// forceNewRow 如果设置了true,有个缺点 就是他会把所有的数据都放到内存了,所以慎用
// 简单的说 如果你的模板有list,且list不是最后一行下面还有数据需要填充 就必须设置 forceNewRow=true 但是这个就会把所有数据放到内存 会很耗内存

@ -1,15 +1,13 @@
package com.jiuyv.business.service.impl;
import com.jiuyv.business.domain.TblCarInspectHisInfo;
import com.jiuyv.business.domain.TblCarInspectInfo;
import com.jiuyv.business.mapper.TblCarInspectHisInfoMapper;
import com.jiuyv.business.service.CarInspectHisInfoService;
import com.jiuyv.common.utils.CarcheckDateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* Service
*
@ -21,51 +19,33 @@ public class CarInspectHisInfoServiceImpl implements CarInspectHisInfoService {
@Autowired
private TblCarInspectHisInfoMapper tblCarInspectHisInfoMapper;
/**
*
*
* @param id
* @return
*/
@Override
public TblCarInspectHisInfo selectTblCarInspectHisInfoById(String id) {
return tblCarInspectHisInfoMapper.selectTblCarInspectHisInfoById(id);
}
/**
*
*
* @param tblCarInspectHisInfo
* @return
*/
@Override
public List<TblCarInspectHisInfo> selectTblCarInspectHisInfoList(TblCarInspectHisInfo tblCarInspectHisInfo) {
return tblCarInspectHisInfoMapper.selectTblCarInspectHisInfoList(tblCarInspectHisInfo);
}
/**
*
*
* @param tblCarInspectHisInfo
* @return
*/
@Override
@Transactional
public int insertTblCarInspectHisInfo(TblCarInspectHisInfo tblCarInspectHisInfo) {
tblCarInspectHisInfo.setCreateTime(CarcheckDateUtils.getNowDate());
return tblCarInspectHisInfoMapper.insertTblCarInspectHisInfo(tblCarInspectHisInfo);
public void saveInspectHisBean(TblCarInspectInfo inspectInfo) {
TblCarInspectHisInfo hisInfo = new TblCarInspectHisInfo();
hisInfo.setId(inspectInfo.getId());
hisInfo.setVersion(inspectInfo.getVersion());
hisInfo.setOrgId(inspectInfo.getOrgId());
hisInfo.setInspectOrgId(inspectInfo.getInspectOrgId());
hisInfo.setOrderId(inspectInfo.getOrderId());
hisInfo.setCompanyId(inspectInfo.getCompanyId());
hisInfo.setCarVin(inspectInfo.getCarVin());
hisInfo.setShipName(inspectInfo.getShipName());
hisInfo.setCarNumber(inspectInfo.getCarNumber());
hisInfo.setCarModel(inspectInfo.getCarModel());
hisInfo.setCarBodyInspectStatus(inspectInfo.getCarBodyInspectStatus());
hisInfo.setChassisInspectStatus(inspectInfo.getChassisInspectStatus());
hisInfo.setCarReInspectStatus(inspectInfo.getCarReInspectStatus());
hisInfo.setStatus(inspectInfo.getStatus());
hisInfo.setCreateUserId(inspectInfo.getCreateUserId());
hisInfo.setCreateTime(inspectInfo.getCreateTime());
hisInfo.setUpdateUserId(inspectInfo.getUpdateUserId());
hisInfo.setUpdateTime(inspectInfo.getUpdateTime());
tblCarInspectHisInfoMapper.insertTblCarInspectHisInfo(hisInfo);
}
/**
*
*
* @param tblCarInspectHisInfo
* @return
*/
@Override
@Transactional
public int updateTblCarInspectHisInfo(TblCarInspectHisInfo tblCarInspectHisInfo) {
tblCarInspectHisInfo.setUpdateTime(CarcheckDateUtils.getNowDate());
return tblCarInspectHisInfoMapper.updateTblCarInspectHisInfo(tblCarInspectHisInfo);
}
}

@ -6,7 +6,6 @@ import com.jiuyv.business.domain.TblCarInspectHisInfo;
import com.jiuyv.business.domain.TblCarInspectInfo;
import com.jiuyv.business.domain.TblCarOrderFormalDetailHisInfo;
import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
import com.jiuyv.business.domain.TblCarOrderFormalInfo;
import com.jiuyv.business.domain.TblCarPreRecordDetailInfo;
import com.jiuyv.business.domain.TblFileInfo;
import com.jiuyv.business.mapper.TblCarInspectDetailInfoMapper;
@ -17,6 +16,8 @@ import com.jiuyv.business.mapper.TblCarOrderFormalDetailInfoMapper;
import com.jiuyv.business.mapper.TblCarPreRecordDetailInfoMapper;
import com.jiuyv.business.mapper.TblFileInfoMapper;
import com.jiuyv.business.service.CarInspectInfoService;
import com.jiuyv.business.service.CarOrderFormalDetailHisInfoService;
import com.jiuyv.business.service.CarOrderFormalDetailInfoService;
import com.jiuyv.business.service.CarOrderFormalInfoService;
import com.jiuyv.business.vo.inspect.InspectResultResVO;
import com.jiuyv.business.vo.inspect.InspectUpdateReqVO;
@ -26,6 +27,8 @@ import com.jiuyv.common.exception.ServiceException;
import com.jiuyv.common.utils.CarcheckDateUtils;
import com.jiuyv.common.utils.SecurityUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@ -44,6 +47,7 @@ import java.util.List;
*/
@Service
public class CarInspectInfoServiceImpl implements CarInspectInfoService {
private static final Logger LOGGER = LoggerFactory.getLogger(CarInspectInfoServiceImpl.class);
@Autowired
private TblCarInspectInfoMapper tblCarInspectInfoMapper;
@Autowired
@ -60,6 +64,10 @@ public class CarInspectInfoServiceImpl implements CarInspectInfoService {
private TblCarPreRecordDetailInfoMapper tblCarPreRecordDetailInfoMapper;
@Autowired
private CarOrderFormalInfoService carOrderFormalInfoService;
@Autowired
private CarOrderFormalDetailInfoService carOrderFormalDetailInfoService;
@Autowired
private CarOrderFormalDetailHisInfoService carOrderFormalDetailHisInfoService;
@Value("${carcheck.app.fileViewUrl}")
private String fileViewUrl;
@ -107,6 +115,8 @@ public class CarInspectInfoServiceImpl implements CarInspectInfoService {
} else if (null != deptId && !CarConstants.PARENT_DEPT_ID.equals(deptId + "")) {
//兄弟公司查询条件
param.setInspectOrgId(deptId + "");
} else {
LOGGER.info("未查询到检验单位id");
}
if (StringUtils.isNotBlank(tblCarInspectInfo.getOrderId())) {
@ -118,6 +128,8 @@ public class CarInspectInfoServiceImpl implements CarInspectInfoService {
param.setCompanyId(companyId);
} else if (StringUtils.isNotBlank(tblCarInspectInfo.getCompanyId())) {
param.setCompanyId(tblCarInspectInfo.getCompanyId());
} else {
LOGGER.info("未查询到委托单位Id");
}
if (StringUtils.isNotBlank(tblCarInspectInfo.getShipName())) {
param.setShipName(tblCarInspectInfo.getShipName());
@ -206,7 +218,7 @@ public class CarInspectInfoServiceImpl implements CarInspectInfoService {
//保存委托单明细历史表数据
detailInfo = tblCarOrderFormalDetailInfoMapper.selectTblCarOrderFormalDetailInfoById(detailInfo.getId());
saveFormDetailHisBean(detailInfo);
carOrderFormalDetailHisInfoService.saveFormDetailHisBean(detailInfo);
//更新预录明细表
TblCarPreRecordDetailInfo info = new TblCarPreRecordDetailInfo();
@ -220,42 +232,6 @@ public class CarInspectInfoServiceImpl implements CarInspectInfoService {
return 1;
}
/**
*
*
* @param formDetail
*/
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void saveFormDetailHisBean(TblCarOrderFormalDetailInfo formDetail) {
TblCarOrderFormalDetailHisInfo hisInfo = new TblCarOrderFormalDetailHisInfo();
hisInfo.setId(formDetail.getId());
hisInfo.setVersion(formDetail.getVersion());
hisInfo.setOrgId(formDetail.getOrgId());
hisInfo.setInspectOrgId(formDetail.getInspectOrgId());
hisInfo.setPreOrderId(formDetail.getPreOrderId());
hisInfo.setOrderId(formDetail.getOrderId());
hisInfo.setCompanyId(formDetail.getCompanyId());
hisInfo.setCarVin(formDetail.getCarVin());
hisInfo.setShipName(formDetail.getShipName());
hisInfo.setWaybillNumber(formDetail.getWaybillNumber());
hisInfo.setDepartPort(formDetail.getDepartPort());
hisInfo.setCarNumber(formDetail.getCarNumber());
hisInfo.setCarModel(formDetail.getCarModel());
hisInfo.setDestinationPort(formDetail.getDestinationPort());
hisInfo.setDestinationCountry(formDetail.getDestinationCountry());
hisInfo.setSrcType(formDetail.getSrcType());
hisInfo.setStatus(formDetail.getStatus());
hisInfo.setRemarks(formDetail.getRemarks());
hisInfo.setRsv1(formDetail.getRsv1());
hisInfo.setRsv2(formDetail.getRsv2());
hisInfo.setRsv3(formDetail.getRsv3());
hisInfo.setCreateUserId(formDetail.getCreateUserId());
hisInfo.setCreateTime(formDetail.getCreateTime());
hisInfo.setUpdateUserId(formDetail.getUpdateUserId());
hisInfo.setUpdateTime(formDetail.getUpdateTime());
this.tblCarOrderFormalDetailHisInfoMapper.insertTblCarOrderFormalDetailHisInfo(hisInfo);
}
/**
*
*
@ -384,27 +360,21 @@ public class CarInspectInfoServiceImpl implements CarInspectInfoService {
if (!CollectionUtils.isEmpty(detailInfoList)) {
throw new ServiceException("该车辆已经在检查,不能删除");
}
TblCarInspectInfo carInspectInfo = tblCarInspectInfoMapper.selectTblCarInspectInfoById(id);
// 删除车辆检查信息
TblCarInspectInfo carInspectInfo = tblCarInspectInfoMapper.selectTblCarInspectInfoById(id);
carInspectInfo.setVersion(String.valueOf(Integer.parseInt(carInspectInfo.getVersion()) + 1));
carInspectInfo.setStatus(CarConstants.DATA_DELETE_HIS);
saveInspectHisBean(carInspectInfo);
tblCarInspectInfoMapper.deleteById(id);
// 更新历史表
updateInspectHisBean(carInspectInfo);
// 删除委托单明细
carOrderFormalDetailInfoService.deleteByOrderIdAndCarVin(carInspectInfo.getOrderId(), carInspectInfo.getCarVin());
// 更新委托单车辆总数
carOrderFormalInfoService.updateCarTotalNumber(carInspectInfo.getOrderId(), -1);
}
/**
*
*
*/
private void updateInspectHisBean(TblCarInspectInfo carInspectInfo) {
TblCarInspectHisInfo carInspectHisInfo = new TblCarInspectHisInfo();
carInspectHisInfo.setId(carInspectInfo.getId());
carInspectHisInfo.setVersion(carInspectInfo.getVersion());
carInspectHisInfo.setStatus(CarConstants.DATA_DELETE_HIS);
tblCarInspectHisInfoMapper.updateTblCarInspectHisInfo(carInspectHisInfo);
}
/**
*
*

@ -1,6 +1,7 @@
package com.jiuyv.business.service.impl;
import com.jiuyv.business.domain.TblCarOrderFormalDetailHisInfo;
import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
import com.jiuyv.business.mapper.TblCarOrderFormalDetailHisInfoMapper;
import com.jiuyv.business.service.CarOrderFormalDetailHisInfoService;
import com.jiuyv.common.utils.CarcheckDateUtils;
@ -21,52 +22,30 @@ public class CarOrderFormalDetailHisInfoServiceImpl implements CarOrderFormalDet
@Autowired
private TblCarOrderFormalDetailHisInfoMapper tblCarOrderFormalDetailHisInfoMapper;
/**
*
*
* @param id
* @return
*/
@Override
public TblCarOrderFormalDetailHisInfo selectTblCarOrderFormalDetailHisInfoById(String id) {
return tblCarOrderFormalDetailHisInfoMapper.selectTblCarOrderFormalDetailHisInfoById(id);
public void saveFormDetailHisBean(TblCarOrderFormalDetailInfo formDetail) {
TblCarOrderFormalDetailHisInfo hisInfo = new TblCarOrderFormalDetailHisInfo();
hisInfo.setId(formDetail.getId());
hisInfo.setVersion(formDetail.getVersion());
hisInfo.setOrgId(formDetail.getOrgId());
hisInfo.setInspectOrgId(formDetail.getInspectOrgId());
hisInfo.setPreOrderId(formDetail.getPreOrderId());
hisInfo.setOrderId(formDetail.getOrderId());
hisInfo.setCompanyId(formDetail.getCompanyId());
hisInfo.setCarVin(formDetail.getCarVin());
hisInfo.setShipName(formDetail.getShipName());
hisInfo.setWaybillNumber(formDetail.getWaybillNumber());
hisInfo.setDepartPort(formDetail.getDepartPort());
hisInfo.setCarNumber(formDetail.getCarNumber());
hisInfo.setCarModel(formDetail.getCarModel());
hisInfo.setDestinationPort(formDetail.getDestinationPort());
hisInfo.setDestinationCountry(formDetail.getDestinationCountry());
hisInfo.setSrcType(formDetail.getSrcType());
hisInfo.setStatus(formDetail.getStatus());
hisInfo.setCreateUserId(formDetail.getCreateUserId());
hisInfo.setCreateTime(formDetail.getCreateTime());
hisInfo.setUpdateUserId(formDetail.getUpdateUserId());
hisInfo.setUpdateTime(formDetail.getUpdateTime());
this.tblCarOrderFormalDetailHisInfoMapper.insertTblCarOrderFormalDetailHisInfo(hisInfo);
}
/**
*
*
* @param tblCarOrderFormalDetailHisInfo
* @return
*/
@Override
public List<TblCarOrderFormalDetailHisInfo> selectTblCarOrderFormalDetailHisInfoList(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo) {
return tblCarOrderFormalDetailHisInfoMapper.selectTblCarOrderFormalDetailHisInfoList(tblCarOrderFormalDetailHisInfo);
}
/**
*
*
* @param tblCarOrderFormalDetailHisInfo
* @return
*/
@Override
@Transactional
public int insertTblCarOrderFormalDetailHisInfo(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo) {
tblCarOrderFormalDetailHisInfo.setCreateTime(CarcheckDateUtils.getNowDate());
return tblCarOrderFormalDetailHisInfoMapper.insertTblCarOrderFormalDetailHisInfo(tblCarOrderFormalDetailHisInfo);
}
/**
*
*
* @param tblCarOrderFormalDetailHisInfo
* @return
*/
@Override
@Transactional
public int updateTblCarOrderFormalDetailHisInfo(TblCarOrderFormalDetailHisInfo tblCarOrderFormalDetailHisInfo) {
tblCarOrderFormalDetailHisInfo.setUpdateTime(CarcheckDateUtils.getNowDate());
return tblCarOrderFormalDetailHisInfoMapper.updateTblCarOrderFormalDetailHisInfo(tblCarOrderFormalDetailHisInfo);
}
}

@ -1,7 +1,9 @@
package com.jiuyv.business.service.impl;
import com.jiuyv.business.constant.CarConstants;
import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
import com.jiuyv.business.mapper.TblCarOrderFormalDetailInfoMapper;
import com.jiuyv.business.service.CarOrderFormalDetailHisInfoService;
import com.jiuyv.business.service.CarOrderFormalDetailInfoService;
import com.jiuyv.common.utils.CarcheckDateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -21,6 +23,8 @@ import java.util.List;
public class CarOrderFormalDetailInfoServiceImpl implements CarOrderFormalDetailInfoService {
@Autowired
private TblCarOrderFormalDetailInfoMapper tblCarOrderFormalDetailInfoMapper;
@Autowired
private CarOrderFormalDetailHisInfoService carOrderFormalDetailHisInfoService;
/**
*
@ -57,4 +61,20 @@ public class CarOrderFormalDetailInfoServiceImpl implements CarOrderFormalDetail
return tblCarOrderFormalDetailInfoMapper.updateTblCarOrderFormalDetailInfo(tblCarOrderFormalDetailInfo);
}
/**
*
*
*/
@Override
public void deleteByOrderIdAndCarVin(String orderId, String carVin) {
TblCarOrderFormalDetailInfo formalDetailInfo = tblCarOrderFormalDetailInfoMapper.selectByOrderIdAndCarVin(orderId, carVin);
// 保存历史表
formalDetailInfo.setVersion(String.valueOf(Integer.parseInt(formalDetailInfo.getVersion()) + 1));
formalDetailInfo.setStatus(CarConstants.DATA_DELETE_HIS);
carOrderFormalDetailHisInfoService.saveFormDetailHisBean(formalDetailInfo);
// 删除主表
tblCarOrderFormalDetailInfoMapper.deleteById(formalDetailInfo.getId());
}
}

@ -1,6 +1,7 @@
package com.jiuyv.business.service.impl;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.EasyExcelFactory;
import com.jiuyv.business.constant.CarConstants;
import com.jiuyv.business.domain.TblCarInspectHisInfo;
import com.jiuyv.business.domain.TblCarInspectInfo;
@ -14,6 +15,7 @@ import com.jiuyv.business.mapper.TblCarOrderFormalDetailHisInfoMapper;
import com.jiuyv.business.mapper.TblCarOrderFormalDetailInfoMapper;
import com.jiuyv.business.mapper.TblCarOrderFormalHisInfoMapper;
import com.jiuyv.business.mapper.TblCarOrderFormalInfoMapper;
import com.jiuyv.business.service.CarOrderFormalDetailHisInfoService;
import com.jiuyv.business.service.CarOrderFormalInfoService;
import com.jiuyv.business.vo.orderformal.NoCheckCarInfo;
import com.jiuyv.business.vo.orderformal.OrderFormalCompleteCheckReqVO;
@ -58,7 +60,7 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
@Autowired
private TblCarOrderFormalHisInfoMapper tblCarOrderFormalHisInfoMapper;
@Autowired
private TblCarOrderFormalDetailHisInfoMapper tblCarOrderFormalDetailHisInfoMapper;
private CarOrderFormalDetailHisInfoService carOrderFormalDetailHisInfoService;
/**
*
@ -86,6 +88,8 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
} else if (null != deptId && !CarConstants.PARENT_DEPT_ID.equals(deptId + "")) {
//兄弟公司查询条件
tblCarOrderFormalInfo.setInspectOrgId(deptId + "");
} else {
LOGGER.info("未查询到检验单位id");
}
//外部用户(委托单位)查询条件
@ -142,11 +146,13 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public int updateTblCarOrderFormalInfo(OrderFormalCompleteCheckReqVO reqVO) {
TblCarOrderFormalInfo updateOrderInfo = new TblCarOrderFormalInfo();
updateOrderInfo.setId(reqVO.getId());
TblCarOrderFormalInfo updateOrderInfo = tblCarOrderFormalInfoMapper.selectTblCarOrderFormalInfoById(reqVO.getId());
updateOrderInfo.setVersion(String.valueOf(Integer.parseInt(updateOrderInfo.getVersion()) + 1));
updateOrderInfo.setStatus(CarConstants.ORDERFORMAL_STATUS_01);
updateOrderInfo.setUpdateUserId(String.valueOf(SecurityUtils.getUserId()));
updateOrderInfo.setUpdateTime(CarcheckDateUtils.getNowDate());
// 保存到历史表
saveHisFormBean(updateOrderInfo);
return tblCarOrderFormalInfoMapper.updateTblCarOrderFormalInfo(updateOrderInfo);
}
@ -167,7 +173,7 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
private void saveOrderDetail(OrderFormalDetailAddReqVO reqVO) {
//保存委托单明细信息,即车辆信息;保存委托单明细历史数据
TblCarOrderFormalDetailInfo formalDetailInfo = saveFormDetailBean(reqVO);
saveFormDetailHisBean(formalDetailInfo);
carOrderFormalDetailHisInfoService.saveFormDetailHisBean(formalDetailInfo);
//保存检查主表数据
TblCarInspectInfo inspectInfo = saveInspectBean(reqVO);
@ -197,7 +203,7 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
public String importCar(MultipartFile file, String id) {
List<PreRecordTemplate> dataList;
try {
dataList = EasyExcel.read(file.getInputStream()).head(PreRecordTemplate.class).sheet().doReadSync();
dataList = EasyExcelFactory.read(file.getInputStream()).head(PreRecordTemplate.class).sheet().doReadSync();
} catch (IOException e) {
throw new ServiceException("文件解析失败!");
}
@ -218,7 +224,7 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
tblCarOrderFormalDetailInfoMapper.selectTblCarOrderFormalDetailInfoList(paramData);
if (!CollectionUtils.isEmpty(resultList)) {
failureNum++;
String msg = failureNum + ". 车辆VIN码 " + data.getCarVin() + "已存在(预录单)";
String msg = failureNum + ". 车辆VIN码 " + data.getCarVin() + "已存在";
LOGGER.error(msg);
failureMsg.append("<br/>").append(msg);
continue;
@ -231,8 +237,6 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
continue;
}
//125
//0111 1101
OrderFormalDetailAddReqVO addReqVO = new OrderFormalDetailAddReqVO();
addReqVO.setId(carOrderFormalInfo.getId());
addReqVO.setOrgId(carOrderFormalInfo.getOrgId());
@ -263,6 +267,7 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
*
*/
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void updateCarTotalNumber(String orderId, Integer count) {
TblCarOrderFormalInfo result =
tblCarOrderFormalInfoMapper.selectTblCarOrderFormalInfoByOrderId(orderId);
@ -340,38 +345,6 @@ public class CarOrderFormalInfoServiceImpl implements CarOrderFormalInfoService
return inspectInfo;
}
/**
*
*
* @param formDetail
*/
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void saveFormDetailHisBean(TblCarOrderFormalDetailInfo formDetail) {
TblCarOrderFormalDetailHisInfo hisInfo = new TblCarOrderFormalDetailHisInfo();
hisInfo.setId(formDetail.getId());
hisInfo.setVersion(formDetail.getVersion());
hisInfo.setOrgId(formDetail.getOrgId());
hisInfo.setInspectOrgId(formDetail.getInspectOrgId());
hisInfo.setPreOrderId(formDetail.getPreOrderId());
hisInfo.setOrderId(formDetail.getOrderId());
hisInfo.setCompanyId(formDetail.getCompanyId());
hisInfo.setCarVin(formDetail.getCarVin());
hisInfo.setShipName(formDetail.getShipName());
hisInfo.setWaybillNumber(formDetail.getWaybillNumber());
hisInfo.setDepartPort(formDetail.getDepartPort());
hisInfo.setCarNumber(formDetail.getCarNumber());
hisInfo.setCarModel(formDetail.getCarModel());
hisInfo.setDestinationPort(formDetail.getDestinationPort());
hisInfo.setDestinationCountry(formDetail.getDestinationCountry());
hisInfo.setSrcType(formDetail.getSrcType());
hisInfo.setStatus(formDetail.getStatus());
hisInfo.setCreateUserId(formDetail.getCreateUserId());
hisInfo.setCreateTime(formDetail.getCreateTime());
hisInfo.setUpdateUserId(formDetail.getUpdateUserId());
hisInfo.setUpdateTime(formDetail.getUpdateTime());
this.tblCarOrderFormalDetailHisInfoMapper.insertTblCarOrderFormalDetailHisInfo(hisInfo);
}
/**
*
*

@ -0,0 +1,50 @@
package com.jiuyv.business.service.impl;
import com.jiuyv.business.domain.TblCarPreRecordDetailHisInfo;
import com.jiuyv.business.domain.TblCarPreRecordDetailInfo;
import com.jiuyv.business.mapper.TblCarPreRecordDetailHisInfoMapper;
import com.jiuyv.business.service.CarPreRecordDetailHisInfoService;
import org.springframework.stereotype.Service;
/**
* Service
*
*/
@Service
public class CarPreRecordDetailHisInfoServiceImpl implements CarPreRecordDetailHisInfoService {
private final TblCarPreRecordDetailHisInfoMapper tblCarPreRecordDetailHisInfoMapper;
public CarPreRecordDetailHisInfoServiceImpl(TblCarPreRecordDetailHisInfoMapper tblCarPreRecordDetailHisInfoMapper) {
this.tblCarPreRecordDetailHisInfoMapper = tblCarPreRecordDetailHisInfoMapper;
}
@Override
public void savePreRecordDetailHisBean(TblCarPreRecordDetailInfo recordDetailInfo) {
TblCarPreRecordDetailHisInfo detailHisInfo = new TblCarPreRecordDetailHisInfo();
detailHisInfo.setId(recordDetailInfo.getId());
detailHisInfo.setVersion(recordDetailInfo.getVersion());
detailHisInfo.setOrgId(recordDetailInfo.getOrgId());
detailHisInfo.setPreOrderId(recordDetailInfo.getPreOrderId());
detailHisInfo.setCompanyId(recordDetailInfo.getCompanyId());
detailHisInfo.setCarVin(recordDetailInfo.getCarVin());
detailHisInfo.setShipName(recordDetailInfo.getShipName());
detailHisInfo.setWaybillNumber(recordDetailInfo.getWaybillNumber());
detailHisInfo.setDepartPort(recordDetailInfo.getDepartPort());
detailHisInfo.setCarNumber(recordDetailInfo.getCarNumber());
detailHisInfo.setCarModel(recordDetailInfo.getCarModel());
detailHisInfo.setDestinationPort(recordDetailInfo.getDestinationPort());
detailHisInfo.setDestinationCountry(recordDetailInfo.getDestinationCountry());
detailHisInfo.setStatus(recordDetailInfo.getStatus());
detailHisInfo.setCreateTime(recordDetailInfo.getCreateTime());
detailHisInfo.setCreateUserId(recordDetailInfo.getCreateUserId());
detailHisInfo.setUpdateTime(recordDetailInfo.getUpdateTime());
detailHisInfo.setUpdateUserId(recordDetailInfo.getUpdateUserId());
detailHisInfo.setRsv1(recordDetailInfo.getRsv1());
detailHisInfo.setRsv2(recordDetailInfo.getRsv2());
detailHisInfo.setRsv3(recordDetailInfo.getRsv3());
detailHisInfo.setRemarks(recordDetailInfo.getRemarks());
tblCarPreRecordDetailHisInfoMapper.insert(detailHisInfo);
}
}

@ -0,0 +1,44 @@
package com.jiuyv.business.service.impl;
import com.jiuyv.business.domain.TblCarPreRecordHisInfo;
import com.jiuyv.business.domain.TblCarPreRecordInfo;
import com.jiuyv.business.mapper.TblCarPreRecordHisInfoMapper;
import com.jiuyv.business.service.CarPreRecordHisInfoService;
import org.springframework.stereotype.Service;
/**
* Service
*
*/
@Service
public class CarPreRecordHisInfoServiceImpl implements CarPreRecordHisInfoService {
private final TblCarPreRecordHisInfoMapper tblCarPreRecordHisInfoMapper;
public CarPreRecordHisInfoServiceImpl(TblCarPreRecordHisInfoMapper tblCarPreRecordHisInfoMapper) {
this.tblCarPreRecordHisInfoMapper = tblCarPreRecordHisInfoMapper;
}
@Override
public void savePreRecordHisBean(TblCarPreRecordInfo tblCarPreRecordInfo) {
TblCarPreRecordHisInfo recordHisInfo = new TblCarPreRecordHisInfo();
recordHisInfo.setId(tblCarPreRecordInfo.getId());
recordHisInfo.setVersion(tblCarPreRecordInfo.getVersion());
recordHisInfo.setOrgId(tblCarPreRecordInfo.getOrgId());
recordHisInfo.setPreOrderId(tblCarPreRecordInfo.getPreOrderId());
recordHisInfo.setCompanyId(tblCarPreRecordInfo.getCompanyId());
recordHisInfo.setShipName(tblCarPreRecordInfo.getShipName());
recordHisInfo.setStatus(tblCarPreRecordInfo.getStatus());
recordHisInfo.setFileId(tblCarPreRecordInfo.getFileId());
recordHisInfo.setFileName(tblCarPreRecordInfo.getFileName());
recordHisInfo.setCarCount(tblCarPreRecordInfo.getCarCount());
recordHisInfo.setCreateTime(tblCarPreRecordInfo.getCreateTime());
recordHisInfo.setCreateUserId(tblCarPreRecordInfo.getCreateUserId());
recordHisInfo.setUpdateTime(tblCarPreRecordInfo.getUpdateTime());
recordHisInfo.setUpdateUserId(tblCarPreRecordInfo.getUpdateUserId());
recordHisInfo.setRsv1(tblCarPreRecordInfo.getRsv1());
recordHisInfo.setRsv2(tblCarPreRecordInfo.getRsv2());
recordHisInfo.setRsv3(tblCarPreRecordInfo.getRsv3());
tblCarPreRecordHisInfoMapper.insert(recordHisInfo);
}
}

@ -2,7 +2,6 @@ package com.jiuyv.business.service.impl;
import com.jiuyv.business.app.enums.CheckStatusEnum;
import com.jiuyv.business.constant.CarConstants;
import com.jiuyv.business.domain.TblCarInspectHisInfo;
import com.jiuyv.business.domain.TblCarInspectInfo;
import com.jiuyv.business.domain.TblCarOrderFormalDetailHisInfo;
import com.jiuyv.business.domain.TblCarOrderFormalDetailInfo;
@ -11,7 +10,6 @@ import com.jiuyv.business.domain.TblCarOrderFormalInfo;
import com.jiuyv.business.domain.TblCarPreRecordDetailInfo;
import com.jiuyv.business.domain.TblCarPreRecordInfo;
import com.jiuyv.business.domain.TblFileInfo;
import com.jiuyv.business.mapper.TblCarInspectHisInfoMapper;
import com.jiuyv.business.mapper.TblCarInspectInfoMapper;
import com.jiuyv.business.mapper.TblCarOrderFormalDetailHisInfoMapper;
import com.jiuyv.business.mapper.TblCarOrderFormalDetailInfoMapper;
@ -20,6 +18,10 @@ import com.jiuyv.business.mapper.TblCarOrderFormalInfoMapper;
import com.jiuyv.business.mapper.TblCarPreRecordDetailInfoMapper;
import com.jiuyv.business.mapper.TblCarPreRecordInfoMapper;
import com.jiuyv.business.mapper.TblFileInfoMapper;
import com.jiuyv.business.service.CarInspectHisInfoService;
import com.jiuyv.business.service.CarOrderFormalDetailHisInfoService;
import com.jiuyv.business.service.CarPreRecordDetailHisInfoService;
import com.jiuyv.business.service.CarPreRecordHisInfoService;
import com.jiuyv.business.service.CarPreRecordInfoService;
import com.jiuyv.business.vo.prerecord.PreRecordEffectReqVO;
import com.jiuyv.business.vo.prerecord.PreRecordTemplate;
@ -68,15 +70,19 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
@Autowired
private TblCarOrderFormalInfoMapper tblCarOrderFormalInfoMapper;
@Autowired
TblCarOrderFormalDetailHisInfoMapper tblCarOrderFormalDetailHisInfoMapper;
@Autowired
TblCarInspectHisInfoMapper tblCarInspectHisInfoMapper;
private CarInspectHisInfoService carInspectHisInfoService;
@Autowired
private TblCarInspectInfoMapper tblCarInspectInfoMapper;
@Autowired
private TblCarOrderFormalHisInfoMapper tblCarOrderFormalHisInfoMapper;
@Autowired
private TblCarOrderFormalDetailInfoMapper tblCarOrderFormalDetailInfoMapper;
@Autowired
private CarPreRecordHisInfoService carPreRecordHisInfoService;
@Autowired
private CarPreRecordDetailHisInfoService carPreRecordDetailHisInfoService;
@Autowired
private CarOrderFormalDetailHisInfoService carOrderFormalDetailHisInfoService;
@Autowired
public CarPreRecordInfoServiceImpl(TblCarPreRecordDetailInfoMapper tblCarPreRecordDetailInfoMapper, Validator validator) {
@ -147,7 +153,8 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
}
//保存车辆清单信息
savePreRecordDetailBean(data, carPreRecordInfo, companyId);
TblCarPreRecordDetailInfo recordDetailInfo = savePreRecordDetailBean(data, carPreRecordInfo, companyId);
carPreRecordDetailHisInfoService.savePreRecordDetailHisBean(recordDetailInfo);
successNum++;
carNum++;
@ -173,6 +180,10 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
updateRecordInfo.setCarCount(carNum);
tblCarPreRecordInfoMapper.updateTblCarPreRecordInfo(updateRecordInfo);
// 保存预录单历史表
carPreRecordInfo.setCarCount(carNum);
carPreRecordHisInfoService.savePreRecordHisBean(carPreRecordInfo);
if (failureNum > 0) {
failureMsg.insert(0, "导入失败共 " + failureNum + " 条,错误如下:");
LOGGER.error(failureMsg.toString());
@ -194,22 +205,22 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public String effectData(PreRecordEffectReqVO reqVO) {
//修改预录单状态
TblCarPreRecordInfo updateRecordInfo = new TblCarPreRecordInfo();
updateRecordInfo.setId(reqVO.getId());
TblCarPreRecordInfo updateRecordInfo = tblCarPreRecordInfoMapper.selectTblCarPreRecordInfoByPreId(reqVO.getPreOrderId());
updateRecordInfo.setVersion(updateRecordInfo.getVersion() + 1);
updateRecordInfo.setStatus(CarConstants.PRERECORD_STATUS_01);
updateRecordInfo.setUpdateUserId(String.valueOf(SecurityUtils.getUserId()));
updateRecordInfo.setUpdateTime(CarcheckDateUtils.getNowDate());
tblCarPreRecordInfoMapper.updateTblCarPreRecordInfo(updateRecordInfo);
carPreRecordHisInfoService.savePreRecordHisBean(updateRecordInfo);
//生成委托单、历史委托单
updateRecordInfo = this.tblCarPreRecordInfoMapper.selectTblCarPreRecordInfoByPreId(reqVO.getPreOrderId());
TblCarOrderFormalInfo formalInfo = saveFormBean(updateRecordInfo, reqVO);
saveHisFormBean(formalInfo);
//生成委托单明细表
TblCarOrderFormalDetailInfo info = null;
TblCarOrderFormalDetailInfo info;
//生成检查主表信息
TblCarInspectInfo inspectInfo = null;
TblCarInspectInfo inspectInfo;
TblCarPreRecordDetailInfo dataInfo = new TblCarPreRecordDetailInfo();
dataInfo.setPreOrderId(reqVO.getPreOrderId());
List<TblCarPreRecordDetailInfo> detailInfoList =
@ -217,44 +228,15 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
for (TblCarPreRecordDetailInfo detailInfo : detailInfoList) {
//保存委托单明细表、明细历史表
info = saveFormDetailBean(detailInfo, reqVO, formalInfo);
saveFormDetailHisBean(info);
carOrderFormalDetailHisInfoService.saveFormDetailHisBean(info);
//保存检查主表数据、历史表数据
inspectInfo = saveInspectBean(detailInfo, reqVO, formalInfo);
saveInspectHisBean(inspectInfo);
carInspectHisInfoService.saveInspectHisBean(inspectInfo);
}
return "预录单号'" + reqVO.getInspectOrgId() + "'的车辆预录单已生效";
}
/**
*
*
* @param inspectInfo
*/
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void saveInspectHisBean(TblCarInspectInfo inspectInfo) {
TblCarInspectHisInfo hisInfo = new TblCarInspectHisInfo();
hisInfo.setId(inspectInfo.getId());
hisInfo.setVersion(inspectInfo.getVersion());
hisInfo.setOrgId(inspectInfo.getOrgId());
hisInfo.setInspectOrgId(inspectInfo.getInspectOrgId());
hisInfo.setOrderId(inspectInfo.getOrderId());
hisInfo.setCompanyId(inspectInfo.getCompanyId());
hisInfo.setCarVin(inspectInfo.getCarVin());
hisInfo.setShipName(inspectInfo.getShipName());
hisInfo.setCarNumber(inspectInfo.getCarNumber());
hisInfo.setCarModel(inspectInfo.getCarModel());
hisInfo.setCarBodyInspectStatus(inspectInfo.getCarBodyInspectStatus());
hisInfo.setChassisInspectStatus(inspectInfo.getChassisInspectStatus());
hisInfo.setCarReInspectStatus(inspectInfo.getCarReInspectStatus());
hisInfo.setStatus(inspectInfo.getStatus());
hisInfo.setCreateUserId(inspectInfo.getCreateUserId());
hisInfo.setCreateTime(inspectInfo.getCreateTime());
hisInfo.setUpdateUserId(inspectInfo.getUpdateUserId());
hisInfo.setUpdateTime(inspectInfo.getUpdateTime());
this.tblCarInspectHisInfoMapper.insertTblCarInspectHisInfo(hisInfo);
}
/**
*
*
@ -289,38 +271,6 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
return inspectInfo;
}
/**
*
*
* @param formDetail
*/
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void saveFormDetailHisBean(TblCarOrderFormalDetailInfo formDetail) {
TblCarOrderFormalDetailHisInfo hisInfo = new TblCarOrderFormalDetailHisInfo();
hisInfo.setId(formDetail.getId());
hisInfo.setVersion(formDetail.getVersion());
hisInfo.setOrgId(formDetail.getOrgId());
hisInfo.setInspectOrgId(formDetail.getInspectOrgId());
hisInfo.setPreOrderId(formDetail.getPreOrderId());
hisInfo.setOrderId(formDetail.getOrderId());
hisInfo.setCompanyId(formDetail.getCompanyId());
hisInfo.setCarVin(formDetail.getCarVin());
hisInfo.setShipName(formDetail.getShipName());
hisInfo.setWaybillNumber(formDetail.getWaybillNumber());
hisInfo.setDepartPort(formDetail.getDepartPort());
hisInfo.setCarNumber(formDetail.getCarNumber());
hisInfo.setCarModel(formDetail.getCarModel());
hisInfo.setDestinationPort(formDetail.getDestinationPort());
hisInfo.setDestinationCountry(formDetail.getDestinationCountry());
hisInfo.setSrcType(formDetail.getSrcType());
hisInfo.setStatus(formDetail.getStatus());
hisInfo.setCreateUserId(formDetail.getCreateUserId());
hisInfo.setCreateTime(formDetail.getCreateTime());
hisInfo.setUpdateUserId(formDetail.getUpdateUserId());
hisInfo.setUpdateTime(formDetail.getUpdateTime());
this.tblCarOrderFormalDetailHisInfoMapper.insertTblCarOrderFormalDetailHisInfo(hisInfo);
}
/**
*
*
@ -363,8 +313,7 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
*
* @param updateRecordInfo
*/
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
TblCarOrderFormalInfo saveFormBean(TblCarPreRecordInfo updateRecordInfo, PreRecordEffectReqVO reqVO) {
private TblCarOrderFormalInfo saveFormBean(TblCarPreRecordInfo updateRecordInfo, PreRecordEffectReqVO reqVO) {
TblCarOrderFormalInfo orderFormalInfo = new TblCarOrderFormalInfo();
orderFormalInfo.setId(IdUtils.fastSimpleUUID());
orderFormalInfo.setVersion(String.valueOf(1));
@ -417,9 +366,9 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
*
* @return
*/
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
void savePreRecordDetailBean(PreRecordTemplate data, TblCarPreRecordInfo carPreRecordInfo, String companyId) {
private TblCarPreRecordDetailInfo savePreRecordDetailBean(PreRecordTemplate data, TblCarPreRecordInfo carPreRecordInfo, String companyId) {
TblCarPreRecordDetailInfo info = new TblCarPreRecordDetailInfo();
info.setVersion(1);
info.setId(IdUtils.fastSimpleUUID());
info.setOrgId(String.valueOf(SecurityUtils.getDeptId()));
info.setPreOrderId(carPreRecordInfo.getPreOrderId());
@ -436,6 +385,7 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
info.setUpdateUserId(String.valueOf(SecurityUtils.getUserId()));
info.setUpdateTime(CarcheckDateUtils.getNowDate());
tblCarPreRecordDetailInfoMapper.insertTblCarPreRecordDetailInfo(info);
return info;
}
/**
@ -445,8 +395,7 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
* @param template
* @return
*/
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
TblCarPreRecordInfo savePreRecordBean(TblFileInfo fileInfo, PreRecordTemplate template, String companyId) {
private TblCarPreRecordInfo savePreRecordBean(TblFileInfo fileInfo, PreRecordTemplate template, String companyId) {
TblCarPreRecordInfo carPreRecordInfo = new TblCarPreRecordInfo();
carPreRecordInfo.setId(IdUtils.fastSimpleUUID());
carPreRecordInfo.setOrgId(String.valueOf(SecurityUtils.getDeptId()));
@ -474,8 +423,7 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
* @return
* @throws IOException
*/
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
TblFileInfo uploadAndSaveFile(MultipartFile file) throws IOException {
private TblFileInfo uploadAndSaveFile(MultipartFile file) throws IOException {
// 上传文件路径
String filePath = CarcheckConfig.getUploadPath();
// 上传并返回新文件名称
@ -526,6 +474,7 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
@Override
public int insertTblCarPreRecordInfo(TblCarPreRecordInfo tblCarPreRecordInfo) {
tblCarPreRecordInfo.setCreateTime(CarcheckDateUtils.getNowDate());
tblCarPreRecordInfo.setVersion(1);
return tblCarPreRecordInfoMapper.insertTblCarPreRecordInfo(tblCarPreRecordInfo);
}
@ -539,6 +488,10 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public int deleteTblCarPreRecordInfoById(String id) {
TblCarPreRecordInfo info = this.selectTblCarPreRecordInfoById(id);
if (info == null) {
LOGGER.info("未查询到该预录单[{}]", id);
throw new ServiceException("未查询到该预录单");
}
// 预录单已生效
if (CarConstants.PRERECORD_STATUS_01.equals(info.getStatus())) {
// 查询委托单号
@ -551,14 +504,49 @@ public class CarPreRecordInfoServiceImpl implements CarPreRecordInfoService {
}
// 删除检查主表
TblCarInspectInfo carInspectInfo = new TblCarInspectInfo();
carInspectInfo.setOrderId(orderId);
List<TblCarInspectInfo> inspectInfoList = tblCarInspectInfoMapper.selectTblCarInspectInfoList(carInspectInfo);
for (TblCarInspectInfo inspectInfo : inspectInfoList) {
inspectInfo.setVersion(String.valueOf(Integer.parseInt(inspectInfo.getVersion()) + 1));
inspectInfo.setStatus(CarConstants.DATA_DELETE_HIS);
carInspectHisInfoService.saveInspectHisBean(inspectInfo);
}
tblCarInspectInfoMapper.deleteByOrderId(orderId);
// 删除委托单明细表
TblCarOrderFormalDetailInfo orderFormalDetailInfo = new TblCarOrderFormalDetailInfo();
orderFormalDetailInfo.setOrderId(orderId);
List<TblCarOrderFormalDetailInfo> formalDetailInfoList = tblCarOrderFormalDetailInfoMapper
.selectTblCarOrderFormalDetailInfoList(orderFormalDetailInfo);
for (TblCarOrderFormalDetailInfo formalDetailInfo : formalDetailInfoList) {
formalDetailInfo.setVersion(String.valueOf(Integer.parseInt(formalDetailInfo.getVersion()) + 1));
formalDetailInfo.setStatus(CarConstants.DATA_DELETE_HIS);
carOrderFormalDetailHisInfoService.saveFormDetailHisBean(formalDetailInfo);
}
tblCarOrderFormalDetailInfoMapper.deleteByOrderId(orderId);
// 删除委托单
carOrderFormalInfo.setVersion(String.valueOf(Integer.parseInt(carOrderFormalInfo.getVersion()) + 1));
carOrderFormalInfo.setStatus(CarConstants.DATA_DELETE_HIS);
saveHisFormBean(carOrderFormalInfo);
tblCarOrderFormalInfoMapper.deleteTblCarOrderFormalInfoById(carOrderFormalInfo.getId());
}
//删除预录单对应的明细
this.tblCarPreRecordDetailInfoMapper.deleteTblCarPreRecordDetailInfoByPreId(info.getPreOrderId());
String preOrderId = info.getPreOrderId();
List<TblCarPreRecordDetailInfo> recordDetailInfoList = tblCarPreRecordDetailInfoMapper.selectTblCarPreRecordDetailInfoByPreOrderId(preOrderId);
for (TblCarPreRecordDetailInfo carPreRecordDetailInfo : recordDetailInfoList) {
carPreRecordDetailInfo.setVersion(carPreRecordDetailInfo.getVersion() + 1);
carPreRecordDetailInfo.setStatus(CarConstants.DATA_DELETE_HIS);
carPreRecordDetailHisInfoService.savePreRecordDetailHisBean(carPreRecordDetailInfo);
}
this.tblCarPreRecordDetailInfoMapper.deleteTblCarPreRecordDetailInfoByPreId(preOrderId);
// 删除预录单
TblCarPreRecordInfo carPreRecordInfo = tblCarPreRecordInfoMapper.selectTblCarPreRecordInfoByPreId(preOrderId);
carPreRecordInfo.setVersion(carPreRecordInfo.getVersion() + 1);
carPreRecordInfo.setStatus(CarConstants.DATA_DELETE_HIS);
carPreRecordHisInfoService.savePreRecordHisBean(carPreRecordInfo);
return tblCarPreRecordInfoMapper.deleteTblCarPreRecordInfoById(id);
}

@ -7,6 +7,8 @@ import com.jiuyv.business.service.InspectRecordInfoService;
import com.jiuyv.business.vo.inspectrecord.ResQueryInspectRecordPage;
import com.jiuyv.common.utils.SecurityUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -20,6 +22,7 @@ import java.util.List;
*/
@Service
public class InspectRecordInfoServiceImpl implements InspectRecordInfoService {
private static final Logger LOGGER = LoggerFactory.getLogger(InspectRecordInfoServiceImpl.class);
@Autowired
private TblInspectRecordInfoMapper tblInspectRecordInfoMapper;
@ -38,6 +41,8 @@ public class InspectRecordInfoServiceImpl implements InspectRecordInfoService {
} else if (null != deptId && !CarConstants.PARENT_DEPT_ID.equals(deptId + "")) {
//兄弟公司查询条件
tblInspectRecordInfo.setInspectOrgId(deptId + "");
} else {
LOGGER.info("未查询到检验单位id");
}
//外部用户(委托单位)查询条件

@ -71,7 +71,9 @@ public class PollutantInfoServiceImpl implements PollutantInfoService {
buildBean(resVO, parentInfo, CarConstants.POLLUTANT_TYPE01);
}
ancestralInfo = tblPollutantInfoMapper.selectTblPollutantInfoById(parentInfo.getParentId());
if (parentInfo != null) {
ancestralInfo = tblPollutantInfoMapper.selectTblPollutantInfoById(parentInfo.getParentId());
}
if (null != ancestralInfo) {
buildBean(resVO, ancestralInfo, CarConstants.POLLUTANT_TYPE02);
}

@ -49,31 +49,6 @@ public class RedisCache {
redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
}
/**
*
*
* @param key Redis
* @param timeout
* @return true=false=
*/
public boolean expire(final String key, final long timeout)
{
return expire(key, timeout, TimeUnit.SECONDS);
}
/**
*
*
* @param key Redis
* @param timeout
* @param unit
* @return true=false=
*/
public boolean expire(final String key, final long timeout, final TimeUnit unit)
{
return redisTemplate.expire(key, timeout, unit);
}
/**
*
*
@ -91,7 +66,7 @@ public class RedisCache {
*
* @param key
*/
public boolean deleteObject(final String key)
public Boolean deleteObject(final String key)
{
return redisTemplate.delete(key);
}
@ -102,7 +77,7 @@ public class RedisCache {
* @param collection
* @return
*/
public long deleteObject(final Collection collection)
public Long deleteObject(final Collection collection)
{
return redisTemplate.delete(collection);
}

@ -721,7 +721,7 @@ public class ExcelUtil<T> {
/**
*
*/
public static Drawing<?> getDrawingPatriarch(Sheet sheet) {
public static Drawing getDrawingPatriarch(Sheet sheet) {
if (sheet.getDrawingPatriarch() == null) {
sheet.createDrawingPatriarch();
}

@ -161,7 +161,7 @@ carcheck:
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/carcheck/uploadPathLinux配置 /home/carcheck/uploadPath
profile: D:/carcheck/uploadPath
profile: C:/Users/RENCHAO/carcheck/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证

@ -70,6 +70,11 @@
where id = #{id}
</select>
<select id="selectByOrderIdAndCarVin" resultMap="TblCarOrderFormalDetailInfoResult">
<include refid="selectTblCarOrderFormalDetailInfoVo"/>
where order_id = #{orderId} and car_vin = #{carVin}
</select>
<!--新增委托单明细 -->
<insert id="insertTblCarOrderFormalDetailInfo" parameterType="TblCarOrderFormalDetailInfo">
insert into tbl_car_order_formal_detail_info
@ -157,4 +162,7 @@
<delete id="deleteByOrderId">
delete from tbl_car_order_formal_detail_info where order_id = #{orderId}
</delete>
<delete id="deleteById">
delete from tbl_car_order_formal_detail_info where id = #{id}
</delete>
</mapper>

@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jiuyv.business.mapper.TblCarPreRecordDetailHisInfoMapper">
<resultMap id="BaseResultMap" type="com.jiuyv.business.domain.TblCarPreRecordDetailHisInfo">
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="version" column="version" jdbcType="INTEGER"/>
<result property="orgId" column="org_id" jdbcType="VARCHAR"/>
<result property="preOrderId" column="pre_order_id" jdbcType="VARCHAR"/>
<result property="companyId" column="company_id" jdbcType="VARCHAR"/>
<result property="carVin" column="car_vin" jdbcType="VARCHAR"/>
<result property="shipName" column="ship_name" jdbcType="VARCHAR"/>
<result property="waybillNumber" column="waybill_number" jdbcType="VARCHAR"/>
<result property="departPort" column="depart_port" jdbcType="VARCHAR"/>
<result property="carNumber" column="car_number" jdbcType="INTEGER"/>
<result property="carModel" column="car_model" jdbcType="VARCHAR"/>
<result property="destinationPort" column="destination_port" jdbcType="VARCHAR"/>
<result property="destinationCountry" column="destination_country" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="CHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
<result property="rsv1" column="rsv1" jdbcType="VARCHAR"/>
<result property="rsv2" column="rsv2" jdbcType="VARCHAR"/>
<result property="rsv3" column="rsv3" jdbcType="VARCHAR"/>
<result property="remarks" column="remarks" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,version,org_id,
pre_order_id,company_id,car_vin,
ship_name,waybill_number,depart_port,
car_number,car_model,destination_port,
destination_country,status,create_time,
create_user_id,update_time,update_user_id,
rsv1,rsv2,rsv3,
remarks
</sql>
<insert id="insert">
insert into tbl_car_pre_record_detail_his_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="version != null">version,</if>
<if test="orgId != null">org_id,</if>
<if test="preOrderId != null">pre_order_id,</if>
<if test="companyId != null">company_id,</if>
<if test="carVin != null">car_vin,</if>
<if test="shipName != null">ship_name,</if>
<if test="waybillNumber != null">waybill_number,</if>
<if test="departPort != null">depart_port,</if>
<if test="carNumber != null">car_number,</if>
<if test="carModel != null">car_model,</if>
<if test="destinationPort != null">destination_port,</if>
<if test="destinationCountry != null">destination_country,</if>
<if test="status != null">status,</if>
<if test="createTime != null">create_time,</if>
<if test="createUserId != null">create_user_id,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateUserId != null">update_user_id,</if>
<if test="rsv1 != null">rsv1,</if>
<if test="rsv2 != null">rsv2,</if>
<if test="rsv3 != null">rsv3,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=VARCHAR},</if>
<if test="version != null">#{version,jdbcType=INTEGER},</if>
<if test="orgId != null">#{orgId,jdbcType=VARCHAR},</if>
<if test="preOrderId != null">#{preOrderId,jdbcType=VARCHAR},</if>
<if test="companyId != null">#{companyId,jdbcType=VARCHAR},</if>
<if test="carVin != null">#{carVin,jdbcType=VARCHAR},</if>
<if test="shipName != null">#{shipName,jdbcType=VARCHAR},</if>
<if test="waybillNumber != null">#{waybillNumber,jdbcType=VARCHAR},</if>
<if test="departPort != null">#{departPort,jdbcType=VARCHAR},</if>
<if test="carNumber != null">#{carNumber,jdbcType=INTEGER},</if>
<if test="carModel != null">#{carModel,jdbcType=VARCHAR},</if>
<if test="destinationPort != null">#{destinationPort,jdbcType=VARCHAR},</if>
<if test="destinationCountry != null">#{destinationCountry,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=CHAR},</if>
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="createUserId != null">#{createUserId,jdbcType=VARCHAR},</if>
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
<if test="updateUserId != null">#{updateUserId,jdbcType=VARCHAR},</if>
<if test="rsv1 != null">#{rsv1,jdbcType=VARCHAR},</if>
<if test="rsv2 != null">#{rsv2,jdbcType=VARCHAR},</if>
<if test="rsv3 != null">#{rsv3,jdbcType=VARCHAR},</if>
<if test="remarks != null">#{remarks,jdbcType=VARCHAR},</if>
</trim>
</insert>
</mapper>

@ -73,9 +73,9 @@
</select>
<!-- 根据预录单号查询明细信息 -->
<select id="selectTblCarPreRecordDetailInfoById" parameterType="String" resultMap="TblCarPreRecordDetailInfoResult">
<select id="selectTblCarPreRecordDetailInfoByPreOrderId" parameterType="String" resultMap="TblCarPreRecordDetailInfoResult">
<include refid="selectTblCarPreRecordDetailInfoVo"/>
where id = pre_order_id = #{preOrderId}
where pre_order_id = #{preOrderId}
</select>
<!-- 新增预录单明细信息 -->

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jiuyv.business.mapper.TblCarPreRecordHisInfoMapper">
<resultMap id="BaseResultMap" type="com.jiuyv.business.domain.TblCarPreRecordHisInfo">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="version" column="version" jdbcType="INTEGER"/>
<result property="orgId" column="org_id" jdbcType="VARCHAR"/>
<result property="preOrderId" column="pre_order_id" jdbcType="VARCHAR"/>
<result property="companyId" column="company_id" jdbcType="VARCHAR"/>
<result property="shipName" column="ship_name" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="CHAR"/>
<result property="fileId" column="file_id" jdbcType="VARCHAR"/>
<result property="fileName" column="file_name" jdbcType="VARCHAR"/>
<result property="carCount" column="car_count" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
<result property="rsv1" column="rsv1" jdbcType="VARCHAR"/>
<result property="rsv2" column="rsv2" jdbcType="VARCHAR"/>
<result property="rsv3" column="rsv3" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,version,org_id,
pre_order_id,company_id,ship_name,
status,file_id,file_name,
car_count,create_time,create_user_id,
update_time,update_user_id,rsv1,
rsv2,rsv3
</sql>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jiuyv.business.domain.TblCarPreRecordHisInfo" useGeneratedKeys="true">
insert into tbl_car_pre_record_his_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="version != null">version,</if>
<if test="orgId != null">org_id,</if>
<if test="preOrderId != null">pre_order_id,</if>
<if test="companyId != null">company_id,</if>
<if test="shipName != null">ship_name,</if>
<if test="status != null">status,</if>
<if test="fileId != null">file_id,</if>
<if test="fileName != null">file_name,</if>
<if test="carCount != null">car_count,</if>
<if test="createTime != null">create_time,</if>
<if test="createUserId != null">create_user_id,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateUserId != null">update_user_id,</if>
<if test="rsv1 != null">rsv1,</if>
<if test="rsv2 != null">rsv2,</if>
<if test="rsv3 != null">rsv3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="version != null">#{version},</if>
<if test="orgId != null">#{orgId},</if>
<if test="preOrderId != null">#{preOrderId},</if>
<if test="companyId != null">#{companyId},</if>
<if test="shipName != null">#{shipName},</if>
<if test="status != null">#{status},</if>
<if test="fileId != null">#{fileId},</if>
<if test="fileName != null">#{fileName},</if>
<if test="carCount != null">#{carCount},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createUserId != null">#{createUserId},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateUserId != null">#{updateUserId},</if>
<if test="rsv1 != null">#{rsv1},</if>
<if test="rsv2 != null">#{rsv2},</if>
<if test="rsv3 != null">#{rsv3},</if>
</trim>
</insert>
</mapper>

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
.el-upload{width:100%}.el-upload .el-upload-dragger{width:100%;height:140px}.el-descriptions-item__label:not(.is-bordered-label){text-align:right;width:120px;display:inline-block}.el-pager li:not(.disabled).active{background-color:#1890ff;color:#fff}.el-pagination .btn-next,.el-pagination .btn-prev,.el-pagination .el-pager li{margin:0 5px;background-color:#f4f4f5;color:#606266;min-width:30px;border-radius:2px}

@ -1 +0,0 @@
.el-descriptions-item__label:not(.is-bordered-label){text-align:right;width:120px;display:inline-block}.el-pager li:not(.disabled).active{background-color:#1890ff;color:#fff}.el-pagination .btn-next,.el-pagination .btn-prev,.el-pagination .el-pager li{margin:0 5px;background-color:#f4f4f5;color:#606266;min-width:30px;border-radius:2px}

@ -1 +1 @@
.el-descriptions-item__label:not(.is-bordered-label){text-align:right;width:110px;display:inline-block}div.jccd[data-v-02d44f92]{line-height:36px;width:90%;margin:0 auto;border:1px solid #d9cdcd;padding:20px;border-radius:5px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.3);box-shadow:0 1px 3px rgba(0,0,0,.3);-webkit-box-sizing:border-box;box-sizing:border-box;margin-bottom:20px}.imglist[data-v-02d44f92]{overflow:hidden;padding:0;margin:0}.imglist li[data-v-02d44f92]{float:left;margin:5px;width:100px;height:100px;overflow:hidden}.imglist li img[data-v-02d44f92]{width:100%;display:block}
.el-descriptions-item__label:not(.is-bordered-label){text-align:right;width:110px;display:inline-block}div.jccd[data-v-0cb80798]{line-height:36px;width:90%;margin:0 auto;border:1px solid #d9cdcd;padding:20px;border-radius:5px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.3);box-shadow:0 1px 3px rgba(0,0,0,.3);-webkit-box-sizing:border-box;box-sizing:border-box;margin-bottom:20px}.imglist[data-v-0cb80798]{overflow:hidden;padding:0;margin:0}.imglist li[data-v-0cb80798]{float:left;margin:5px;width:100px;height:100px;overflow:hidden}.imglist li img[data-v-0cb80798]{width:100%;display:block}

@ -49,4 +49,25 @@ export function updateOrderFormal(data) {
method: 'put',
data: data
})
}
// 强制完成
export function forceComplete(data) {
return request({
url: '/business/orderFormal/forceComplete',
method: 'put',
data: data
})
}
// 批量导入
export function importCar(data) {
return request({
url: '/business/orderFormal/importCar',
method: 'post',
data: data,
headers: {
'Content-Type': 'multipart/form-data'
}
})
}

@ -2,7 +2,7 @@
* @Author: 1036896656@qq.com 1036896656@qq.com
* @Date: 2023-07-18 13:21:34
* @LastEditors: 1036896656@qq.com 1036896656@qq.com
* @LastEditTime: 2023-08-01 16:04:01
* @LastEditTime: 2024-01-22 17:34:40
* @FilePath: \carcheck\src\views\business\orderFormal\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@ -100,14 +100,16 @@
}}</el-descriptions-item>
</el-descriptions>
<h2 style="font-size: 16px;font-weight: 700;">车辆信息</h2>
<el-row>
<el-col :span="12">
<el-form-item label="车架号(VIN码)" prop="carVin">
<el-input v-model="form.carVin" placeholder="请输入车架号(VIN码)" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="单辆车录入" name="first">
<h2 style="font-size: 16px;font-weight: 700;">车辆信息</h2>
<el-row>
<el-col :span="12">
<el-form-item label="车架号(VIN码)" prop="carVin">
<el-input v-model="form.carVin" placeholder="请输入车架号(VIN码)" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="底盘检查场地:" prop="chassisInspectSite">
<el-input v-model="form.chassisInspectSite" placeholder="请输入底盘检查场地" />
</el-form-item>
@ -117,21 +119,43 @@
<el-input v-model="form.carBodyInspectSite" placeholder="请输入车身检查场地" />
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="车型:" prop="carModel">
<el-input v-model="form.carModel" placeholder="请输入车型" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-col :span="12">
<el-form-item label="车型:" prop="carModel">
<el-input v-model="form.carModel" placeholder="请输入车型" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="数量:" prop="carNumber">
<el-input v-model="form.carNumber" placeholder="请输入数量" />
</el-form-item>
</el-col> -->
</el-row>
</el-row>
</el-tab-pane>
<el-tab-pane label="批量导入" name="second">
<el-upload ref="upload" :limit="1" :file-list="fileList" accept=".xlsx, .xls" :headers="upload.headers"
:disabled="upload.isUploading" :data="upload.upData" :on-progress="handleFileUploadProgress"
:auto-upload="false" action="" :before-upload="beforeUpload" :on-change="handleChange"
:on-success="handleFileSuccess" :http-request="uploadSectionFile" :on-remove="removeFile" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xlsxlsx格式文件</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
@click="importTemplate">下载模板
</el-link>
</div>
</el-upload>
</el-tab-pane>
</el-tabs>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button v-if="activeName != 'second'" type="primary" @click="submitForm"> </el-button>
<el-button v-if="activeName == 'second'" type="primary" :loading="loadingOptions.loading"
:disabled="loadingOptions.isDisabled" @click="submitFileForm">{{
loadingOptions.loadingText
}}
</el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
@ -195,7 +219,8 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button v-if="!existFlag" type="primary" @click="handleDeletes(form)"> </el-button>
<el-button v-if="!existFlag" type="primary" @click="handleDeletes(form, '0')"></el-button>
<el-button v-if="existFlag" type="primary" @click="handleDeletes(form, '1')"></el-button>
<el-button @click="opens = false"> </el-button>
</div>
</el-dialog>
@ -206,18 +231,20 @@
import {
addorderFormalDetail,
checkCarStatus,
forceComplete,
getOrderFormal,
importCar,
listOrderFormal,
updateOrderFormal
} from "@/api/business/orderFormal";
import { listWithNoPermission } from "@/api/business/company";
import { treeselect } from "@/api/system/dept";
import {listWithNoPermission} from "@/api/business/company";
import {treeselect} from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "OrderFormal",
components: { Treeselect },
components: {Treeselect},
dicts: ['orderformal_status', 'car_status', 'inspect_status'],
data() {
return {
@ -261,6 +288,31 @@ export default {
deptOptions: [],
//
form: {},
activeName: 'first',
//
loadingOptions: {
loading: false,
loadingText: "确 定",
isDisabled: false,
},
//
upload: {
//
open: false,
//
title: "",
//
isUploading: false,
//
updateSupport: 0,
upData: {
companyId: '',
},
},
fileList: [],
isClientCertFile: true,
imgFile: [],
page: 0, //
size: 10, //
totals: 0, //
@ -358,7 +410,22 @@ export default {
this.form = response.data;
this.open = true;
this.title = "添加车辆";
this.activeName = 'first'
});
},
handleClick(tab, event) {
console.log(tab, event);
if (tab.name == 'first') {
this.form.carVin = ''
this.form.carModel = ''
} else {
if (typeof this.imgFile.file != "undefined" && this.imgFile.file.length > 0) {
this.$refs.upload.clearFiles();
this.isClientCertFile = true;
}
}
},
handleDetail(row) {
@ -404,6 +471,85 @@ export default {
}
});
},
/** 下载模板操作 */
importTemplate() {
this.download('/business/preRecord/importTemplate', {}, `preRecord_template_${new Date().getTime()}.xlsx`)
},
//
handleChange(file, fileList, name) {
this.imgFile["file"] = fileList;
if (typeof this.imgFile.file != "undefined" && this.imgFile.file.length > 0) {
this.isClientCertFile = false;
} else {
this.isClientCertFile = true;
}
},
//
beforeUpload(file) {
debugger
const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1);
var whiteList = ['xls', 'xlsx']
if (whiteList.indexOf(fileSuffix) === -1) {
this.$modal.msgWarning("上传文件只能是" + whiteList + "格式");
return false;
}
},
//
uploadSectionFile(param) {
var fileObj = param.file;
var formdata = new FormData();
formdata.append('file', fileObj);
formdata.append('id', this.form.id);
this.formdata = formdata;
this.loadingOptions.loading = true;
this.loadingOptions.loadingText = "上传中...";
this.loadingOptions.isDisabled = true;
importCar(this.formdata).then(res => {
this.loadingOptions.loading = false;
this.loadingOptions.loadingText = "确 定";
this.loadingOptions.isDisabled = false;
param.onSuccess(res)
}).catch(res => {
this.loadingOptions.loading = false;
this.loadingOptions.loadingText = "确 定";
this.loadingOptions.isDisabled = false;
param.onError(res)
})
},
//
removeFile(file, fileList) {
this.$refs.upload.clearFiles();
this.isClientCertFile = true;
},
//
submitFileForm() {
if (this.isClientCertFile) {
this.$modal.msgWarning("请选择要上传的文件");
return false;
}
this.$refs.upload.submit();
},
//
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
//
handleFileSuccess(response, file, fileList) {
debugger
this.isClientCertFile = true;
this.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
/** 完成按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
@ -423,17 +569,47 @@ export default {
},
handleDeletes(row) {
updateOrderFormal({ id: row.id }).then(response => {
this.opens = false
this.$modal.msgSuccess("成功");
this.getList();
});
handleDeletes(row, type) {
if (type == '0') {
// updateOrderFormal({ id: row.id }).then(response => {
// this.opens = false
// this.$modal.msgSuccess("");
// this.getList();
// });
this.$modal.confirm('确认完成委托单号为"' + row.orderId + '"的委托单吗?').then(function () {
return updateOrderFormal({id: row.id});
}).then(() => {
this.opens = false
this.$modal.msgSuccess("完成");
this.getList();
}).catch(() => {
});
} else {
this.$modal.confirm('确认强制完成委托单号为"' + row.orderId + '"的委托单吗?').then(function () {
return forceComplete({id: row.id});
}).then(() => {
this.opens = false
this.$modal.msgSuccess("强制完成");
this.getList();
}).catch(() => {
});
}
}
}
};
</script>
<style lang="scss">
.el-upload {
width: 100%;
.el-upload-dragger {
width: 100%;
height: 140px;
}
}
.el-descriptions-item__label:not(.is-bordered-label) {
text-align: right;
width: 120px;

@ -60,8 +60,8 @@
<el-button v-if="scope.row.status == '00'" v-hasPermi="['business:preRecord:effect']"
icon="el-icon-circle-check" size="mini" type="text" @click="handleUpdate(scope.row)">生效
</el-button>
<el-button v-if="scope.row.status == '00'" v-hasPermi="['business:preRecord:remove']" icon="el-icon-delete"
size="mini" type="text" @click="handleDelete(scope.row)">删除
<el-button v-hasPermi="['business:preRecord:remove']" icon="el-icon-delete" size="mini" type="text"
@click="handleDelete(scope.row)">删除
</el-button>
</template>
</el-table-column>

@ -1,3 +1,11 @@
<!--
* @Author: 1036896656@qq.com 1036896656@qq.com
* @Date: 2023-09-07 10:15:54
* @LastEditors: 1036896656@qq.com 1036896656@qq.com
* @LastEditTime: 2024-01-18 13:37:19
* @FilePath: \carcheck-ui\src\views\outer\company\inspect\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="100px" size="small">

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>agile-data</artifactId>
<groupId>com.jiuyv.sptcc.agile</groupId>
<version>0.2.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>agile-data-api</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<!-- 版本不更新的情况 -->
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>com.jiuyv.sptcc.agile</groupId>
<artifactId>agile-common</artifactId>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

@ -0,0 +1,42 @@
package com.jiuyv.sptcc.agile.dataservice.api;
import com.jiuyv.sptcc.agile.dataservice.dto.request.org.OrgAuthReq;
import com.jiuyv.sptcc.agile.dataservice.dto.request.org.OrgAuthRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.response.org.OrgAuthResp;
import com.jiuyv.sptcc.agile.dataservice.dto.response.org.OrgConfigResponse;
import com.jiuyv.sptcc.agile.dataservice.dto.response.org.OrgKeyResponse;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* @ClassName : OrgAuthApi
* @Description :
* @Author : sky
* @Date: 2023-07-13 11:45
*/
public interface OrgAuthApi {
String PREFIX_PATH = "/public/agile-data/auth";
@PostMapping(PREFIX_PATH + "/info")
R<OrgAuthResp> getOrgAuth(OrgAuthReq req);
/**
*
* @param request
*/
@PostMapping(PREFIX_PATH + "/auth")
R<OrgKeyResponse> check(OrgAuthRequest request);
/**
*
* @param orgCode
* @return
*/
@GetMapping(PREFIX_PATH+"/getKey")
R<OrgKeyResponse> getKey(@RequestParam("orgCode") String orgCode);
}

@ -0,0 +1,39 @@
package com.jiuyv.sptcc.agile.dataservice.api.batch;
import com.jiuyv.sptcc.agile.dataservice.dto.request.batch.DateVo;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
public interface BatchApi {
String PREFIX_PATH = "/public/agile-data";
/**
*
*
* @param date
* @return
*/
@PostMapping(PREFIX_PATH + "/orgInfo/expire")
R<Boolean> expire(@RequestParam(value = "date",required = false) String date);
/**
*
*
* @param date
* @return
*/
@PostMapping(PREFIX_PATH + "/orgInfo/down")
R<Boolean> down(@RequestParam(value = "date",required = false) String date);
/**
* pos
* @param date
* @return
*/
@PostMapping(PREFIX_PATH + "/pos/posRate")
R<Boolean> posCheck(DateVo dateVo);
}

@ -0,0 +1,28 @@
package com.jiuyv.sptcc.agile.dataservice.api.console;
import com.jiuyv.sptcc.agile.dataservice.dto.request.api.ApiLogRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.response.api.ApiLogResponse;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import com.jiuyv.sptccc.agile.common.core.page.PageResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* @ClassName : ApiLogApi
* @Description :
* @Author : sky
* @Date: 2023-09-22 10:25
*/
public interface ApiLogApi {
String PREFIX_PATH = "/public/agile-data/apilog";
@PostMapping(PREFIX_PATH + "/page")
R<PageResult<ApiLogResponse>> list(ApiLogRequest request);
@GetMapping(PREFIX_PATH + "/detail")
R<ApiLogResponse> detail(@RequestParam("id") Long id);
}

@ -0,0 +1,145 @@
package com.jiuyv.sptcc.agile.dataservice.api.console;
import com.jiuyv.sptcc.agile.dataservice.dto.request.api.*;
import com.jiuyv.sptcc.agile.dataservice.dto.response.api.ApiResponse;
import com.jiuyv.sptcc.agile.dataservice.dto.response.TreeSelect;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import com.jiuyv.sptccc.agile.common.core.page.PageResult;
import feign.Response;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* API
*
* @author yulei
*/
public interface DataApiFeign {
String PREFIX_PATH = "/public/agile-data/agileApi";
@GetMapping(PREFIX_PATH + "/getPrefixPath")
R<String> getApiPrefixPath();
/**
*
*
* @param id
* @return
*/
@PostMapping(PREFIX_PATH + "/getDate")
R<ApiResponse> getDataApiById(@RequestParam("id") Long id);
/**
* API
*
* @param sourceId
* @return
*/
@GetMapping(PREFIX_PATH + "/sourceList")
R<List<ApiResponse>> getDataApiList(@RequestParam("sourceId") Long sourceId);
/**
*
*
* @param apiQuery
* @return
*/
@PostMapping(PREFIX_PATH + "/page")
R<PageResult<ApiResponse>> getDataApiPage(ApiPageRequest apiQuery);
/**
* API
*
* @param dataApi
* @return
*/
@PostMapping(PREFIX_PATH + "/add")
R<Object> saveDataApi(ApiAddRequest dataApi);
/**
* API
*
* @param dataApi
* @return
*/
@PostMapping(PREFIX_PATH + "/update")
R<Object> updateDataApi(ApiUpdateRequest dataApi);
/**
* API
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/delete")
R<Object> deleteDataApiById(@RequestBody @Validated ApiDelRequest request);
/**
* API
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/copy")
R<Object> copyDataApi(ApiCopyRequest request);
/**
* API
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/register")
R<Object> registerDataApi(ApiStatusRequest request);
/**
* API
*
* @param dto
* @return
*/
@PostMapping(PREFIX_PATH + "/release")
R<Object> releaseDataApi(ApiStatusRequest dto);
/**
* API
*
* @param dto
* @return
*/
@PostMapping(PREFIX_PATH + "/cancel")
R<Object> cancelDataApi(ApiStatusRequest dto);
/**
* API
*
* @param dto
* @return
*/
@PostMapping(PREFIX_PATH + "/down")
R<Object> downDataApi(ApiStatusRequest dto);
/**
* api
*
* @return
*/
@PostMapping(PREFIX_PATH + "/tree")
R<List<TreeSelect>> apiTree();
/**
*
*
* @param id
* @return
*/
@GetMapping(PREFIX_PATH + "/word/down")
Response wordDataApi(@RequestParam("id") Long id) throws Exception;
}

@ -0,0 +1,75 @@
package com.jiuyv.sptcc.agile.dataservice.api.console;
import com.jiuyv.sptcc.agile.dataservice.dto.request.org.OrgConfigAddRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.request.org.OrgConfigEditRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.request.org.OrgConfigQueryRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.response.org.OrgConfigResponse;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import com.jiuyv.sptccc.agile.common.core.page.PageResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
*
*
* @ClassName : OrgConfigApi
* @Description :
* @Author : sky
* @Date: 2023-09-07 15:44
*/
public interface OrgCfgConsoleApi {
String PREFIX_PATH = "/public/agile-data/orgConfig";
/**
*
*
* @param query
* @return
*/
@PostMapping(PREFIX_PATH + "/list")
R<PageResult<OrgConfigResponse>> list(OrgConfigQueryRequest query);
/**
*
*
* @param configId
* @return
*/
@GetMapping(PREFIX_PATH + "/detail")
R<OrgConfigResponse> queryDetail(@RequestParam("configId") Long configId);
/**
*
*
* @param dto
* @return
*/
@PostMapping(PREFIX_PATH + "/add")
R<Object> add(OrgConfigAddRequest dto);
/**
*
*
* @param dto
* @return
*/
@PostMapping(PREFIX_PATH + "/edit")
R<Object> edit(OrgConfigEditRequest dto);
/**
*
*
* @param configId
* @return
*/
@PostMapping(PREFIX_PATH + "/delete")
R<Object> delete(@RequestParam("configId") Long configId);
@GetMapping(PREFIX_PATH + "/getOrgCfg")
R<List<OrgConfigResponse>> getConfig(@RequestParam("orgCode") String orgCode);
}

@ -0,0 +1,108 @@
package com.jiuyv.sptcc.agile.dataservice.api.console;
import com.jiuyv.sptcc.agile.dataservice.dto.request.console.OrgApiAuthRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.request.org.*;
import com.jiuyv.sptcc.agile.dataservice.dto.response.console.OrgApiAuthVo;
import com.jiuyv.sptcc.agile.dataservice.dto.response.org.OrgInfoResp;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import com.jiuyv.sptccc.agile.common.core.page.PageResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
*
*
* @ClassName : OrgInfoApi
* @Description :
* @Author : sky
* @Date: 2023-09-07 15:51
*/
public interface OrgInfoConsoleApi {
String PREFIX_PATH = "/public/agile-data/orgInfo";
/**
*
*
* @param query
* @return
*/
@PostMapping(PREFIX_PATH + "/list")
R<PageResult<OrgInfoResp>> list(OrgInfoQueryReq query);
/**
*
*
* @param orgNo
* @return
*/
@GetMapping(PREFIX_PATH + "/detail")
R<OrgInfoResp> getInfo(@RequestParam("orgNo") String orgNo);
/**
*
*
* @param addReq
* @return
*/
@PostMapping(PREFIX_PATH + "/add")
R<Object> add(OrgInfoAddReq addReq);
/**
*
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/edit")
R<Object> edit(OrgInfoEditReq request);
/**
*
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/remove")
R<Object> remove(OrgDelReq request);
/**
*
*/
@PostMapping(PREFIX_PATH + "/run")
R<Object> run(OrgInfoStatusReq request);
/**
*
*/
@PostMapping(PREFIX_PATH + "/stop")
R<Object> stop(OrgInfoStatusReq request);
/**
*
*
* @return
*/
@GetMapping(PREFIX_PATH + "/key")
R<String> getGenerateKeyHex();
/**
*
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/auth")
R<Object> orgApiAuth(OrgApiAuthRequest request);
/**
*
*
* @param orgNo
* @return
*/
@GetMapping(PREFIX_PATH + "/auth/list")
R<OrgApiAuthVo> orgApiAuthInfo(@RequestParam("orgNo") String orgNo);
}

@ -0,0 +1,33 @@
package com.jiuyv.sptcc.agile.dataservice.api.console;
import com.jiuyv.sptcc.agile.dataservice.dto.request.api.ApiUserRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.request.org.OrgStatisticsQueryReq;
import com.jiuyv.sptcc.agile.dataservice.dto.response.api.DataApiStatisticsResponse;
import com.jiuyv.sptcc.agile.dataservice.dto.response.console.OrgStatisticsVo;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import com.jiuyv.sptccc.agile.common.core.page.PageResult;
import org.springframework.web.bind.annotation.PostMapping;
/**
*
*
* @ClassName : OrgStcsConsoleApi
* @Author : sky
* @Date: 2023-09-07 16:02
*/
public interface OrgStcsConsoleApi {
String PREFIX_PATH = "/public/agile-data/orgStcs";
@PostMapping(PREFIX_PATH + "/list")
R<PageResult<OrgStatisticsVo>> queryByPage(OrgStatisticsQueryReq request);
/**
*
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/userApiStatistics")
R<PageResult<DataApiStatisticsResponse>> getUserApiStatistics(ApiUserRequest request);
}

@ -0,0 +1,23 @@
package com.jiuyv.sptcc.agile.dataservice.api.portal;
import com.jiuyv.sptcc.agile.dataservice.dto.request.api.ApiUserRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.response.api.DataApiResponse;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import com.jiuyv.sptccc.agile.common.core.page.PageResult;
import org.springframework.web.bind.annotation.PostMapping;
public interface DataApiFeignApi {
String PREFIX_PATH = "/public/agile-data/agileApi";
/**
*
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/userApiList")
R<PageResult<DataApiResponse>> getUserApiList(ApiUserRequest request);
}

@ -0,0 +1,23 @@
package com.jiuyv.sptcc.agile.dataservice.api.portal;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
/**
* @ClassName : SdkDownload
* @Description :
* @Author : sky
* @Date: 2023-09-21 10:42
*/
public interface SdkDownload {
String PREFIX_PATH = "/public/agile-data/port";
/**
* sdk
*
* @return
*/
@GetMapping(PREFIX_PATH + "/download/sdk")
ResponseEntity<byte[]> download();
}

@ -0,0 +1,25 @@
package com.jiuyv.sptcc.agile.dataservice.api.product;
import com.jiuyv.sptcc.agile.dataservice.dto.request.product.DownLoadRequest;
import feign.Response;
import org.springframework.web.bind.annotation.PostMapping;
import java.io.IOException;
/**
* sftp
*
* @ClassName : DownloadApi
* @Description :
* @Author : sky
* @Date: 2023-09-13 13:21
*/
public interface DownloadApi {
String PREFIX_PATH = "/public/agile-data/product";
@PostMapping(PREFIX_PATH + "/download")
Response download(DownLoadRequest request) throws IOException;
}

@ -0,0 +1,68 @@
package com.jiuyv.sptcc.agile.dataservice.api.product;
import com.jiuyv.sptcc.agile.dataservice.dto.request.product.LineInfoReq;
import com.jiuyv.sptcc.agile.dataservice.dto.request.product.LineStationInfoReq;
import com.jiuyv.sptcc.agile.dataservice.dto.response.product.LineInfoRes;
import com.jiuyv.sptcc.agile.dataservice.dto.response.product.LineStationInfoRes;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import com.jiuyv.sptccc.agile.common.core.page.PageResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* 线
*
* @ClassName : LineInfoApi
* @Description :
* @Author : sky
* @Date: 2023-09-19 18:51
*/
public interface LineInfoApi {
String PREFIX_PATH = "/public/agile-data/lineInfo";
/**
*
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/list")
R<PageResult<LineInfoRes>> list(LineInfoReq request);
/**
* 线线
*
* @param lineName
* @return
*/
@GetMapping(PREFIX_PATH + "/detail")
R<LineInfoRes> detail(@RequestParam("lineName") String lineName);
/**
*
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/stationList")
R<List<LineStationInfoRes>> stationList(LineStationInfoReq request);
/**
*
*
* @param lineName
* @return
*/
@GetMapping(PREFIX_PATH + "/stationDetail")
R<LineStationInfoRes> stationDetail(@RequestParam("lineName") String lineName);
}

@ -0,0 +1,40 @@
package com.jiuyv.sptcc.agile.dataservice.api.product;
import com.jiuyv.sptcc.agile.dataservice.dto.request.product.LineDayPageReq;
import com.jiuyv.sptcc.agile.dataservice.dto.request.product.gateway.LineDayReqRequest;
import com.jiuyv.sptcc.agile.dataservice.dto.response.product.LineDayPageRes;
import com.jiuyv.sptccc.agile.common.core.domain.R;
import com.jiuyv.sptccc.agile.common.core.page.PageResult;
import org.springframework.web.bind.annotation.PostMapping;
/**
* @ClassName : LineMetricDay
* @Description :
* @Author : sky
* @Date: 2023-09-18 15:17
*/
public interface LineMetricDayApi {
String PREFIX_PATH = "/public/agile-data/lineDay";
/**
*
*
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/list")
R<PageResult<LineDayPageRes>> list(LineDayPageReq request);
/**
* 线
* @param request
* @return
*/
@PostMapping(PREFIX_PATH + "/page")
R<PageResult<LineDayPageRes>> page(LineDayReqRequest request);
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save