fenze 7 сар өмнө
parent
commit
b6fd3f94ab

+ 1 - 1
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/controller/BilletBasicInfoController.java

@@ -26,7 +26,7 @@ import java.util.Arrays;
  * @Date:   2024-05-16
  * @Version: V1.0
  */
-@Api(tags="钢坯基础信息")
+@Api(tags="铸坯实绩")
 @RestController
 @RequestMapping("/actualControl/billetActual")
 @Slf4j

+ 1 - 1
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/entity/BilletBasicInfo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @Description: 钢坯基础信息
+ * @Description: 铸坯实绩
  * @Author: jeecg-boot
  * @Date:   2024-05-16
  * @Version: V1.0

+ 0 - 155
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActuals/controller/BilletActualsController.java

@@ -1,155 +0,0 @@
-package org.jeecg.modules.actualControl.billetActuals.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.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.actualControl.billetActuals.entity.BilletActuals;
-import org.jeecg.modules.actualControl.billetActuals.service.IBilletActualsService;
-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:   2024-04-18
- * @Version: V1.0
- */
-@Api(tags="铸坯实绩")
-@RestController
-@RequestMapping("/actualControl/billetActuals")
-@Slf4j
-public class BilletActualsController extends JeecgController<BilletActuals, IBilletActualsService> {
-	@Autowired
-	private IBilletActualsService billetActualsService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param billetActuals
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "铸坯实绩-分页列表查询")
-	@ApiOperation(value="铸坯实绩-分页列表查询", notes="铸坯实绩-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<BilletActuals>> queryPageList(BilletActuals billetActuals,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<BilletActuals> queryWrapper = QueryGenerator.initQueryWrapper(billetActuals, req.getParameterMap());
-		Page<BilletActuals> page = new Page<BilletActuals>(pageNo, pageSize);
-		IPage<BilletActuals> pageList = billetActualsService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param billetActuals
-	 * @return
-	 */
-	@AutoLog(value = "铸坯实绩-添加")
-	@ApiOperation(value="铸坯实绩-添加", notes="铸坯实绩-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody BilletActuals billetActuals) {
-		billetActualsService.save(billetActuals);
-		return Result.OK("添加成功!");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param billetActuals
-	 * @return
-	 */
-	@AutoLog(value = "铸坯实绩-编辑")
-	@ApiOperation(value="铸坯实绩-编辑", notes="铸坯实绩-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody BilletActuals billetActuals) {
-		billetActualsService.updateById(billetActuals);
-		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) {
-		billetActualsService.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.billetActualsService.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<BilletActuals> queryById(@RequestParam(name="id",required=true) String id) {
-		BilletActuals billetActuals = billetActualsService.getById(id);
-		if(billetActuals==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(billetActuals);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param billetActuals
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, BilletActuals billetActuals) {
-        return super.exportXls(request, billetActuals, BilletActuals.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, BilletActuals.class);
-    }
-
-}

+ 0 - 122
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActuals/entity/BilletActuals.java

@@ -1,122 +0,0 @@
-package org.jeecg.modules.actualControl.billetActuals.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 铸坯实绩
- * @Author: jeecg-boot
- * @Date:   2024-04-18
- * @Version: V1.0
- */
-@Data
-@TableName("billet_actuals")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="billet_actuals对象", description="铸坯实绩")
-public class BilletActuals 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 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 billetCode;
-	/**定尺规格*/
-	@Excel(name = "定尺规格", width = 15)
-    @ApiModelProperty(value = "定尺规格")
-    private String rulerSpec;
-	/**理论重量*/
-	@Excel(name = "理论重量", width = 15)
-    @ApiModelProperty(value = "理论重量")
-    private Double theoryWeight;
-	/**切割类型*/
-	@Excel(name = "切割类型", width = 15)
-    @ApiModelProperty(value = "切割类型")
-    private String cutType;
-	/**切割时间*/
-	@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 cutTime;
-	/**组合号*/
-	@Excel(name = "组合号", width = 15)
-    @ApiModelProperty(value = "组合号")
-    private String comboCode;
-	/**组合时间*/
-	@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 comboTime;
-	/**去向方式*/
-	@Excel(name = "去向方式", width = 15)
-    @ApiModelProperty(value = "去向方式")
-    private String goWhere;
-	/**坯位号*/
-	@Excel(name = "坯位号", width = 15)
-    @ApiModelProperty(value = "坯位号")
-    private String billetPlaceCode;
-	/**去轧钢位置*/
-	@Excel(name = "去轧钢位置", width = 15)
-    @ApiModelProperty(value = "去轧钢位置")
-    private String goSteelRollingPlace;
-	/**切割周期*/
-	@Excel(name = "切割周期", width = 15)
-    @ApiModelProperty(value = "切割周期")
-    private String cutCycle;
-	/**配水量*/
-	@Excel(name = "配水量", width = 15)
-    @ApiModelProperty(value = "配水量")
-    private Double waterDistribution;
-	/**平均拉速*/
-	@Excel(name = "平均拉速", width = 15)
-    @ApiModelProperty(value = "平均拉速")
-    private Double averageSpeed;
-	/**温度*/
-	@Excel(name = "温度", width = 15)
-    @ApiModelProperty(value = "温度")
-    private Double temp;
-	/**异常判定*/
-	@Excel(name = "异常判定", width = 15)
-    @ApiModelProperty(value = "异常判定")
-    private String abnormalDecide;
-}

+ 0 - 17
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActuals/mapper/BilletActualsMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.actualControl.billetActuals.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.actualControl.billetActuals.entity.BilletActuals;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 铸坯实绩
- * @Author: jeecg-boot
- * @Date:   2024-04-18
- * @Version: V1.0
- */
-public interface BilletActualsMapper extends BaseMapper<BilletActuals> {
-
-}

+ 0 - 5
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActuals/mapper/xml/BilletActualsMapper.xml

@@ -1,5 +0,0 @@
-<?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.billetActuals.mapper.BilletActualsMapper">
-
-</mapper>

+ 0 - 14
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActuals/service/IBilletActualsService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.actualControl.billetActuals.service;
-
-import org.jeecg.modules.actualControl.billetActuals.entity.BilletActuals;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 铸坯实绩
- * @Author: jeecg-boot
- * @Date:   2024-04-18
- * @Version: V1.0
- */
-public interface IBilletActualsService extends IService<BilletActuals> {
-
-}

+ 0 - 19
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActuals/service/impl/BilletActualsServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.actualControl.billetActuals.service.impl;
-
-import org.jeecg.modules.actualControl.billetActuals.entity.BilletActuals;
-import org.jeecg.modules.actualControl.billetActuals.mapper.BilletActualsMapper;
-import org.jeecg.modules.actualControl.billetActuals.service.IBilletActualsService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 铸坯实绩
- * @Author: jeecg-boot
- * @Date:   2024-04-18
- * @Version: V1.0
- */
-@Service
-public class BilletActualsServiceImpl extends ServiceImpl<BilletActualsMapper, BilletActuals> implements IBilletActualsService {
-
-}