diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 3f78e74..5b0e54d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -50,6 +50,6 @@ public class SysIndexController extends BaseController public String main(ModelMap mmap) { mmap.put("version", Global.getVersion()); - return "main"; + return "main_v1"; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarbrandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarbrandController.java index ff871c7..5ee1aaf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarbrandController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarbrandController.java @@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import org.springframework.web.multipart.MultipartFile; /** - * 品牌Controller + * 车牌Controller * * @author dhl * @date 2020-03-26 @@ -51,7 +51,7 @@ public class BaseCarbrandController extends BaseController } /** - * 查询品牌列表 + * 查询车牌信息列表 */ @RequiresPermissions("tyre:carbrand:list") @PostMapping("/list") @@ -64,7 +64,7 @@ public class BaseCarbrandController extends BaseController } /** - * 导出品牌列表 + * 导出车牌信息列表 */ @RequiresPermissions("tyre:carbrand:export") @Log(title = "车辆车牌", businessType = BusinessType.EXPORT) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreBrandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreBrandController.java new file mode 100644 index 0000000..ad6653f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseTyreBrandController.java @@ -0,0 +1,154 @@ +package com.ruoyi.web.controller.tyre; + +import java.util.Date; +import java.util.List; + +import com.ruoyi.common.constant.TyreConstants; +import com.ruoyi.framework.util.ShiroUtils; +import com.ruoyi.tyre.domain.BaseCarbrand; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.tyre.domain.BaseTyreBrand; +import com.ruoyi.tyre.service.IBaseTyreBrandService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 轮胎品牌信息Controller + * + * @author dhl + * @date 2020-03-30 + */ +@Controller +@RequestMapping("/tyre/brand") +public class BaseTyreBrandController extends BaseController +{ + private String prefix = "tyre/brand"; + + @Autowired + private IBaseTyreBrandService baseTyreBrandService; + + @RequiresPermissions("tyre:brand:view") + @GetMapping() + public String brand() + { + return prefix + "/brand"; + } + + /** + * 查询轮胎品牌信息列表 + */ + @RequiresPermissions("tyre:brand:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseTyreBrand baseTyreBrand) + { + startPage(); + List list = baseTyreBrandService.selectBaseTyreBrandList(baseTyreBrand); + return getDataTable(list); + } + + /** + * 导出轮胎品牌信息列表 + */ + @RequiresPermissions("tyre:brand:export") + @Log(title = "轮胎品牌信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseTyreBrand baseTyreBrand) + { + List list = baseTyreBrandService.selectBaseTyreBrandList(baseTyreBrand); + ExcelUtil util = new ExcelUtil(BaseTyreBrand.class); + return util.exportExcel(list, "brand"); + } + + /** + * 新增轮胎品牌信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存轮胎品牌信息 + */ + @RequiresPermissions("tyre:brand:add") + @Log(title = "轮胎品牌信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseTyreBrand baseTyreBrand) + { + if(StringUtils.isBlank(baseTyreBrand.getBrandname())){ + //轮胎品牌名称为空，给提示 + return error("轮胎品牌不能为空"); + } + if (TyreConstants.BRANNO_NOT_UNIQUE.equals(baseTyreBrandService.checkBranNameUnique(baseTyreBrand))) + { + return error("新增轮胎品牌'" + baseTyreBrand.getBrandname() + "'失败，轮胎品牌名称已存在"); + } + baseTyreBrand.setRecorderid(ShiroUtils.getLoginName());//记录人信息 + baseTyreBrand.setRecordtime(new Date()); + return toAjax(baseTyreBrandService.insertBaseTyreBrand(baseTyreBrand)); + } + + /** + * 修改轮胎品牌信息 + */ + @GetMapping("/edit/{objid}") + public String edit(@PathVariable("objid") Long objid, ModelMap mmap) + { + BaseTyreBrand baseTyreBrand = baseTyreBrandService.selectBaseTyreBrandById(objid); + mmap.put("baseTyreBrand", baseTyreBrand); + return prefix + "/edit"; + } + + /** + * 修改保存轮胎品牌信息 + */ + @RequiresPermissions("tyre:brand:edit") + @Log(title = "轮胎品牌信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseTyreBrand baseTyreBrand) + { + baseTyreBrand.setRecorderid(ShiroUtils.getLoginName());//记录人信息 + baseTyreBrand.setRecordtime(new Date()); + return toAjax(baseTyreBrandService.updateBaseTyreBrand(baseTyreBrand)); + } + + /** + * 删除轮胎品牌信息 + */ + @RequiresPermissions("tyre:brand:remove") + @Log(title = "轮胎品牌信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseTyreBrandService.deleteBaseTyreBrandByIds(ids)); + } + + /** + * 校验名牌名称 + */ + @PostMapping("/checkBranNameUnique") + @ResponseBody + public String checkBrannoUnique(BaseTyreBrand baseTyreBrand) + { + return baseTyreBrandService.checkBranNameUnique(baseTyreBrand); + } +} diff --git a/ruoyi-admin/src/main/resources/static/img/tyre.jpg b/ruoyi-admin/src/main/resources/static/img/tyre.jpg new file mode 100644 index 0000000..76dc322 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/tyre.jpg differ diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 0442af8..8a15efc 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 若依系统首页 + 智能轮胎系统 @@ -29,7 +29,7 @@