From 6dfea314d7861119cb6a61cd8c93e2da24a36af2 Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 10 Oct 2024 17:22:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../api/controller/BroadApiController.java | 41 +++++++++++++++---- .../ruoyi/api/domain/BroadCountNumber.java | 33 +++++++++++++++ .../com/ruoyi/api/mapper/BroadApiMapper.java | 13 +++++- .../api/service/impl/BroadApiService.java | 19 ++++++++- .../main/resources/mapper/BroadApiMapper.xml | 39 ++++++++++++------ .../com/ruoyi/manage/domain/LedgerRfid.java | 9 ++++ .../mapper/manage/LedgerRfidMapper.xml | 1 + 8 files changed, 132 insertions(+), 25 deletions(-) create mode 100644 ruoyi-api/src/main/java/com/ruoyi/api/domain/BroadCountNumber.java diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 09a5920..632da07 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: false # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/lundang/uploadPath + profile: F:/lundang/uploadPath # 获取ip地址开关 addressEnabled: false diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java b/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java index 56ea3a6..c14092f 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/controller/BroadApiController.java @@ -1,25 +1,50 @@ package com.ruoyi.api.controller; +import com.ruoyi.api.domain.BroadCountNumber; import com.ruoyi.api.service.impl.BroadApiService; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.manage.domain.BaseStore; +import com.ruoyi.manage.domain.LedgerRfid; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * @author wanghao * @date 2024/3/1 13:29 */ -@RestController +@Controller @RequestMapping("/api") public class BroadApiController { @Autowired private BroadApiService service; - - @PostMapping("/selectCountNumber") - private String selectCountNumber(){ - return service.selectCountNumber(); + //获取区域 + @PostMapping("/getArea") + @ResponseBody + public AjaxResult getArea() { + List list = service.getArea(); + return AjaxResult.success(list); } + //获取统计 + @PostMapping("/getCountNumberById") + @ResponseBody + public AjaxResult getCountNumberById(int id) { + List list = service.getCountNumberById(id); + + return AjaxResult.success(list); + } + //获取详细轮挡 + @PostMapping("/getLedgerByCode") + @ResponseBody + public AjaxResult getLedgerByCode(String locationCode){ + List list=service.getLedgerByCode(locationCode); + return AjaxResult.success(list); + } + + + } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/domain/BroadCountNumber.java b/ruoyi-api/src/main/java/com/ruoyi/api/domain/BroadCountNumber.java new file mode 100644 index 0000000..f7457c4 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/api/domain/BroadCountNumber.java @@ -0,0 +1,33 @@ +package com.ruoyi.api.domain; + +public class BroadCountNumber { + private String areaName; + private String locationCode; + private int countNumber; + + + public String getAreaName() { + + return areaName; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public String getLocationCode() { + return locationCode; + } + + public void setLocationCode(String locationCode) { + this.locationCode = locationCode; + } + + public int getCountNumber() { + return countNumber; + } + + public void setCountNumber(int countNumber) { + this.countNumber = countNumber; + } +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java index 16062e8..415c5ee 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/BroadApiMapper.java @@ -1,12 +1,23 @@ package com.ruoyi.api.mapper; +import com.ruoyi.api.domain.BroadCountNumber; +import com.ruoyi.manage.domain.BaseStore; +import com.ruoyi.manage.domain.LedgerRfid; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author wanghao * @date 2024/3/1 13:30 */ @Repository public interface BroadApiMapper { - String selectCountNumber(); + + + List getArea(); + + List getCountNumberById(int id); + + List getLedgerByCode(String locationCode); } diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java index fd4c97d..c5f7923 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/BroadApiService.java @@ -1,9 +1,14 @@ package com.ruoyi.api.service.impl; +import com.ruoyi.api.domain.BroadCountNumber; import com.ruoyi.api.mapper.BroadApiMapper; +import com.ruoyi.manage.domain.BaseStore; +import com.ruoyi.manage.domain.LedgerRfid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author wanghao * @date 2024/3/1 13:30 @@ -13,7 +18,17 @@ public class BroadApiService { @Autowired private BroadApiMapper mapper; - public String selectCountNumber() { - return mapper.selectCountNumber(); + + + public List getArea() { + return mapper.getArea(); + } + + public List getCountNumberById(int id) { + return mapper.getCountNumberById(id); + } + + public List getLedgerByCode(String locationCode) { + return mapper.getLedgerByCode(locationCode); } } diff --git a/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml b/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml index 53c20c3..4e0b6e1 100644 --- a/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/BroadApiMapper.xml @@ -3,19 +3,32 @@ - - + select store_name,store_id from base_store where store_tag=2 + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/LedgerRfid.java b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/LedgerRfid.java index a3173b4..52c73cb 100644 --- a/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/LedgerRfid.java +++ b/ruoyi-manage/src/main/java/com/ruoyi/manage/domain/LedgerRfid.java @@ -35,6 +35,7 @@ public class LedgerRfid extends BaseEntity { */ @Excel(name = "RFID编码") private String rifdCode; + private String manufacturerName; /** * 生产批次 @@ -93,6 +94,14 @@ public class LedgerRfid extends BaseEntity { return rifdCode; } + public String getManufacturerName() { + return manufacturerName; + } + + public void setManufacturerName(String manufacturerName) { + this.manufacturerName = manufacturerName; + } + public void setBatchCode(String batchCode) { this.batchCode = batchCode; } diff --git a/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml b/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml index b1e65b3..e35190c 100644 --- a/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml +++ b/ruoyi-manage/src/main/resources/mapper/manage/LedgerRfidMapper.xml @@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +