diff --git a/eride-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/eride-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java index ef9d64d..79e46cb 100644 --- a/eride-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java +++ b/eride-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java @@ -19,6 +19,7 @@ import com.ruoyi.system.domain.EtArticle; import com.ruoyi.system.domain.EFunction; import com.ruoyi.system.domain.device.EDeviceVO; import com.ruoyi.e.order.domain.order.EOrderQuery; +import com.ruoyi.system.domain.modelPic.EModelPic; import com.ruoyi.system.domain.rule.EFeeRule; import com.ruoyi.system.domain.vo.PriceVO; import com.ruoyi.system.service.*; @@ -76,6 +77,9 @@ public class AppController extends BaseController @Autowired private IEHardwareVersionService hardwareVersionService; + @Autowired + private IEModelPicService eModelPicService; + /** * 验证码登录 @@ -398,4 +402,14 @@ public class AppController extends BaseController return success(asDevices); } + /** + * 查询车辆型号图片列表 + */ + @GetMapping("/modelPic/list") + public AjaxResult list(EModelPic eModelPic) + { + List list = eModelPicService.selectEModelPicList(eModelPic); + return success(list); + } + } diff --git a/eride-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/eride-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java index 246c520..a4d5bad 100644 --- a/eride-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java +++ b/eride-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java @@ -17,7 +17,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServiceUtil; import com.ruoyi.common.utils.verify.vo.IDResponse; import com.ruoyi.common.utils.wx.vo.PrepayResponseVO; import com.ruoyi.e.order.domain.order.EOrder; @@ -57,8 +56,6 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import static com.ruoyi.common.constant.ServiceConstants.USER_TYPE_INDIVIDUAL; -import static com.ruoyi.common.constant.ServiceConstants.USER_TYPE_MERCHANT; /** * app接口（需要登录校验的） diff --git a/eride-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/eride-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java index 69f80eb..e200067 100644 --- a/eride-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java +++ b/eride-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java @@ -185,9 +185,9 @@ public class ReceiveController { EModel model = etModelService.selectEModelByModelId(device.getModelId()); Integer remainingMileage = 0; if(StrUtil.isNotBlank(device.getVoltage())){ - remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); + remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), device.getFullVoltage(), device.getLowVoltage(), device.getFullEndurance()); } - Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 + Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), device.getFullVoltage(), device.getLowVoltage());//电量百分百 device.setRemainingMileage(remainingMileage); device.setRemainingPower(electricQuantity.toString()); device.setLastTime(DateUtils.getNowDate()); @@ -242,9 +242,9 @@ public class ReceiveController { EModel model = etModelService.selectEModelByModelId(device.getModelId()); Integer remainingMileage = 0; if(StrUtil.isNotBlank(device.getVoltage())){ - remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); + remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), device.getFullVoltage(), device.getLowVoltage(), device.getFullEndurance()); } - Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 + Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), device.getFullVoltage(), device.getLowVoltage());//电量百分百 device.setRemainingMileage(remainingMileage); device.setRemainingPower(electricQuantity.toString()); device.setLastTime(DateUtils.getNowDate()); diff --git a/eride-admin/src/main/java/com/ruoyi/web/controller/system/EModelPicController.java b/eride-admin/src/main/java/com/ruoyi/web/controller/system/EModelPicController.java new file mode 100644 index 0000000..89a1ca4 --- /dev/null +++ b/eride-admin/src/main/java/com/ruoyi/web/controller/system/EModelPicController.java @@ -0,0 +1,105 @@ +package com.ruoyi.web.controller.system; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.modelPic.EModelPic; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.service.IEModelPicService; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 车辆型号图片Controller + * + * @author qzz + * @date 2024-12-30 + */ +@RestController +@RequestMapping("/system/modelPic") +public class EModelPicController extends BaseController +{ + @Autowired + private IEModelPicService eModelPicService; + + /** + * 查询车辆型号图片列表 + */ + @PreAuthorize("@ss.hasPermi('system:modelPic:list')") + @GetMapping("/list") + public TableDataInfo list(EModelPic eModelPic) + { + startPage(); + List list = eModelPicService.selectEModelPicList(eModelPic); + return getDataTable(list); + } + + /** + * 导出车辆型号图片列表 + */ + @PreAuthorize("@ss.hasPermi('system:modelPic:export')") + @Log(title = "车辆型号图片", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EModelPic eModelPic) + { + List list = eModelPicService.selectEModelPicList(eModelPic); + ExcelUtil util = new ExcelUtil(EModelPic.class); + util.exportExcel(response, list, "车辆型号图片数据"); + } + + /** + * 获取车辆型号图片详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:modelPic:query')") + @GetMapping(value = "/{modelId}") + public AjaxResult getInfo(@PathVariable("modelId") Long modelId) + { + return success(eModelPicService.selectEModelPicByModelId(modelId)); + } + + /** + * 新增车辆型号图片 + */ + @PreAuthorize("@ss.hasPermi('system:modelPic:add')") + @Log(title = "车辆型号图片", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EModelPic eModelPic) + { + return toAjax(eModelPicService.insertEModelPic(eModelPic)); + } + + /** + * 修改车辆型号图片 + */ + @PreAuthorize("@ss.hasPermi('system:modelPic:edit')") + @Log(title = "车辆型号图片", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EModelPic eModelPic) + { + return toAjax(eModelPicService.updateEModelPic(eModelPic)); + } + + /** + * 删除车辆型号图片 + */ + @PreAuthorize("@ss.hasPermi('system:modelPic:remove')") + @Log(title = "车辆型号图片", businessType = BusinessType.DELETE) + @DeleteMapping("/{modelIds}") + public AjaxResult remove(@PathVariable Long[] modelIds) + { + return toAjax(eModelPicService.deleteEModelPicByModelIds(modelIds)); + } +} diff --git a/eride-common/src/main/java/com/ruoyi/common/utils/CommonUtil.java b/eride-common/src/main/java/com/ruoyi/common/utils/CommonUtil.java index 5817d2a..a0f32bd 100644 --- a/eride-common/src/main/java/com/ruoyi/common/utils/CommonUtil.java +++ b/eride-common/src/main/java/com/ruoyi/common/utils/CommonUtil.java @@ -1,5 +1,6 @@ package com.ruoyi.common.utils; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -108,6 +109,9 @@ public class CommonUtil { * @author qzz */ public static Integer getRemainingMileage(String voltage,Double fullVoltage,Double lowVoltage,Integer fullEndurance) { + if(ObjectUtil.isNull(voltage) || voltage.isEmpty() || fullVoltage ==null || lowVoltage == null || fullEndurance == null){ + return 0; + } // 满电电压减去亏电电压 乘以 满电续航里程 除以 满电电压 log.info(" 电压--voltage:{},满电电压--fullVoltage:{},亏电电压--lowVoltage:{},满电续航--fullEndurance:{}",voltage,fullVoltage,lowVoltage,fullEndurance); BigDecimal vol = new BigDecimal(voltage); @@ -137,6 +141,9 @@ public class CommonUtil { * @author qzz */ public static Integer getElectricQuantity(String voltage,Double fullVoltage,Double lowVoltage) { + if(ObjectUtil.isNull(voltage) || voltage.isEmpty() || fullVoltage ==null || lowVoltage == null){ + return 0; + } // 满电电压减去亏电电压 乘以 满电续航里程 除以 满电电压 BigDecimal vol = new BigDecimal(voltage); BigDecimal current = new BigDecimal(fullVoltage).subtract(vol); diff --git a/eride-system/src/main/java/com/ruoyi/system/domain/device/EDevice.java b/eride-system/src/main/java/com/ruoyi/system/domain/device/EDevice.java index 5a90d21..6cd2633 100644 --- a/eride-system/src/main/java/com/ruoyi/system/domain/device/EDevice.java +++ b/eride-system/src/main/java/com/ruoyi/system/domain/device/EDevice.java @@ -204,4 +204,16 @@ public class EDevice extends BaseEntityPlus implements Serializable { /** 是否默认展示设备：0-否，1-是 */ private String isDefault; + /** 满电电压 */ + @Excel(name = "满电电压") + private Double fullVoltage; + + /** 亏电电压 */ + @Excel(name = "亏电电压") + private Double lowVoltage; + + /** 满电续航 */ + @Excel(name = "满电续航") + private Integer fullEndurance; + } diff --git a/eride-system/src/main/java/com/ruoyi/system/domain/model/EModel.java b/eride-system/src/main/java/com/ruoyi/system/domain/model/EModel.java index 8b22cf3..1c3ae42 100644 --- a/eride-system/src/main/java/com/ruoyi/system/domain/model/EModel.java +++ b/eride-system/src/main/java/com/ruoyi/system/domain/model/EModel.java @@ -32,18 +32,18 @@ public class EModel extends BaseEntity /** 品牌商 */ @Excel(name = "品牌商") private String brandName; +// +// /** 满电电压 */ +// @Excel(name = "满电电压") +// private Double fullVoltage; - /** 满电电压 */ - @Excel(name = "满电电压") - private Double fullVoltage; +// /** 亏电电压 */ +// @Excel(name = "亏电电压") +// private Double lowVoltage; - /** 亏电电压 */ - @Excel(name = "亏电电压") - private Double lowVoltage; - - /** 满电续航 */ - @Excel(name = "满电续航") - private Integer fullEndurance; +// /** 满电续航 */ +// @Excel(name = "满电续航") +// private Integer fullEndurance; /** 简介 */ @Excel(name = "简介") diff --git a/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPic.java b/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPic.java new file mode 100644 index 0000000..16c34e9 --- /dev/null +++ b/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPic.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.domain.modelPic; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 车辆型号图片对象 e_model_pic + * + * @author qzz + * @date 2024-12-30 + */ +public class EModelPic extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 型号id */ + private Long modelId; + + /** 车型 */ + @Excel(name = "车型") + private String model; + + /** 品牌商id */ + @Excel(name = "品牌商id") + private Long brandId; + + /** 品牌商 */ + @Excel(name = "品牌商") + private String brandName; + + /** 图片 */ + @Excel(name = "图片") + private String picture; + + public void setModelId(Long modelId) + { + this.modelId = modelId; + } + + public Long getModelId() + { + return modelId; + } + public void setModel(String model) + { + this.model = model; + } + + public String getModel() + { + return model; + } + public void setBrandId(Long brandId) + { + this.brandId = brandId; + } + + public Long getBrandId() + { + return brandId; + } + public void setBrandName(String brandName) + { + this.brandName = brandName; + } + + public String getBrandName() + { + return brandName; + } + public void setPicture(String picture) + { + this.picture = picture; + } + + public String getPicture() + { + return picture; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("modelId", getModelId()) + .append("model", getModel()) + .append("brandId", getBrandId()) + .append("brandName", getBrandName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("remark", getRemark()) + .append("picture", getPicture()) + .toString(); + } +} diff --git a/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPicQuery.java b/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPicQuery.java new file mode 100644 index 0000000..ceaede4 --- /dev/null +++ b/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPicQuery.java @@ -0,0 +1,7 @@ +package com.ruoyi.system.domain.modelPic; + +import lombok.Data; + +@Data +public class EModelPicQuery extends EModelPic{ +} diff --git a/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPicVO.java b/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPicVO.java new file mode 100644 index 0000000..1ff4fe9 --- /dev/null +++ b/eride-system/src/main/java/com/ruoyi/system/domain/modelPic/EModelPicVO.java @@ -0,0 +1,7 @@ +package com.ruoyi.system.domain.modelPic; + +import lombok.Data; + +@Data +public class EModelPicVO extends EModelPic{ +} diff --git a/eride-system/src/main/java/com/ruoyi/system/mapper/EModelPicMapper.java b/eride-system/src/main/java/com/ruoyi/system/mapper/EModelPicMapper.java new file mode 100644 index 0000000..c452ce1 --- /dev/null +++ b/eride-system/src/main/java/com/ruoyi/system/mapper/EModelPicMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.modelPic.EModelPic; + +import java.util.List; + +/** + * 车辆型号图片Mapper接口 + * + * @author qzz + * @date 2024-12-30 + */ +public interface EModelPicMapper +{ + /** + * 查询车辆型号图片 + * + * @param modelId 车辆型号图片主键 + * @return 车辆型号图片 + */ + public EModelPic selectEModelPicByModelId(Long modelId); + + /** + * 查询车辆型号图片列表 + * + * @param eModelPic 车辆型号图片 + * @return 车辆型号图片集合 + */ + public List selectEModelPicList(EModelPic eModelPic); + + /** + * 新增车辆型号图片 + * + * @param eModelPic 车辆型号图片 + * @return 结果 + */ + public int insertEModelPic(EModelPic eModelPic); + + /** + * 修改车辆型号图片 + * + * @param eModelPic 车辆型号图片 + * @return 结果 + */ + public int updateEModelPic(EModelPic eModelPic); + + /** + * 删除车辆型号图片 + * + * @param modelId 车辆型号图片主键 + * @return 结果 + */ + public int deleteEModelPicByModelId(Long modelId); + + /** + * 批量删除车辆型号图片 + * + * @param modelIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEModelPicByModelIds(Long[] modelIds); +} diff --git a/eride-system/src/main/java/com/ruoyi/system/service/IEModelPicService.java b/eride-system/src/main/java/com/ruoyi/system/service/IEModelPicService.java new file mode 100644 index 0000000..ef6394a --- /dev/null +++ b/eride-system/src/main/java/com/ruoyi/system/service/IEModelPicService.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.modelPic.EModelPic; + +import java.util.List; + +/** + * 车辆型号图片Service接口 + * + * @author qzz + * @date 2024-12-30 + */ +public interface IEModelPicService +{ + /** + * 查询车辆型号图片 + * + * @param modelId 车辆型号图片主键 + * @return 车辆型号图片 + */ + public EModelPic selectEModelPicByModelId(Long modelId); + + /** + * 查询车辆型号图片列表 + * + * @param eModelPic 车辆型号图片 + * @return 车辆型号图片集合 + */ + public List selectEModelPicList(EModelPic eModelPic); + + /** + * 新增车辆型号图片 + * + * @param eModelPic 车辆型号图片 + * @return 结果 + */ + public int insertEModelPic(EModelPic eModelPic); + + /** + * 修改车辆型号图片 + * + * @param eModelPic 车辆型号图片 + * @return 结果 + */ + public int updateEModelPic(EModelPic eModelPic); + + /** + * 批量删除车辆型号图片 + * + * @param modelIds 需要删除的车辆型号图片主键集合 + * @return 结果 + */ + public int deleteEModelPicByModelIds(Long[] modelIds); + + /** + * 删除车辆型号图片信息 + * + * @param modelId 车辆型号图片主键 + * @return 结果 + */ + public int deleteEModelPicByModelId(Long modelId); +} diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java index eb3d089..4347d8e 100644 --- a/eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EDeviceServiceImpl.java @@ -247,7 +247,7 @@ public class EDeviceServiceImpl extends ServiceImpl impl EModelVO rlModelVO = modelService.selectEModelByModelId(device.getModelId()); if(ObjectUtil.isNotNull(rlModelVO)){ if(StrUtil.isNotBlank(device.getVoltage())){ - device.setRemainingMileage(CommonUtil.getRemainingMileage(device.getVoltage(),rlModelVO.getFullVoltage(),rlModelVO.getLowVoltage(),rlModelVO.getFullEndurance())); + device.setRemainingMileage(CommonUtil.getRemainingMileage(device.getVoltage(),device.getFullVoltage(),device.getLowVoltage(),device.getFullEndurance())); } device.setModel(rlModelVO.getModel()); } @@ -573,9 +573,9 @@ public class EDeviceServiceImpl extends ServiceImpl impl if(ObjectUtil.isNotNull(model)){ Integer remainingMileage = 0; if(StrUtil.isNotBlank(device.getVoltage())){ - remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); + remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), device.getFullVoltage(), device.getLowVoltage(), device.getFullEndurance()); } - Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 + Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), device.getFullVoltage(), device.getLowVoltage());//电量百分百 device.setRemainingMileage(remainingMileage); device.setRemainingPower(electricQuantity.toString()); } @@ -605,9 +605,9 @@ public class EDeviceServiceImpl extends ServiceImpl impl if(ObjectUtil.isNotNull(model)){ Integer remainingMileage = 0; if(StrUtil.isNotBlank(device.getVoltage())){ - remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage(), model.getFullEndurance()); + remainingMileage = CommonUtil.getRemainingMileage(device.getVoltage(), device.getFullVoltage(), device.getLowVoltage(), device.getFullEndurance()); } - Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), model.getFullVoltage(), model.getLowVoltage());//电量百分百 + Integer electricQuantity = CommonUtil.getElectricQuantity(device.getVoltage(), device.getFullVoltage(), device.getLowVoltage());//电量百分百 device.setRemainingMileage(remainingMileage); device.setRemainingPower(electricQuantity.toString()); } diff --git a/eride-system/src/main/java/com/ruoyi/system/service/impl/EModelPicServiceImpl.java b/eride-system/src/main/java/com/ruoyi/system/service/impl/EModelPicServiceImpl.java new file mode 100644 index 0000000..dea42af --- /dev/null +++ b/eride-system/src/main/java/com/ruoyi/system/service/impl/EModelPicServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.system.domain.modelPic.EModelPic; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.EModelPicMapper; +import com.ruoyi.system.service.IEModelPicService; + +/** + * 车辆型号图片Service业务层处理 + * + * @author qzz + * @date 2024-12-30 + */ +@Service +public class EModelPicServiceImpl implements IEModelPicService +{ + @Autowired + private EModelPicMapper eModelPicMapper; + + /** + * 查询车辆型号图片 + * + * @param modelId 车辆型号图片主键 + * @return 车辆型号图片 + */ + @Override + public EModelPic selectEModelPicByModelId(Long modelId) + { + return eModelPicMapper.selectEModelPicByModelId(modelId); + } + + /** + * 查询车辆型号图片列表 + * + * @param eModelPic 车辆型号图片 + * @return 车辆型号图片 + */ + @Override + public List selectEModelPicList(EModelPic eModelPic) + { + return eModelPicMapper.selectEModelPicList(eModelPic); + } + + /** + * 新增车辆型号图片 + * + * @param eModelPic 车辆型号图片 + * @return 结果 + */ + @Override + public int insertEModelPic(EModelPic eModelPic) + { + eModelPic.setCreateTime(DateUtils.getNowDate()); + return eModelPicMapper.insertEModelPic(eModelPic); + } + + /** + * 修改车辆型号图片 + * + * @param eModelPic 车辆型号图片 + * @return 结果 + */ + @Override + public int updateEModelPic(EModelPic eModelPic) + { + return eModelPicMapper.updateEModelPic(eModelPic); + } + + /** + * 批量删除车辆型号图片 + * + * @param modelIds 需要删除的车辆型号图片主键 + * @return 结果 + */ + @Override + public int deleteEModelPicByModelIds(Long[] modelIds) + { + return eModelPicMapper.deleteEModelPicByModelIds(modelIds); + } + + /** + * 删除车辆型号图片信息 + * + * @param modelId 车辆型号图片主键 + * @return 结果 + */ + @Override + public int deleteEModelPicByModelId(Long modelId) + { + return eModelPicMapper.deleteEModelPicByModelId(modelId); + } +} diff --git a/eride-system/src/main/resources/mapper/system/EDeviceMapper.xml b/eride-system/src/main/resources/mapper/system/EDeviceMapper.xml index d4b3bbc..a83a6e7 100644 --- a/eride-system/src/main/resources/mapper/system/EDeviceMapper.xml +++ b/eride-system/src/main/resources/mapper/system/EDeviceMapper.xml @@ -7,14 +7,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select device_id, picture, device_name, mac, sn, model_id, hardware_version_id, vehicle_num, activation_time, online_status, + select device_id, picture, device_name, mac, sn, model_id, hardware_version_id, vehicle_num, activation_time, online_status,full_voltage, low_voltage, full_endurance, create_by, create_time, update_by, update_time, last_time, last_location_time, gps, remark, status, lock_status, location, remaining_power, voltage, qrcode, longitude, latitude, lock_status, location, remaining_power, voltage, is_default, version, user_id, is_senseless_unlock, is_auto_shutdown, is_auto_defense, is_vibration_alarm, is_admin_unlocking from e_device @@ -58,9 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT m.model_id, m.model, - m.full_voltage, - m.low_voltage, - m.full_endurance, m.create_by, m.create_time, m.update_by, @@ -99,9 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" model, brand_id, brand_name, - full_voltage, - low_voltage, - full_endurance, create_by, create_time, update_by, @@ -118,9 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{model}, #{brandId}, #{brandName}, - #{fullVoltage}, - #{lowVoltage}, - #{fullEndurance}, #{createBy}, #{createTime}, #{updateBy}, @@ -140,9 +127,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" model = #{model}, brand_id = #{brandId}, brand_name = #{brandName}, - full_voltage = #{fullVoltage}, - low_voltage = #{lowVoltage}, - full_endurance = #{fullEndurance}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, diff --git a/eride-system/src/main/resources/mapper/system/EModelPicMapper.xml b/eride-system/src/main/resources/mapper/system/EModelPicMapper.xml new file mode 100644 index 0000000..adb9366 --- /dev/null +++ b/eride-system/src/main/resources/mapper/system/EModelPicMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + select model_id, model, brand_id, brand_name, create_by, create_time, remark, picture from e_model_pic + + + + + + + + insert into e_model_pic + + model, + brand_id, + brand_name, + create_by, + create_time, + remark, + picture, + + + #{model}, + #{brandId}, + #{brandName}, + #{createBy}, + #{createTime}, + #{remark}, + #{picture}, + + + + + update e_model_pic + + model = #{model}, + brand_id = #{brandId}, + brand_name = #{brandName}, + create_by = #{createBy}, + create_time = #{createTime}, + remark = #{remark}, + picture = #{picture}, + + where model_id = #{modelId} + + + + delete from e_model_pic where model_id = #{modelId} + + + + delete from e_model_pic where model_id in + + #{modelId} + + + \ No newline at end of file