From 563a74081df215497e5acd5de54e74445c4bd18b Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 05 九月 2025 09:17:08 +0800
Subject: [PATCH] 1,产线列表接口新增 产线类型 2,打印机配置 3，点检标准导入
---
src/main/java/org/jeecg/modules/base/mapper/xml/PrinterConfigMapper.xml | 5
src/main/java/org/jeecg/modules/base/model/FactoryModel.java | 5
src/main/java/org/jeecg/modules/base/service/IPrinterConfigService.java | 14 ++
src/main/java/org/jeecg/modules/base/mapper/PrinterConfigMapper.java | 14 ++
src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java | 6
src/main/java/org/jeecg/modules/base/controller/PrinterConfigController.java | 170 ++++++++++++++++++++++++++++
src/main/java/org/jeecg/modules/base/entity/PrinterConfig.java | 101 ++++++++++++++++
src/main/java/org/jeecg/modules/base/service/impl/PrinterConfigServiceImpl.java | 19 +++
src/main/java/org/jeecg/modules/base/controller/FactoryController.java | 2
9 files changed, 330 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
index d9f5488..ed9c6b6 100644
--- a/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/FactoryController.java
@@ -226,7 +226,7 @@
public Result<List<FactoryModel>> queryUserProductionLineList() {
List<Factory> factoryList = factoryService.queryUserProductionLineList();
List<FactoryModel> factoryModels = factoryList.stream()
- .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName()))
+ .map(factory -> new FactoryModel(factory.getId(), factory.getFactoryName(), factory.getProductionType()))
.collect(Collectors.toList());
return Result.ok(factoryModels);
}
diff --git a/src/main/java/org/jeecg/modules/base/controller/PrinterConfigController.java b/src/main/java/org/jeecg/modules/base/controller/PrinterConfigController.java
new file mode 100644
index 0000000..6d75e9d
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/controller/PrinterConfigController.java
@@ -0,0 +1,170 @@
+package org.jeecg.modules.base.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.base.entity.PrinterConfig;
+import org.jeecg.modules.base.service.IPrinterConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+* @Description: 鎵撳嵃鏈洪厤缃俊鎭�
+* @Author: jeecg-boot
+* @Date: 2025-06-24
+* @Version: V1.0
+*/
+@Api(tags="鎵撳嵃鏈洪厤缃俊鎭�")
+@RestController
+@RequestMapping("/base/printerConfig")
+@Slf4j
+public class PrinterConfigController extends JeecgController<PrinterConfig, IPrinterConfigService> {
+ @Autowired
+ private IPrinterConfigService printerConfigService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param printerConfig
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value="鎵撳嵃鏈轰俊鎭�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎵撳嵃鏈轰俊鎭�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<PrinterConfig>> queryPageList(PrinterConfig printerConfig,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<PrinterConfig> queryWrapper = QueryGenerator.initQueryWrapper(printerConfig, req.getParameterMap());
+ Page<PrinterConfig> page = new Page<PrinterConfig>(pageNo, pageSize);
+ IPage<PrinterConfig> pageList = printerConfigService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param printerConfig
+ * @return
+ */
+ @AutoLog(value = "鎵撳嵃鏈轰俊鎭�-娣诲姞")
+ @ApiOperation(value="鎵撳嵃鏈轰俊鎭�-娣诲姞", notes="鎵撳嵃鏈轰俊鎭�-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody PrinterConfig printerConfig) {
+ printerConfig.setPrinterStatus(CommonConstant.STATUS_1);
+ printerConfigService.save(printerConfig);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param printerConfig
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-缂栬緫")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-缂栬緫", notes="绾胯竟浠撳簱淇℃伅-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody PrinterConfig printerConfig) {
+ printerConfigService.updateById(printerConfig);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ printerConfigService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鎵撳嵃鏈轰俊鎭�-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鎵撳嵃鏈轰俊鎭�-鎵归噺鍒犻櫎", notes="鎵撳嵃鏈轰俊鎭�-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.printerConfigService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value="鎵撳嵃鏈轰俊鎭�-閫氳繃id鏌ヨ", notes="鎵撳嵃鏈轰俊鎭�-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<PrinterConfig> queryById(@RequestParam(name="id",required=true) String id) {
+ PrinterConfig lineSideWarehouse = printerConfigService.getById(id);
+ if(lineSideWarehouse==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(lineSideWarehouse);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param printerConfig
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, PrinterConfig printerConfig) {
+ return super.exportXls(request, printerConfig, PrinterConfig.class, "鎵撳嵃鏈轰俊鎭�");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, PrinterConfig.class);
+ }
+
+ @AutoLog(value = "鎵撳嵃鏈�-鍚敤&绂佺敤")
+ @ApiOperation(value = "鎵撳嵃鏈�-鍚敤&绂佺敤", notes = "鎵撳嵃鏈�-鍚敤&绂佺敤")
+ @PutMapping(value = "/active")
+ public Result<?> active(@RequestParam(name = "id", required = true) String id) {
+ PrinterConfig printerConfig = printerConfigService.getById(id);
+ if (CommonConstant.STATUS_1.equals(printerConfig.getPrinterStatus())) {
+ printerConfig.setPrinterStatus(CommonConstant.STATUS_0);
+ } else {
+ printerConfig.setPrinterStatus(CommonConstant.STATUS_1);
+ }
+ printerConfigService.updateById(printerConfig);
+ return Result.ok("鎿嶄綔鎴愬姛锛�");
+ }
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/entity/PrinterConfig.java b/src/main/java/org/jeecg/modules/base/entity/PrinterConfig.java
new file mode 100644
index 0000000..022df68
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/entity/PrinterConfig.java
@@ -0,0 +1,101 @@
+package org.jeecg.modules.base.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 鎵撳嵃鏈洪厤缃俊鎭�
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("base_printer_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "base_printer_config瀵硅薄", description = "鎵撳嵃鏈洪厤缃俊鎭�")
+public class PrinterConfig implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ /**
+ * 鎵撳嵃鏈篒P
+ */
+ @Excel(name = "鎵撳嵃鏈篒P", width = 15)
+ @ApiModelProperty(value = "鎵撳嵃鏈篒P")
+ private String printerIp;
+
+ /**
+ * 鎵撳嵃鏈篒P
+ */
+ @Excel(name = "鎵撳嵃鏈哄悕绉�", width = 15)
+ @ApiModelProperty(value = "鎵撳嵃鏈哄悕绉�")
+ private String printerName;
+ /**
+ * 鎵撳嵃鏈虹鍙�
+ */
+ @Excel(name = "鎵撳嵃鏈虹鍙�", width = 15)
+ @ApiModelProperty(value = "鎵撳嵃鏈虹鍙�")
+ private String portNumber;
+ /**
+ * 鎵撳嵃鏈哄瀷鍙�
+ */
+ @Excel(name = "鎵撳嵃鏈哄瀷鍙�", width = 15)
+ @ApiModelProperty(value = "鎵撳嵃鏈哄瀷鍙�")
+ private String printerModel;
+
+ /**鎵撳嵃鏈虹姸鎬�*/
+ @Excel(name = "鎵撳嵃鏈虹姸鎬�", width = 15)
+ @ApiModelProperty(value = "鎵撳嵃鏈虹姸鎬�")
+ private String printerStatus;
+}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/PrinterConfigMapper.java b/src/main/java/org/jeecg/modules/base/mapper/PrinterConfigMapper.java
new file mode 100644
index 0000000..53aef6e
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/mapper/PrinterConfigMapper.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.base.entity.PrinterConfig;
+
+/**
+ * @Description: 鎵撳嵃鏈轰俊鎭厤缃�
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface PrinterConfigMapper extends BaseMapper<PrinterConfig> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/PrinterConfigMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/PrinterConfigMapper.xml
new file mode 100644
index 0000000..4e9d260
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/PrinterConfigMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.base.mapper.PrinterConfigMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/model/FactoryModel.java b/src/main/java/org/jeecg/modules/base/model/FactoryModel.java
index 89c62fa..c09a8e4 100644
--- a/src/main/java/org/jeecg/modules/base/model/FactoryModel.java
+++ b/src/main/java/org/jeecg/modules/base/model/FactoryModel.java
@@ -7,12 +7,13 @@
// getter鍜宻etter鏂规硶
private String value; // 浜х嚎ID
private String text; // 浜х嚎鍚嶇О
-
+ private String type; // 浜х嚎绫诲瀷
public FactoryModel() {
}
- public FactoryModel(String value, String text) {
+ public FactoryModel(String value, String text, String type) {
this.value = value;
this.text = text;
+ this.type = type;
}
}
diff --git a/src/main/java/org/jeecg/modules/base/service/IPrinterConfigService.java b/src/main/java/org/jeecg/modules/base/service/IPrinterConfigService.java
new file mode 100644
index 0000000..28c0674
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/IPrinterConfigService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.base.entity.PrinterConfig;
+
+/**
+ * @Description: 鎵撳嵃鏈洪厤缃�
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+public interface IPrinterConfigService extends IService<PrinterConfig> {
+
+}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/PrinterConfigServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/PrinterConfigServiceImpl.java
new file mode 100644
index 0000000..0a65fa1
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/base/service/impl/PrinterConfigServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.base.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.base.entity.PrinterConfig;
+import org.jeecg.modules.base.mapper.PrinterConfigMapper;
+import org.jeecg.modules.base.service.IPrinterConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 鎵撳嵃鏈洪厤缃俊鎭�
+ * @Author: jeecg-boot
+ * @Date: 2025-06-24
+ * @Version: V1.0
+ */
+@Service
+public class PrinterConfigServiceImpl extends ServiceImpl<PrinterConfigMapper, PrinterConfig> implements IPrinterConfigService {
+
+
+}
diff --git a/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java b/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
index 94bf014..7b3bcf8 100644
--- a/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
+++ b/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
@@ -11,13 +11,13 @@
@Excel(name = "NO", width = 15)
private String itemCode;
- @Excel(name = "閮ㄤ綅鍚嶇О", width = 15)
+ @Excel(name = "鐐规鍐呭", width = 15)
private String itemName;
- @Excel(name = "鐐规鍐呭", width = 15)
+ @Excel(name = "鐐规鏂规硶", width = 15)
private String subItemName;
- @Excel(name = "鐐规鏂规硶", width = 15)
+ @Excel(name = "閮ㄤ綅鍚嶇О", width = 15)
private String itemPart;
@Excel(name = "鍩哄噯", width = 15)
--
Gitblit v1.9.3