From f001bd2bc5cc7f444cf9745e6fbcd9f815c0e32b Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Thu, 29 Feb 2024 14:07:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/css/login.min.css | 2 +- .../controller/LedgerRfidController.java | 51 +++++++++++-------- .../com/ruoyi/manage/domain/ResultBeen.java | 26 ++++++++++ .../ruoyi/manage/mapper/LedgerRfidMapper.java | 3 ++ .../manage/service/ILedgerRfidService.java | 3 ++ .../service/impl/LedgerRfidServiceImpl.java | 6 +++ .../mapper/manage/LedgerRfidMapper.xml | 10 ++++ .../templates/manage/ledger_rfid/count.html | 48 +++++++++++++++++ 8 files changed, 126 insertions(+), 23 deletions(-) create mode 100644 ruoyi-manage/src/main/java/com/ruoyi/manage/domain/ResultBeen.java create mode 100644 ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/count.html diff --git a/ruoyi-admin/src/main/resources/static/css/login.min.css b/ruoyi-admin/src/main/resources/static/css/login.min.css index da6928b..75b2567 100644 --- a/ruoyi-admin/src/main/resources/static/css/login.min.css +++ b/ruoyi-admin/src/main/resources/static/css/login.min.css @@ -4,7 +4,7 @@ html { body.signin { height: auto; - background: url(../img/login_bg_new.jpg) no-repeat center fixed; + background: url(../img/main_bg.png) no-repeat center fixed; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/LedgerRfidController.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/LedgerRfidController.java index 344cff3..77604a5 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/LedgerRfidController.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/controller/LedgerRfidController.java @@ -1,6 +1,8 @@ package com.ruoyi.manage.controller; import java.util.List; + +import com.ruoyi.manage.domain.ResultBeen; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -21,14 +23,13 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 轮挡台账Controller - * + * * @author wangh * @date 2024-01-17 */ @Controller @RequestMapping("/manage/ledger_rfid") -public class LedgerRfidController extends BaseController -{ +public class LedgerRfidController extends BaseController { private String prefix = "manage/ledger_rfid"; @Autowired @@ -36,19 +37,22 @@ public class LedgerRfidController extends BaseController @RequiresPermissions("manage:ledger_rfid:view") @GetMapping() - public String ledger_rfid() - { + public String ledger_rfid() { return prefix + "/ledger_rfid"; } + @GetMapping("/count") + public String count() { + return prefix + "/count"; + } + /** * 查询轮挡台账列表 */ @RequiresPermissions("manage:ledger_rfid:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(LedgerRfid ledgerRfid) - { + public TableDataInfo list(LedgerRfid ledgerRfid) { startPage(); List list = ledgerRfidService.selectLedgerRfidList(ledgerRfid); return getDataTable(list); @@ -61,8 +65,7 @@ public class LedgerRfidController extends BaseController @Log(title = "轮挡台账", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(LedgerRfid ledgerRfid) - { + public AjaxResult export(LedgerRfid ledgerRfid) { List list = ledgerRfidService.selectLedgerRfidList(ledgerRfid); ExcelUtil util = new ExcelUtil(LedgerRfid.class); return util.exportExcel(list, "轮挡台账数据"); @@ -72,8 +75,7 @@ public class LedgerRfidController extends BaseController * 新增轮挡台账 */ @GetMapping("/add") - public String add() - { + public String add() { return prefix + "/add"; } @@ -84,8 +86,7 @@ public class LedgerRfidController extends BaseController @Log(title = "轮挡台账", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(LedgerRfid ledgerRfid) - { + public AjaxResult addSave(LedgerRfid ledgerRfid) { return toAjax(ledgerRfidService.insertLedgerRfid(ledgerRfid)); } @@ -94,8 +95,7 @@ public class LedgerRfidController extends BaseController */ @RequiresPermissions("manage:ledger_rfid:edit") @GetMapping("/edit/{objid}") - public String edit(@PathVariable("objid") Long objid, ModelMap mmap) - { + public String edit(@PathVariable("objid") Long objid, ModelMap mmap) { LedgerRfid ledgerRfid = ledgerRfidService.selectLedgerRfidByObjid(objid); mmap.put("ledgerRfid", ledgerRfid); return prefix + "/edit"; @@ -108,8 +108,7 @@ public class LedgerRfidController extends BaseController @Log(title = "轮挡台账", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(LedgerRfid ledgerRfid) - { + public AjaxResult editSave(LedgerRfid ledgerRfid) { return toAjax(ledgerRfidService.updateLedgerRfid(ledgerRfid)); } @@ -118,17 +117,25 @@ public class LedgerRfidController extends BaseController */ @RequiresPermissions("manage:ledger_rfid:remove") @Log(title = "轮挡台账", businessType = BusinessType.DELETE) - @PostMapping( "/remove") + @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { + public AjaxResult remove(String ids) { return toAjax(ledgerRfidService.deleteLedgerRfidByObjids(ids)); } @PostMapping("/selectWasteNumber") @ResponseBody - public AjaxResult selectWasteNumber(){ - int number=ledgerRfidService.countWasteNumber(); + public AjaxResult selectWasteNumber() { + int number = ledgerRfidService.countWasteNumber(); return success(number); } + + @PostMapping("/countRfid") + @ResponseBody + public AjaxResult countRfid() { + List list=ledgerRfidService.countRfid(); + return success(list); + } + + } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/ResultBeen.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/ResultBeen.java new file mode 100644 index 0000000..71ae334 --- /dev/null +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/ResultBeen.java @@ -0,0 +1,26 @@ +package com.ruoyi.manage.domain; + +/** + * @author wanghao + * @date 2024/2/29 13:40 + */ +public class ResultBeen { + private String name; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/LedgerRfidMapper.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/LedgerRfidMapper.java index 9e36a38..c365651 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/LedgerRfidMapper.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/mapper/LedgerRfidMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.manage.mapper; import java.util.List; import com.ruoyi.manage.domain.LedgerRfid; +import com.ruoyi.manage.domain.ResultBeen; import org.springframework.stereotype.Repository; /** * 轮挡台账Mapper接口 @@ -61,4 +62,6 @@ public interface LedgerRfidMapper public int deleteLedgerRfidByObjids(String[] objids); int countWasteNumber(); + + List countRfid(); } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/ILedgerRfidService.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/ILedgerRfidService.java index c647f59..d29ac2b 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/ILedgerRfidService.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/ILedgerRfidService.java @@ -2,6 +2,7 @@ package com.ruoyi.manage.service; import java.util.List; import com.ruoyi.manage.domain.LedgerRfid; +import com.ruoyi.manage.domain.ResultBeen; /** * 轮挡台账Service接口 @@ -60,4 +61,6 @@ public interface ILedgerRfidService public int deleteLedgerRfidByObjid(Long objid); int countWasteNumber(); + + List countRfid(); } diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/LedgerRfidServiceImpl.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/LedgerRfidServiceImpl.java index 066a28e..818b752 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/LedgerRfidServiceImpl.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/service/impl/LedgerRfidServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.manage.domain.ResultBeen; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.manage.mapper.LedgerRfidMapper; @@ -93,4 +94,9 @@ public class LedgerRfidServiceImpl implements ILedgerRfidService { public int countWasteNumber() { return ledgerRfidMapper.countWasteNumber(); } + + @Override + public List countRfid() { + return ledgerRfidMapper.countRfid(); + } } diff --git a/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml index 53173d4..b1e65b3 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml @@ -102,4 +102,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(objid) from ledger_rfid where location_type=1 and is_scrap=2 + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/count.html b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/count.html new file mode 100644 index 0000000..bba7bd4 --- /dev/null +++ b/ruoyi-manage/src/main/resources/templates/manage/ledger_rfid/count.html @@ -0,0 +1,48 @@ + + + + + + +
+
+ +
+
+
+
+ + + + + \ No newline at end of file