From d9c814fb78193c5ebeee80e5273934570976da02 Mon Sep 17 00:00:00 2001 From: SoulStar Date: Tue, 27 Aug 2024 17:30:29 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=B7=BB=E5=8A=A0=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E6=9F=A5=E8=AF=A2=E5=AD=98=E5=82=A8=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E8=B0=83=E7=94=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BarcodeRelationshipController.java | 60 ++++++++ .../nanjing/SelectParaAllController.java | 1 + .../src/main/resources/application-druid.yml | 2 +- .../BarcodeRelationshipSelect.html | 145 ++++++++++++++++++ .../BarcodeRelationshipSelect/add.html | 9 ++ .../BarcodeRelationshipSelect/edit.html | 9 ++ .../src/main/resources/generator.yml | 2 +- .../nanjing/domain/BarCodeRelationship.java | 94 ++++++++++++ .../mapper/BarcodeRelationshipMapper.java | 18 +++ .../nanjing/mapper/TSyTracestateMapper.java | 2 + .../service/IBarcodeRelationshipService.java | 17 ++ .../impl/BarcodeRelationshipServiceImpl.java | 29 ++++ .../nanjing/BarcodeRelationshipMapper.xml | 21 +++ 13 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/BarcodeRelationshipController.java create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/BarcodeRelationshipSelect.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/edit.html create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BarCodeRelationship.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/BarcodeRelationshipMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/IBarcodeRelationshipService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/BarcodeRelationshipServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/nanjing/BarcodeRelationshipMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/BarcodeRelationshipController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/BarcodeRelationshipController.java new file mode 100644 index 00000000..20144c28 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/BarcodeRelationshipController.java @@ -0,0 +1,60 @@ +package com.ruoyi.web.controller.nanjing; + +import java.util.List; +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.nanjing.domain.BarCodeRelationship; +import com.ruoyi.nanjing.service.IBarcodeRelationshipService; +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 limy + * @date 2024-08-27 + */ +@Controller +@RequestMapping("/nanjing/BarcodeRelationshipSelect") +public class BarcodeRelationshipController extends BaseController +{ + private String prefix = "nanjing/BarcodeRelationshipSelect"; + + @Autowired + private IBarcodeRelationshipService barcodeRelationshipService; + + @RequiresPermissions("nanjing:BarcodeRelationshipSelect:view") + @GetMapping() + public String BarcodeRelationship() + { + return prefix + "/BarcodeRelationshipSelect"; + } + + /** + * 查询条码关系列表 + */ + @RequiresPermissions("nanjing:BarcodeRelationshipSelect:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(String barcode) + { + List list = barcodeRelationshipService.selectBarcodeRelationshipByBarcode(barcode); + if(barcode==null||barcode==""){ + list.clear(); + list.add(new BarCodeRelationship()); + } + return getDataTable(list); + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java index b7a0024d..88139724 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/SelectParaAllController.java @@ -38,6 +38,7 @@ public class SelectParaAllController extends BaseController { { return prefix + "/ParaAllShow"; } + @RequiresPermissions("nanjing:ParaAllShow:list") @PostMapping("/paraAllShow") @ResponseBody diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 96577c61..b929b549 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -13,7 +13,7 @@ spring: # username: sa ## password: 123456 master: - url: jdbc:sqlserver://192.168.3.109:1433;SelectMethod=cursor;DatabaseName=JYD_shengjie + url: jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=JYD_shengjie username: sa password: 123456 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/BarcodeRelationshipSelect.html b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/BarcodeRelationshipSelect.html new file mode 100644 index 00000000..3177a9d4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/BarcodeRelationshipSelect.html @@ -0,0 +1,145 @@ + + + + + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/add.html b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/add.html new file mode 100644 index 00000000..085f5291 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/add.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/edit.html b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/edit.html new file mode 100644 index 00000000..ec4bccff --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/nanjing/BarcodeRelationshipSelect/edit.html @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml index 8eb73129..f5e98e82 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/ruoyi-generator/src/main/resources/generator.yml @@ -6,6 +6,6 @@ gen: # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool packageName: com.ruoyi.nanjing # 自动去除表前缀，默认是false - autoRemovePre: false + autoRemovePre: true # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） tablePrefix: sys_ \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BarCodeRelationship.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BarCodeRelationship.java new file mode 100644 index 00000000..a16c66e5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/BarCodeRelationship.java @@ -0,0 +1,94 @@ +package com.ruoyi.nanjing.domain; + +import java.util.Date; +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; + +/** + * 条码关系对象 sys_BarcodeRelationship + * + * @author limy + * @date 2024-08-27 + */ +public class BarCodeRelationship extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + // private Long id; + + /** 产品条码 */ + //@Excel(name = "产品条码") + private String ProductBarcode; + + /** 设备条码 */ + //@Excel(name = "设备条码") + private String SemiBarcode; + + /** 条码类型 */ + //@Excel(name = "条码类型") + private String Type; + + /** 插入时间 */ + //@Excel(name = "插入时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date InsertTime; + +// public void setId(Long id) +// { +// this.id = id; +// } +// +// public Long getId() +// { +// return id; +// } + public void setProductBarcode(String productBarcode) + { + this.ProductBarcode = productBarcode; + } + + public String getProductBarcode() + { + return ProductBarcode; + } + public void setSemiBarcode(String semiBarcode) + { + this.SemiBarcode = semiBarcode; + } + + public String getSemiBarcode() + { + return SemiBarcode; + } + public void setType(String type) + { + this.Type = type; + } + + public String getType() + { + return Type; + } + public void setInsertTime(Date insertTime) + { + this.InsertTime = insertTime; + } + + public Date getInsertTime() + { + return InsertTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + // .append("id", getId()) + .append("ProductBarcode", getProductBarcode()) + .append("SemiBarcode", getSemiBarcode()) + .append("Type", getType()) + .append("InsertTime", getInsertTime()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/BarcodeRelationshipMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/BarcodeRelationshipMapper.java new file mode 100644 index 00000000..7de2aba1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/BarcodeRelationshipMapper.java @@ -0,0 +1,18 @@ +package com.ruoyi.nanjing.mapper; + +import java.util.List; +import com.ruoyi.nanjing.domain.BarCodeRelationship; + +/** + * 条码关系Mapper接口 + * + * @author limy + * @date 2024-08-27 + */ +public interface BarcodeRelationshipMapper +{ + + + public List getBarcodeRelationshipByBarcode(String barcode); +} + diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java index ca79589a..f2594c8a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TSyTracestateMapper.java @@ -70,11 +70,13 @@ public interface TSyTracestateMapper @ResultMap({"col1","col2"}) @Options(statementType = StatementType.CALLABLE) + List>> selectAllPara(Map map); List getInfo(Object semiBarcode); List selectStationPara(Map map); + List selectStationPara2(Map map); String selectSemi(String productBarcode); diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/IBarcodeRelationshipService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/IBarcodeRelationshipService.java new file mode 100644 index 00000000..a788c34e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/IBarcodeRelationshipService.java @@ -0,0 +1,17 @@ +package com.ruoyi.nanjing.service; + +import java.util.List; +import com.ruoyi.nanjing.domain.BarCodeRelationship; + +/** + * 条码关系Service接口 + * + * @author limy + * @date 2024-08-27 + */ +public interface IBarcodeRelationshipService +{ + + public List selectBarcodeRelationshipByBarcode(String barcode); +} + diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/BarcodeRelationshipServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/BarcodeRelationshipServiceImpl.java new file mode 100644 index 00000000..6e3de590 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/BarcodeRelationshipServiceImpl.java @@ -0,0 +1,29 @@ +package com.ruoyi.nanjing.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.nanjing.mapper.BarcodeRelationshipMapper; +import com.ruoyi.nanjing.domain.BarCodeRelationship; +import com.ruoyi.nanjing.service.IBarcodeRelationshipService; +import com.ruoyi.common.core.text.Convert; + +/** + * 条码关系Service业务层处理 + * + * @author limy + * @date 2024-08-27 + */ +@Service +public class BarcodeRelationshipServiceImpl implements IBarcodeRelationshipService +{ + @Autowired + private BarcodeRelationshipMapper barcodeRelationshipMapper; + + + @Override + public List selectBarcodeRelationshipByBarcode(String barcode) + { + return barcodeRelationshipMapper.getBarcodeRelationshipByBarcode(barcode); + } +} \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/BarcodeRelationshipMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/BarcodeRelationshipMapper.xml new file mode 100644 index 00000000..866af910 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/nanjing/BarcodeRelationshipMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + +