Browse Source

组坯实绩信息B端展示

qiangxuan 4 months ago
parent
commit
0d9355db06

+ 162 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetAssemblyNumber/controller/BilletAssemblyNumberController.java

@@ -0,0 +1,162 @@
+package org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.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.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.entity.BilletAssemblyNumber;
+import org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.service.IBilletAssemblyNumberService;
+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: billet_assembly_number
+ * @Author: jeecg-boot
+ * @Date:   2025-01-13
+ * @Version: V1.0
+ */
+@Api(tags="billet_assembly_number")
+@RestController
+@RequestMapping("/billet/billetAssemblyNumber")
+@Slf4j
+public class BilletAssemblyNumberController extends JeecgController<BilletAssemblyNumber, IBilletAssemblyNumberService> {
+	@Autowired
+	private IBilletAssemblyNumberService billetAssemblyNumberService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param billetAssemblyNumber
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "billet_assembly_number-分页列表查询")
+	@ApiOperation(value="billet_assembly_number-分页列表查询", notes="billet_assembly_number-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BilletAssemblyNumber>> queryPageList(BilletAssemblyNumber billetAssemblyNumber,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BilletAssemblyNumber> queryWrapper = QueryGenerator.initQueryWrapper(billetAssemblyNumber, req.getParameterMap());
+		Page<BilletAssemblyNumber> page = new Page<BilletAssemblyNumber>(pageNo, pageSize);
+		IPage<BilletAssemblyNumber> pageList = billetAssemblyNumberService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param billetAssemblyNumber
+	 * @return
+	 */
+	@AutoLog(value = "billet_assembly_number-添加")
+	@ApiOperation(value="billet_assembly_number-添加", notes="billet_assembly_number-添加")
+	@RequiresPermissions("billetAssemblyNumber:billet_assembly_number:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BilletAssemblyNumber billetAssemblyNumber) {
+		billetAssemblyNumberService.save(billetAssemblyNumber);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param billetAssemblyNumber
+	 * @return
+	 */
+	@AutoLog(value = "billet_assembly_number-编辑")
+	@ApiOperation(value="billet_assembly_number-编辑", notes="billet_assembly_number-编辑")
+	@RequiresPermissions("billetAssemblyNumber:billet_assembly_number:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BilletAssemblyNumber billetAssemblyNumber) {
+		billetAssemblyNumberService.updateById(billetAssemblyNumber);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "billet_assembly_number-通过id删除")
+	@ApiOperation(value="billet_assembly_number-通过id删除", notes="billet_assembly_number-通过id删除")
+	@RequiresPermissions("billetAssemblyNumber:billet_assembly_number:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		billetAssemblyNumberService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "billet_assembly_number-批量删除")
+	@ApiOperation(value="billet_assembly_number-批量删除", notes="billet_assembly_number-批量删除")
+	@RequiresPermissions("billetAssemblyNumber:billet_assembly_number:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.billetAssemblyNumberService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "billet_assembly_number-通过id查询")
+	@ApiOperation(value="billet_assembly_number-通过id查询", notes="billet_assembly_number-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BilletAssemblyNumber> queryById(@RequestParam(name="id",required=true) String id) {
+		BilletAssemblyNumber billetAssemblyNumber = billetAssemblyNumberService.getById(id);
+		if(billetAssemblyNumber==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(billetAssemblyNumber);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param billetAssemblyNumber
+    */
+    @RequiresPermissions("billetAssemblyNumber:billet_assembly_number:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BilletAssemblyNumber billetAssemblyNumber) {
+        return super.exportXls(request, billetAssemblyNumber, BilletAssemblyNumber.class, "billet_assembly_number");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("billetAssemblyNumber:billet_assembly_number:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BilletAssemblyNumber.class);
+    }
+
+}

+ 97 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetAssemblyNumber/entity/BilletAssemblyNumber.java

@@ -0,0 +1,97 @@
+package org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: billet_assembly_number
+ * @Author: jeecg-boot
+ * @Date:   2025-01-13
+ * @Version: V1.0
+ */
+@Data
+@TableName("billet_assembly_number")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="billet_assembly_number对象", description="billet_assembly_number")
+public class BilletAssemblyNumber implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**炉号*/
+	@Excel(name = "炉号", width = 15)
+    @ApiModelProperty(value = "炉号")
+    private String heatNo;
+	/**铸机号*/
+	@Excel(name = "铸机号", width = 15)
+    @ApiModelProperty(value = "铸机号")
+    private Integer ccmNo;
+	/**定尺*/
+	@Excel(name = "定尺", width = 15)
+    @ApiModelProperty(value = "定尺")
+    private Integer length;
+	/**组坯号*/
+	@Excel(name = "组坯号", width = 15)
+    @ApiModelProperty(value = "组坯号")
+    private String assemblyNumber;
+	/**组坯时间*/
+	@Excel(name = "组坯时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "组坯时间")
+    private Date assemblyTime;
+	/**坯号集合*/
+	@Excel(name = "坯号集合", width = 15)
+    @ApiModelProperty(value = "坯号集合")
+    private String billetsNo;
+	/**钢坯数量*/
+	@Excel(name = "钢坯数量", width = 15)
+    @ApiModelProperty(value = "钢坯数量")
+    private Integer billetsNum;
+	/**钢坯坯重*/
+	@Excel(name = "钢坯坯重", width = 15)
+    @ApiModelProperty(value = "钢坯坯重")
+    private Double billetWeight;
+	/**班别*/
+	@Excel(name = "班别", width = 15)
+    @ApiModelProperty(value = "班别")
+    private String shift;
+	/**班组*/
+	@Excel(name = "班组", width = 15)
+    @ApiModelProperty(value = "班组")
+    private String shiftGroup;
+}

+ 14 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetAssemblyNumber/mapper/BilletAssemblyNumberMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.entity.BilletAssemblyNumber;
+
+/**
+ * @Description: billet_assembly_number
+ * @Author: jeecg-boot
+ * @Date:   2025-01-13
+ * @Version: V1.0
+ */
+public interface BilletAssemblyNumberMapper extends BaseMapper<BilletAssemblyNumber> {
+
+}

+ 5 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetAssemblyNumber/mapper/xml/BilletAssemblyNumberMapper.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.actualControl.billetActual.billetAssemblyNumber.mapper.BilletAssemblyNumberMapper">
+
+</mapper>

+ 14 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetAssemblyNumber/service/IBilletAssemblyNumberService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.entity.BilletAssemblyNumber;
+
+/**
+ * @Description: billet_assembly_number
+ * @Author: jeecg-boot
+ * @Date:   2025-01-13
+ * @Version: V1.0
+ */
+public interface IBilletAssemblyNumberService extends IService<BilletAssemblyNumber> {
+
+}

+ 18 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetAssemblyNumber/service/impl/BilletAssemblyNumberServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.entity.BilletAssemblyNumber;
+import org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.mapper.BilletAssemblyNumberMapper;
+import org.jeecg.modules.actualControl.billetActual.billetAssemblyNumber.service.IBilletAssemblyNumberService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: billet_assembly_number
+ * @Author: jeecg-boot
+ * @Date:   2025-01-13
+ * @Version: V1.0
+ */
+@Service
+public class BilletAssemblyNumberServiceImpl extends ServiceImpl<BilletAssemblyNumberMapper, BilletAssemblyNumber> implements IBilletAssemblyNumberService {
+
+}