Yangwl
/
SZXBGJ_HT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Yangwl:194076138676bf544f05717f3ca17d04c226d274
Branches Tags
Yangwl:master
..
compare: Yangwl:e3afd05112dbeaf3407daff61e9103caa744aaa6
Branches Tags
Yangwl:master

No commits in common. '194076138676bf544f05717f3ca17d04c226d274' and 'e3afd05112dbeaf3407daff61e9103caa744aaa6' have entirely different histories.
1940761386 ... e3afd05112

9 changed files with 79 additions and 121 deletions
Show Stats

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreController.java
Unescape Escape View File

@ -420,17 +420,14 @@ public class BaseTyreController extends BaseController {
// 同车互换接口，实际就是修改基础信息表
@PostMapping("/changeTyreForOneCar")
@ResponseBody
public AjaxResult changeTyreForOneCar(Long oldTyreId, Long newTyreId, String oldLocation, String newLocation,String user) {
public AjaxResult changeTyreForOneCar(Long oldTyreId, Long newTyreId, String oldLocation, String newLocation) {
BaseTyre baseTyre1 = new BaseTyre();
baseTyre1.setTyreId(oldTyreId);
baseTyre1.setWheelPostion(newLocation);
baseTyre1.setUpdateBy(user);
int i = baseTyreService.updateBaseTyre(baseTyre1);
BaseTyre baseTyre2 = new BaseTyre();
baseTyre2.setTyreId(newTyreId);
baseTyre2.setWheelPostion(oldLocation);
baseTyre2.setUpdateBy(user);
i += baseTyreService.updateBaseTyre(baseTyre2);
return i == 2 ? success() : error();
}

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java
Unescape Escape View File

@ -201,8 +201,7 @@ public class BizMaintenanceOrderController extends BaseController
bizMaintenanceOrder.setOrderNo(orderNo);
return toAjax(bizMaintenanceOrderService.insertBizMaintenanceOrder(bizMaintenanceOrder));
}
@Autowired
private IRecordTyreMileageService recordTyreMileageService;
/**
* PDA保存执行工单的方法
* @param json
@ -233,17 +232,6 @@ public class BizMaintenanceOrderController extends BaseController
for (BizOrderTireDetail bizOrderTireDetail : bizMaintenanceOrder.getTireDetails()){
bizOrderTireDetail.setCreateTime(DateUtils.getNowDate());
bizOrderTireDetail.setOrderId(orderId);
BaseTyre baseTyre = baseTyreService.selectBaseTyreById(bizOrderTireDetail.getTireId());
recordTyreMileageService.funInsertTyreMileage(
"保养",
order.getInputMileage().longValue(),
bizOrderTireDetail.getTreadDepth().toString(),
baseTyre.getTyreEpc(),
order.getPlateNumber(), null);
// 这里如果抛出异常，整个事务会回滚
bizOrderTireDetailService.insertBizOrderTireDetail(bizOrderTireDetail);
}

1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
Unescape Escape View File

@ -335,7 +335,6 @@ public class ShiroConfig
filterChainDefinitionMap.put("/tyre/inventory/pdaOutInventory", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/car/PdaQueryCarList", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/**", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/tyre/changeTyreForOneCar", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/install/PdaInstallTyre", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/install/PdaUnInstallTyre", "anon,captchaValidate");
filterChainDefinitionMap.put("/tyre/check/PdaAddCheck", "anon,captchaValidate");

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordTyreMileageMapper.java
Unescape Escape View File

@ -3,7 +3,6 @@ package com.ruoyi.system.mapper;
import com.ruoyi.system.domain.RecordTyreMileage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -69,6 +68,4 @@ public interface RecordTyreMileageMapper
* @return
*/
public Long selectTotalMileageByTyreRfid(String tyreRfid);
RecordTyreMileage selectbyRFIDOrder(@Param("tyreRfid") String tyreRfid);
}

4
ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordTyreMileageService.java
Unescape Escape View File

@ -61,8 +61,4 @@ public interface IRecordTyreMileageService
* @return 结果
*/
public int deleteRecordTyreMileageById(Long id);
void funInsertTyreMileage(String type, Long mileage, String patternDepth, String tyreRfid, String carNo,String createBy);
}

3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java
Unescape Escape View File

