1,产线列表接口新增 产线类型 2,打印机配置 3，点检标准导入

Houjie

昨天 563a74081df215497e5acd5de54e74445c4bd18b

1,产线列表接口新增 产线类型
2,打印机配置 3，点检标准导入

 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);
     }

 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("操作成功！");
    }

}

 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;
    /**
     * æ‰“印机IP
     */
    @Excel(name = "打印机IP", width = 15)
    @ApiModelProperty(value = "打印机IP")
    private String printerIp;

    /**
     * æ‰“印机IP
     */
    @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;
}

 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> {

}

 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>

 src/main/java/org/jeecg/modules/base/model/FactoryModel.java

@@ -7,12 +7,13 @@
    // getter和setter方法
    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;
    }
}

 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> {

}

 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 {


}

 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)