diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java index c737f30..02a2869 100644 --- a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java +++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java @@ -67,6 +67,7 @@ public class BaseTyreController extends BaseController ExcelUtil util = new ExcelUtil(BaseTyre.class); util.exportExcel(response, list, "轮胎基础数据"); } + @PreAuthorize("@ss.hasPermi('basetyre:tyre:import')") @Log(title = "轮胎管理", businessType = BusinessType.IMPORT) @PostMapping("/importData") public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception @@ -184,6 +185,11 @@ public class BaseTyreController extends BaseController return baseTyreService.TyreUnInstall(carTyres); } + @PostMapping("/EditPatternTextureDepth") + public AjaxResult EditPatternTextureDepth(@RequestBody CarTyres carTyres){ + return baseTyreService.EditPatternTextureDepth(carTyres); + } + @PostMapping("/TyreMileage") public AjaxResult TyreMileage(@RequestBody CarTyres carTyres){ return baseTyreService.TyreMileage(carTyres); diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseTyreHistoricalRecords.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseTyreHistoricalRecords.java index 901acc3..617b843 100644 --- a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseTyreHistoricalRecords.java +++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/BaseTyreHistoricalRecords.java @@ -48,7 +48,17 @@ public class BaseTyreHistoricalRecords extends BaseEntity @Excel(name = "花纹深度") private BigDecimal textureDepth; - public void setId(String id) + private int carOnlineMileage; + + public int getCarOnlineMileage() { + return carOnlineMileage; + } + + public void setCarOnlineMileage(int carOnlineMileage) { + this.carOnlineMileage = carOnlineMileage; + } + + public void setId(String id) { this.id = id; } diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/vo/PatternTextureReport.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/vo/PatternTextureReport.java new file mode 100644 index 0000000..ca1b7cc --- /dev/null +++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/domain/vo/PatternTextureReport.java @@ -0,0 +1,10 @@ +package com.ruoyi.basetyre.domain.vo; + +import lombok.Data; + +@Data +public class PatternTextureReport { + private double textureDepth; + private int course; + private Data time; +} diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/mapper/BaseTyreHistoricalRecordsMapper.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/mapper/BaseTyreHistoricalRecordsMapper.java index 9b7daeb..7b83f6e 100644 --- a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/mapper/BaseTyreHistoricalRecordsMapper.java +++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/mapper/BaseTyreHistoricalRecordsMapper.java @@ -6,6 +6,7 @@ import java.util.Map; import com.ruoyi.basetyre.domain.BaseTyre; import com.ruoyi.basetyre.domain.BaseTyreGpsRecord; import com.ruoyi.basetyre.domain.BaseTyreHistoricalRecords; +import com.ruoyi.basetyre.domain.vo.PatternTextureReport; /** * 轮胎历史Mapper接口 @@ -67,4 +68,5 @@ public interface BaseTyreHistoricalRecordsMapper BaseTyreGpsRecord querydata(BaseTyreGpsRecord baseTyreHistoricalRecord); + List selectPatternTextureReport(BaseTyre baseTyre); } diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/IBaseTyreService.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/IBaseTyreService.java index 067457a..62e512b 100644 --- a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/IBaseTyreService.java +++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/IBaseTyreService.java @@ -80,4 +80,6 @@ public interface IBaseTyreService String importTyre(List baseTyreList, boolean isUpdateSupport, String operName); AjaxResult TyreMileage(CarTyres carTyres); + + AjaxResult EditPatternTextureDepth(CarTyres carTyres); } diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreHistoricalRecordsServiceImpl.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreHistoricalRecordsServiceImpl.java index 39b7d69..3d337a3 100644 --- a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreHistoricalRecordsServiceImpl.java +++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreHistoricalRecordsServiceImpl.java @@ -7,6 +7,7 @@ import com.ruoyi.basetyre.domain.BaseTyre; import com.ruoyi.basetyre.domain.CollectTyresDetail; import com.ruoyi.basetyre.domain.vo.CarTyres; //import com.ruoyi.basetyre.domain.vo.QueryParams; +import com.ruoyi.basetyre.domain.vo.PatternTextureReport; import com.ruoyi.basetyre.domain.vo.SpeedVo; import com.ruoyi.basetyre.domain.vo.TemperatureAndPressReport; import com.ruoyi.basetyre.mapper.BaseTyreHistoricalRecordsMapper; @@ -125,18 +126,38 @@ public class BaseTyreHistoricalRecordsServiceImpl implements IBaseTyreHistorical //查询轮胎的胎温胎压数据 CollectTyresDetail collectTyresDetail=new CollectTyresDetail(); collectTyresDetail.setTyreId(BT.getId()); + collectTyresDetail.setParams(baseTyre.getParams()); List collectTyresDetailList=collectTyresDetailMapper.select_press_temperature(collectTyresDetail); List temperatureAndPressReportList=new ArrayList<>(); + int ispresslower=0,istemperaturehigh=0,ispowerinvalue = 0,ispresshigh=0; for (CollectTyresDetail co:collectTyresDetailList) { TemperatureAndPressReport temperatureAndPressReport=new TemperatureAndPressReport(); temperatureAndPressReport.setPress(co.getPressvalue()); temperatureAndPressReport.setTemperature(co.getTemperaturevalue()); temperatureAndPressReport.setTime(co.getCreateTime()); temperatureAndPressReportList.add(temperatureAndPressReport); + if (co.getIspowerinvalue()==1){ + ispowerinvalue=ispowerinvalue+1; + } + if (co.getIspresslower()==1){ + ispresslower=ispresslower+1; + } + if (co.getIspresshigh()==1){ + ispresshigh=ispresshigh+1; + } + if (co.getIstemperaturehigh()==1){ + istemperaturehigh=istemperaturehigh+1; + } } + Map warnMap=new HashMap(); + warnMap.put("高压报警",ispresshigh); + warnMap.put("低压报警",ispresslower); + warnMap.put("高温报警",istemperaturehigh); + warnMap.put("电池电量报警",ispowerinvalue); //找此时间段内此轮胎所安装的车辆 List carTyresList =collectTyresDetailMapper.selectTyreOnCar(baseTyre); Map map=new HashMap(); + if (carTyresList.size()>0){ List carStrList=new ArrayList<>(); for (CarTyres ct:carTyresList) { @@ -148,7 +169,12 @@ public class BaseTyreHistoricalRecordsServiceImpl implements IBaseTyreHistorical } //查询车辆GPS数据 temperatureAndPressReportList.sort(Comparator.comparing(TemperatureAndPressReport::getTime)); + + //里程和花纹深度的变化关系 + List patternTextureReportList =baseTyreHistoricalRecordsMapper.selectPatternTextureReport(baseTyre); map.put("TPList",temperatureAndPressReportList); + map.put("WarnData",warnMap); + map.put("patternTextureList",patternTextureReportList); return success(map); } } diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreServiceImpl.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreServiceImpl.java index ff10f96..b85e482 100644 --- a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreServiceImpl.java +++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/service/impl/BaseTyreServiceImpl.java @@ -464,7 +464,6 @@ public class BaseTyreServiceImpl implements IBaseTyreService try { - return null; }catch (Exception e){ e.printStackTrace(); @@ -473,6 +472,21 @@ public class BaseTyreServiceImpl implements IBaseTyreService } + @Override + public AjaxResult EditPatternTextureDepth(CarTyres carTyres) { + if (carTyres.getType().equals(4)){ + //更新车辆最新的花纹深度 + BaseTyre baseTyre = new BaseTyre(); + baseTyre.setId(carTyres.getTyreId()); + baseTyre.setCurrentTextureDepth(carTyres.getCurrentTextureDepth()); + baseTyreMapper.updateBaseTyre(baseTyre); + //插入一条新记录 + BaseTyreHistoricalRecords baseTyreHistoricalRecords=new BaseTyreHistoricalRecords(); + + } + return null; + } + @Override public BaseTyre getTyreInfoById(String outerTireNumber) { diff --git a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseTyreHistoricalRecordsMapper.xml b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseTyreHistoricalRecordsMapper.xml index ae7ee98..0e18045 100644 --- a/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseTyreHistoricalRecordsMapper.xml +++ b/ruoyi-basetyre/src/main/resources/mapper/basetyre/BaseTyreHistoricalRecordsMapper.xml @@ -57,6 +57,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY create_time desc + insert into base_tyre_historical_records diff --git a/ruoyi-basetyre/src/main/resources/mapper/basetyre/CollectMachineGpsMapper.xml b/ruoyi-basetyre/src/main/resources/mapper/basetyre/CollectMachineGpsMapper.xml index d41bf5f..b2a7751 100644 --- a/ruoyi-basetyre/src/main/resources/mapper/basetyre/CollectMachineGpsMapper.xml +++ b/ruoyi-basetyre/src/main/resources/mapper/basetyre/CollectMachineGpsMapper.xml @@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, machine_id, car_id, car_license, emergency_alarm, speed_alarm, fatigue_driving_alarm, risk_early_alarm, gnss_module, gnss_loss_antenna, gnss_antenna_shortcircuit, main_power_lake, mainpowerloss, accclose, unpositioned, dimensional_n_or_s, longitudinal_e_or_w, d_l_isencryption, latitude, longitude, altitude, speed, course, create_time, gps_intensity, gps_satellites, gps_mileage, is_out_power, car_power, is_sensor_run from collect_machine_gps + select id, machine_id, car_id, car_license, emergency_alarm, speed_alarm, fatigue_driving_alarm, risk_early_alarm, gnss_module, gnss_loss_antenna, gnss_antenna_shortcircuit, main_power_lake, mainpowerloss, accclose, unpositioned, dimensional_n_or_s, longitudinal_e_or_w, d_l_isencryption, latitude, longitude, altitude, speed, course, createtime, gps_intensity, gps_satellites, gps_mileage, is_out_power, car_power, is_sensor_run from collect_machine_gps diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index ab8b437..e0cb11f 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -5,7 +5,7 @@ VITE_APP_TITLE = 雄鹰轮胎智慧互联云平台 VITE_APP_ENV = 'production' # 若依管理系统/生产环境 -VITE_APP_BASE_API = 'http://47.94.93.46:8080/dev-api' -# VITE_APP_BASE_API = 'http://47.94.93.46:80/dev-api' +#VITE_APP_BASE_API = 'http://10.11.41.249:8080/dev-api' +VITE_APP_BASE_API = 'http://47.94.93.46:80/dev-api' # 是否在打包时开启压缩,支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/car.svg b/ruoyi-ui/src/assets/icons/svg/car.svg new file mode 100644 index 0000000..bca3cba --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/car.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/carqueue.svg b/ruoyi-ui/src/assets/icons/svg/carqueue.svg new file mode 100644 index 0000000..0c29162 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/carqueue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/cartype.svg b/ruoyi-ui/src/assets/icons/svg/cartype.svg new file mode 100644 index 0000000..d4b6e50 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/cartype.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/device.svg b/ruoyi-ui/src/assets/icons/svg/device.svg new file mode 100644 index 0000000..3ddf904 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/device.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/enclosure.svg b/ruoyi-ui/src/assets/icons/svg/enclosure.svg new file mode 100644 index 0000000..bbdf248 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/enclosure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/fireset.svg b/ruoyi-ui/src/assets/icons/svg/fireset.svg new file mode 100644 index 0000000..242219c --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/fireset.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/install.svg b/ruoyi-ui/src/assets/icons/svg/install.svg new file mode 100644 index 0000000..8ca949a --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/install.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/life.svg b/ruoyi-ui/src/assets/icons/svg/life.svg new file mode 100644 index 0000000..09f38a8 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/life.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/locus.svg b/ruoyi-ui/src/assets/icons/svg/locus.svg new file mode 100644 index 0000000..e87859f --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/locus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/map.svg b/ruoyi-ui/src/assets/icons/svg/map.svg new file mode 100644 index 0000000..74f3ddc --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/map.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/tp.svg b/ruoyi-ui/src/assets/icons/svg/tp.svg new file mode 100644 index 0000000..bb40e08 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/tp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/tyre.svg b/ruoyi-ui/src/assets/icons/svg/tyre.svg new file mode 100644 index 0000000..50cf28a --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/tyre.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/tyreproduce.svg b/ruoyi-ui/src/assets/icons/svg/tyreproduce.svg new file mode 100644 index 0000000..6d9e5aa --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/tyreproduce.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/warring.svg b/ruoyi-ui/src/assets/icons/svg/warring.svg new file mode 100644 index 0000000..312fbdc --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/warring.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/views/dashboard/RaddarChart.vue b/ruoyi-ui/src/views/dashboard/RaddarChart.vue index e0fe5c9..539f23c 100644 --- a/ruoyi-ui/src/views/dashboard/RaddarChart.vue +++ b/ruoyi-ui/src/views/dashboard/RaddarChart.vue @@ -1,9 +1,10 @@