@ -134,10 +134,7 @@ public class BaseTyreServiceImpl implements IBaseTyreService
{
baseTyre.setUpdateTime(DateUtils.getNowDate());
if (baseTyre.getUpdateBy()==null) {
baseTyre.setUpdateBy(getLoginName());
}
return baseTyreMapper.updateBaseTyre(baseTyre);
}

79
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreInstallServiceImpl.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.BaseTyre;
import com.ruoyi.system.domain.RecordTyreInstall;
import com.ruoyi.system.domain.RecordTyreMileage;
@ -11,7 +12,6 @@ import com.ruoyi.system.mapper.BaseTyreMapper;
import com.ruoyi.system.mapper.RecordTyreInstallMapper;
import com.ruoyi.system.mapper.RecordTyreMileageMapper;
import com.ruoyi.system.service.IRecordTyreInstallService;
import com.ruoyi.system.service.IRecordTyreMileageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -25,7 +25,8 @@ import java.util.UUID;
* @date 2025-12-20
*/
@Service
public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService
{
@Autowired
private RecordTyreInstallMapper recordTyreInstallMapper;
@Autowired
@ -33,13 +34,6 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
@Autowired
private RecordTyreMileageMapper recordTyreMileageMapper;
@Autowired
private IRecordTyreMileageService recordTyreMileageService;
public static long calculateMileageDifference(long endMileage, long startMileage) {
return Math.abs(endMileage - startMileage);
}
/**
* 查询轮胎安装记录
*
@ -47,7 +41,8 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
* @return 轮胎安装记录
*/
@Override
public RecordTyreInstall selectRecordTyreInstallById(Long id) {
public RecordTyreInstall selectRecordTyreInstallById(Long id)
{
return recordTyreInstallMapper.selectRecordTyreInstallById(id);
}
@ -59,7 +54,8 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
*/
@Override
@DataScope(deptAlias = "bt", userAlias = "u")
public List<RecordTyreInstall> selectRecordTyreInstallList(RecordTyreInstall recordTyreInstall) {
public List<RecordTyreInstall> selectRecordTyreInstallList(RecordTyreInstall recordTyreInstall)
{
return recordTyreInstallMapper.selectRecordTyreInstallList(recordTyreInstall);
}
@ -70,7 +66,8 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
* @return 结果
*/
@Override
public int insertRecordTyreInstall(RecordTyreInstall recordTyreInstall) {
public int insertRecordTyreInstall(RecordTyreInstall recordTyreInstall)
{
recordTyreInstall.setCreateTime(DateUtils.getNowDate());
return recordTyreInstallMapper.insertRecordTyreInstall(recordTyreInstall);
}
@ -82,7 +79,8 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
* @return 结果
*/
@Override
public int updateRecordTyreInstall(RecordTyreInstall recordTyreInstall) {
public int updateRecordTyreInstall(RecordTyreInstall recordTyreInstall)
{
recordTyreInstall.setUpdateTime(DateUtils.getNowDate());
return recordTyreInstallMapper.updateRecordTyreInstall(recordTyreInstall);
@ -95,7 +93,8 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
* @return 结果
*/
@Override
public int deleteRecordTyreInstallByIds(String ids) {
public int deleteRecordTyreInstallByIds(String ids)
{
return recordTyreInstallMapper.deleteRecordTyreInstallByIds(Convert.toStrArray(ids));
}
@ -105,7 +104,8 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
* @param id 轮胎安装记录ID
* @return 结果
*/
public int deleteRecordTyreInstallById(Long id) {
public int deleteRecordTyreInstallById(Long id)
{
return recordTyreInstallMapper.deleteRecordTyreInstallById(id);
}
@ -126,16 +126,26 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
baseTyre.setSelfNo(recordTyreInstall.getSelfNo());
baseTyre.setTyreNo(recordTyreInstall.getTyreNo());
int m = baseTyreMapper.updateBaseTyre(baseTyre);
if (n > 0 && m > 0) {
if (n>0&&m>0){
// 装车时插入一条里程快照记录（段里程为0，仅记录装车时刻的累计总里程）
recordTyreMileageService.funInsertTyreMileage("装胎", recordTyreInstall.getMileage(),
recordTyreInstall.getPatternDepth(),
recordTyreInstall.getTyreRfid(),
recordTyreInstall.getCarNo(), recordTyreInstall.getCreateBy());
Long totalMileage = recordTyreMileageMapper.selectTotalMileageByTyreRfid(recordTyreInstall.getTyreRfid());
if (totalMileage == null) {
totalMileage = 0L;
}
RecordTyreMileage recordTyreMileage = new RecordTyreMileage();
recordTyreMileage.setTyreRfid(recordTyreInstall.getTyreRfid());
recordTyreMileage.setStartTime(DateUtils.getNowDate());
recordTyreMileage.setMileage(totalMileage); // 装车时累计总里程不变
recordTyreMileage.setMileageOld(0L); // 装车操作本身不产生行驶里程
recordTyreMileage.setPlateNumber(recordTyreInstall.getCarNo());
recordTyreMileage.setPatternDepth(recordTyreInstall.getPatternDepth());
recordTyreMileage.setRecordType("install"); // 标记为装车记录
recordTyreMileage.setCreateTime(DateUtils.getNowDate());
recordTyreMileage.setCreateBy(recordTyreInstall.getCreateBy());
recordTyreMileageMapper.insertRecordTyreMileage(recordTyreMileage);
return AjaxResult.success("安装成功！");
}
} catch (Exception e) {
}catch (Exception e){
return AjaxResult.error(e.getMessage());
}
return AjaxResult.error("安装失败！");
@ -154,7 +164,7 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
BaseTyre baseTyre = new BaseTyre();
baseTyre.setTyreEpc(recordTyreInstall.getTyreRfid());
baseTyre = baseTyreMapper.selectBaseTyreByEpc(baseTyre);
if (baseTyre.getCarNo().isEmpty()) {
if (baseTyre.getCarNo().isEmpty()){
return AjaxResult.error("该轮胎未安装！");
}
baseTyre.setCarNo("");
@ -166,10 +176,10 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
start.setType("0");
start.setCarNo(recordTyreInstall.getCarNo());
start.setTyreRfid(recordTyreInstall.getTyreRfid());
start = recordTyreInstallMapper.selectRecordTyreInstallStart(start);
/* *//**
start=recordTyreInstallMapper.selectRecordTyreInstallStart(start);
/**
* 计算里程差插入里程记录表
*//*
*/
long between = calculateMileageDifference(recordTyreInstall.getMileage(), start.getMileage());
// 获取该轮胎的历史累计里程
@ -178,7 +188,7 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
totalMileage = 0L;
}
RecordTyreMileage recordTyreMileage = new RecordTyreMileage();
RecordTyreMileage recordTyreMileage =new RecordTyreMileage();
recordTyreMileage.setTyreRfid(recordTyreInstall.getTyreRfid());
recordTyreMileage.setStartTime(start.getCreateTime());
recordTyreMileage.setEndTime(DateUtils.getNowDate());
@ -191,18 +201,19 @@ public class RecordTyreInstallServiceImpl implements IRecordTyreInstallService {
recordTyreMileage.setRecordId(recordId);
// 车牌号按卸胎当下车辆归属写入里程快照，避免轮胎后续换车后历史里程记录无法追溯车辆。
// recordTyreMileage.setPlateNumber(recordTyreInstall.getCarNo());
recordTyreMileageMapper.insertRecordTyreMileage(recordTyreMileage);*/
if (n > 0 && m > 0) {
recordTyreMileageService.funInsertTyreMileage("卸胎", recordTyreInstall.getMileage(),
recordTyreInstall.getPatternDepth(),
recordTyreInstall.getTyreRfid(), recordTyreInstall.getCarNo(), recordTyreInstall.getCreateBy());
recordTyreMileageMapper.insertRecordTyreMileage(recordTyreMileage);
if (n>0&&m>0){
return AjaxResult.success("卸胎成功！");
}
} catch (Exception e) {
}catch (Exception e){
e.printStackTrace();
return AjaxResult.error(e.getMessage());
}
return AjaxResult.error("卸胎失败！");
}
public static long calculateMileageDifference(long endMileage, long startMileage) {
return Math.abs(endMileage - startMileage);
}
}

50
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordTyreMileageServiceImpl.java
Unescape Escape View File

@ -18,7 +18,8 @@ import java.util.List;
* @date 2025-12-21
*/
@Service
public class RecordTyreMileageServiceImpl implements IRecordTyreMileageService {
public class RecordTyreMileageServiceImpl implements IRecordTyreMileageService
{
@Autowired
private RecordTyreMileageMapper recordTyreMileageMapper;
@ -29,7 +30,8 @@ public class RecordTyreMileageServiceImpl implements IRecordTyreMileageService {
* @return 轮胎里程记录
*/
@Override
public RecordTyreMileage selectRecordTyreMileageById(Long id) {
public RecordTyreMileage selectRecordTyreMileageById(Long id)
{
return recordTyreMileageMapper.selectRecordTyreMileageById(id);
}
@ -41,7 +43,8 @@ public class RecordTyreMileageServiceImpl implements IRecordTyreMileageService {
*/
@Override
@DataScope(deptAlias = "bt", userAlias = "u")
public List<RecordTyreMileage> selectRecordTyreMileageList(RecordTyreMileage recordTyreMileage) {
public List<RecordTyreMileage> selectRecordTyreMileageList(RecordTyreMileage recordTyreMileage)
{
return recordTyreMileageMapper.selectRecordTyreMileageList(recordTyreMileage);
}
@ -52,7 +55,8 @@ public class RecordTyreMileageServiceImpl implements IRecordTyreMileageService {
* @return 结果
*/
@Override
public int insertRecordTyreMileage(RecordTyreMileage recordTyreMileage) {
public int insertRecordTyreMileage(RecordTyreMileage recordTyreMileage)
{
recordTyreMileage.setCreateTime(DateUtils.getNowDate());
return recordTyreMileageMapper.insertRecordTyreMileage(recordTyreMileage);
}
@ -64,7 +68,8 @@ public class RecordTyreMileageServiceImpl implements IRecordTyreMileageService {
* @return 结果
*/
@Override
public int updateRecordTyreMileage(RecordTyreMileage recordTyreMileage) {
public int updateRecordTyreMileage(RecordTyreMileage recordTyreMileage)
{
recordTyreMileage.setUpdateTime(DateUtils.getNowDate());
return recordTyreMileageMapper.updateRecordTyreMileage(recordTyreMileage);
@ -77,7 +82,8 @@ public class RecordTyreMileageServiceImpl implements IRecordTyreMileageService {
* @return 结果
*/
@Override
public int deleteRecordTyreMileageByIds(String ids) {
public int deleteRecordTyreMileageByIds(String ids)
{
return recordTyreMileageMapper.deleteRecordTyreMileageByIds(Convert.toStrArray(ids));
}
@ -87,36 +93,8 @@ public class RecordTyreMileageServiceImpl implements IRecordTyreMileageService {
* @param id 轮胎里程记录ID
* @return 结果
*/
public int deleteRecordTyreMileageById(Long id) {
public int deleteRecordTyreMileageById(Long id)
{
return recordTyreMileageMapper.deleteRecordTyreMileageById(id);
}
@Override
public void funInsertTyreMileage(String type, Long mileage, String patternDepth, String tyreRfid, String carNo, String createBy) {
RecordTyreMileage recordTyreMileage = new RecordTyreMileage();
recordTyreMileage.setTyreRfid(tyreRfid);
recordTyreMileage.setStartTime(DateUtils.getNowDate());
recordTyreMileage.setPlateNumber(carNo);//车牌
recordTyreMileage.setPatternDepth(patternDepth);
recordTyreMileage.setRecordType(type);
recordTyreMileage.setCreateTime(DateUtils.getNowDate());
recordTyreMileage.setCreateBy(createBy);
recordTyreMileage.setMileageOld(mileage);
if (type.equals("装胎")) {
recordTyreMileage.setMileage(0L);
} else {
// 查询上一条记录的里程值
RecordTyreMileage recordTyreMileageOld = recordTyreMileageMapper.selectbyRFIDOrder(tyreRfid);
Long mileageOld = 0L;
if (recordTyreMileageOld != null) {
mileageOld = recordTyreMileageOld.getMileageOld();
}
recordTyreMileage.setMileage(mileage-mileageOld);
}
recordTyreMileageMapper.insertRecordTyreMileage(recordTyreMileage);
}
}

7
ruoyi-system/src/main/resources/mapper/tyre/RecordTyreMileageMapper.xml
Unescape Escape View File

@ -125,10 +125,5 @@
<select id="selectTotalMileageByTyreRfid" parameterType="String" resultType="Long">
select COALESCE(SUM(mileage_old), 0) from record_tyre_mileage where tyre_rfid = #{tyreRfid}
</select>
<select id="selectbyRFIDOrder" resultMap="RecordTyreMileageResult">
select tyre_rfid, record_type, mileage_old
from record_tyre_mileage
where tyre_rfid=#{tyreRfid} and record_type !='卸胎'
order by create_time desc limit 1
</select>
</mapper>

Write Preview
Loading…
Cancel
Save