干物质系数界面功能实现
This commit is contained in:
parent
f061f27daa
commit
80d3e9df1c
@ -0,0 +1,88 @@
|
||||
package com.zhyc.module.dryMatterCorrection.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.zhyc.common.annotation.Log;
|
||||
import com.zhyc.common.core.controller.BaseController;
|
||||
import com.zhyc.common.core.domain.AjaxResult;
|
||||
import com.zhyc.common.enums.BusinessType;
|
||||
import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection;
|
||||
import com.zhyc.module.dryMatterCorrection.service.IXzDryMatterCorrectionService;
|
||||
import com.zhyc.common.utils.poi.ExcelUtil;
|
||||
import com.zhyc.common.core.page.TableDataInfo;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/dryMatterCorrection/dryMatterCorrection")
|
||||
public class XzDryMatterCorrectionController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IXzDryMatterCorrectionService xzDryMatterCorrectionService;
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('dryMatterCorrection:dryMatterCorrection:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(XzDryMatterCorrection xzDryMatterCorrection)
|
||||
{
|
||||
// 只保留年月查询条件，清空其他查询条件
|
||||
XzDryMatterCorrection query = new XzDryMatterCorrection();
|
||||
query.setDatetime(xzDryMatterCorrection.getDatetime());
|
||||
|
||||
startPage();
|
||||
List<XzDryMatterCorrection> list = xzDryMatterCorrectionService.selectXzDryMatterCorrectionList(query);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('dryMatterCorrection:dryMatterCorrection:export')")
|
||||
@Log(title = "干物质校正", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, XzDryMatterCorrection xzDryMatterCorrection)
|
||||
{
|
||||
// 只保留年月查询条件，清空其他查询条件
|
||||
XzDryMatterCorrection query = new XzDryMatterCorrection();
|
||||
query.setDatetime(xzDryMatterCorrection.getDatetime());
|
||||
|
||||
List<XzDryMatterCorrection> list = xzDryMatterCorrectionService.selectXzDryMatterCorrectionList(query);
|
||||
ExcelUtil<XzDryMatterCorrection> util = new ExcelUtil<XzDryMatterCorrection>(XzDryMatterCorrection.class);
|
||||
util.exportExcel(response, list, "干物质校正数据");
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('dryMatterCorrection:dryMatterCorrection:query')")
|
||||
@GetMapping(value = "/{id}")
|
||||
public AjaxResult getInfo(@PathVariable("id") Long id)
|
||||
{
|
||||
return success(xzDryMatterCorrectionService.selectXzDryMatterCorrectionById(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('dryMatterCorrection:dryMatterCorrection:add')")
|
||||
@Log(title = "干物质校正", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody XzDryMatterCorrection xzDryMatterCorrection)
|
||||
{
|
||||
return toAjax(xzDryMatterCorrectionService.insertXzDryMatterCorrection(xzDryMatterCorrection));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('dryMatterCorrection:dryMatterCorrection:edit')")
|
||||
@Log(title = "干物质校正", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody XzDryMatterCorrection xzDryMatterCorrection)
|
||||
{
|
||||
return toAjax(xzDryMatterCorrectionService.updateXzDryMatterCorrection(xzDryMatterCorrection));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('dryMatterCorrection:dryMatterCorrection:remove')")
|
||||
@Log(title = "干物质校正", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{ids}")
|
||||
public AjaxResult remove(@PathVariable Long[] ids)
|
||||
{
|
||||
return toAjax(xzDryMatterCorrectionService.deleteXzDryMatterCorrectionByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,100 @@
|
||||
package com.zhyc.module.dryMatterCorrection.domain;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.zhyc.common.annotation.Excel;
|
||||
import com.zhyc.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 干物质校正对象 xz_dry_matter_correction
|
||||
*/
|
||||
public class XzDryMatterCorrection extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键ID */
|
||||
private Long id;
|
||||
|
||||
/** 年月 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "年月", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date datetime;
|
||||
|
||||
/** 厂区 */
|
||||
@Excel(name = "厂区")
|
||||
private String factory;
|
||||
|
||||
/** 干物质含量 */
|
||||
@Excel(name = "干物质含量")
|
||||
private String content;
|
||||
|
||||
/** 干物质标准 */
|
||||
@Excel(name = "干物质标准")
|
||||
private String standard;
|
||||
|
||||
/** 干物质系数 */
|
||||
@Excel(name = "干物质系数") // 移除了numFormat
|
||||
private Double coefficient;
|
||||
|
||||
// Getter和Setter
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Date getDatetime() {
|
||||
return datetime;
|
||||
}
|
||||
|
||||
public void setDatetime(Date datetime) {
|
||||
this.datetime = datetime;
|
||||
}
|
||||
|
||||
public String getFactory() {
|
||||
return factory;
|
||||
}
|
||||
|
||||
public void setFactory(String factory) {
|
||||
this.factory = factory;
|
||||
}
|
||||
|
||||
public String getContent() {
|
||||
return content;
|
||||
}
|
||||
|
||||
public void setContent(String content) {
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
public String getStandard() {
|
||||
return standard;
|
||||
}
|
||||
|
||||
public void setStandard(String standard) {
|
||||
this.standard = standard;
|
||||
}
|
||||
|
||||
public Double getCoefficient() {
|
||||
return coefficient;
|
||||
}
|
||||
|
||||
public void setCoefficient(Double coefficient) {
|
||||
this.coefficient = coefficient;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", id)
|
||||
.append("datetime", datetime)
|
||||
.append("factory", factory)
|
||||
.append("content", content)
|
||||
.append("standard", standard)
|
||||
.append("coefficient", coefficient)
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.zhyc.module.dryMatterCorrection.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection;
|
||||
|
||||
/**
|
||||
* 干物质校正Mapper接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-07-11
|
||||
*/
|
||||
public interface XzDryMatterCorrectionMapper
|
||||
{
|
||||
/**
|
||||
* 查询干物质校正
|
||||
*
|
||||
* @param id 干物质校正主键
|
||||
* @return 干物质校正
|
||||
*/
|
||||
public XzDryMatterCorrection selectXzDryMatterCorrectionById(Long id);
|
||||
|
||||
/**
|
||||
* 查询干物质校正列表
|
||||
*
|
||||
* @param xzDryMatterCorrection 干物质校正
|
||||
* @return 干物质校正集合
|
||||
*/
|
||||
public List<XzDryMatterCorrection> selectXzDryMatterCorrectionList(XzDryMatterCorrection xzDryMatterCorrection);
|
||||
|
||||
/**
|
||||
* 新增干物质校正
|
||||
*
|
||||
* @param xzDryMatterCorrection 干物质校正
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertXzDryMatterCorrection(XzDryMatterCorrection xzDryMatterCorrection);
|
||||
|
||||
/**
|
||||
* 修改干物质校正
|
||||
*
|
||||
* @param xzDryMatterCorrection 干物质校正
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateXzDryMatterCorrection(XzDryMatterCorrection xzDryMatterCorrection);
|
||||
|
||||
/**
|
||||
* 删除干物质校正
|
||||
*
|
||||
* @param id 干物质校正主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteXzDryMatterCorrectionById(Long id);
|
||||
|
||||
/**
|
||||
* 批量删除干物质校正
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteXzDryMatterCorrectionByIds(Long[] ids);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.zhyc.module.dryMatterCorrection.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection;
|
||||
|
||||
/**
|
||||
* 干物质校正Service接口
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-07-11
|
||||
*/
|
||||
public interface IXzDryMatterCorrectionService
|
||||
{
|
||||
/**
|
||||
* 查询干物质校正
|
||||
*
|
||||
* @param id 干物质校正主键
|
||||
* @return 干物质校正
|
||||
*/
|
||||
public XzDryMatterCorrection selectXzDryMatterCorrectionById(Long id);
|
||||
|
||||
/**
|
||||
* 查询干物质校正列表
|
||||
*
|
||||
* @param xzDryMatterCorrection 干物质校正
|
||||
* @return 干物质校正集合
|
||||
*/
|
||||
public List<XzDryMatterCorrection> selectXzDryMatterCorrectionList(XzDryMatterCorrection xzDryMatterCorrection);
|
||||
|
||||
/**
|
||||
* 新增干物质校正
|
||||
*
|
||||
* @param xzDryMatterCorrection 干物质校正
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertXzDryMatterCorrection(XzDryMatterCorrection xzDryMatterCorrection);
|
||||
|
||||
/**
|
||||
* 修改干物质校正
|
||||
*
|
||||
* @param xzDryMatterCorrection 干物质校正
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateXzDryMatterCorrection(XzDryMatterCorrection xzDryMatterCorrection);
|
||||
|
||||
/**
|
||||
* 批量删除干物质校正
|
||||
*
|
||||
* @param ids 需要删除的干物质校正主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteXzDryMatterCorrectionByIds(Long[] ids);
|
||||
|
||||
/**
|
||||
* 删除干物质校正信息
|
||||
*
|
||||
* @param id 干物质校正主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteXzDryMatterCorrectionById(Long id);
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package com.zhyc.module.dryMatterCorrection.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.zhyc.module.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper;
|
||||
import com.zhyc.module.dryMatterCorrection.domain.XzDryMatterCorrection;
|
||||
import com.zhyc.module.dryMatterCorrection.service.IXzDryMatterCorrectionService;
|
||||
|
||||
@Service
|
||||
public class XzDryMatterCorrectionServiceImpl implements IXzDryMatterCorrectionService {
|
||||
|
||||
@Autowired
|
||||
private XzDryMatterCorrectionMapper xzDryMatterCorrectionMapper;
|
||||
|
||||
@Override
|
||||
public XzDryMatterCorrection selectXzDryMatterCorrectionById(Long id) {
|
||||
return xzDryMatterCorrectionMapper.selectXzDryMatterCorrectionById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<XzDryMatterCorrection> selectXzDryMatterCorrectionList(XzDryMatterCorrection xzDryMatterCorrection) {
|
||||
return xzDryMatterCorrectionMapper.selectXzDryMatterCorrectionList(xzDryMatterCorrection);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int insertXzDryMatterCorrection(XzDryMatterCorrection xzDryMatterCorrection) {
|
||||
calculateCoefficient(xzDryMatterCorrection);
|
||||
return xzDryMatterCorrectionMapper.insertXzDryMatterCorrection(xzDryMatterCorrection);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateXzDryMatterCorrection(XzDryMatterCorrection xzDryMatterCorrection) {
|
||||
calculateCoefficient(xzDryMatterCorrection);
|
||||
return xzDryMatterCorrectionMapper.updateXzDryMatterCorrection(xzDryMatterCorrection);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int deleteXzDryMatterCorrectionByIds(Long[] ids) {
|
||||
return xzDryMatterCorrectionMapper.deleteXzDryMatterCorrectionByIds(ids);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int deleteXzDryMatterCorrectionById(Long id) {
|
||||
return xzDryMatterCorrectionMapper.deleteXzDryMatterCorrectionById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算干物质系数（含格式控制）
|
||||
*/
|
||||
private void calculateCoefficient(XzDryMatterCorrection xzDryMatterCorrection) {
|
||||
if (xzDryMatterCorrection.getContent() != null &&
|
||||
xzDryMatterCorrection.getStandard() != null) {
|
||||
try {
|
||||
double content = Double.parseDouble(xzDryMatterCorrection.getContent());
|
||||
double standard = Double.parseDouble(xzDryMatterCorrection.getStandard());
|
||||
|
||||
if (standard != 0) {
|
||||
double coefficient = content / standard;
|
||||
// 手动控制4位小数（替代numFormat功能）
|
||||
xzDryMatterCorrection.setCoefficient(
|
||||
Double.parseDouble(String.format("%.4f", coefficient))
|
||||
);
|
||||
} else {
|
||||
xzDryMatterCorrection.setCoefficient(null);
|
||||
}
|
||||
} catch (NumberFormatException e) {
|
||||
xzDryMatterCorrection.setCoefficient(null);
|
||||
}
|
||||
} else {
|
||||
xzDryMatterCorrection.setCoefficient(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
<?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="com.zhyc.module.dryMatterCorrection.mapper.XzDryMatterCorrectionMapper">
|
||||
|
||||
<resultMap type="XzDryMatterCorrection" id="XzDryMatterCorrectionResult">
|
||||
<result property="id" column="id"/>
|
||||
<result property="datetime" column="datetime"/>
|
||||
<result property="factory" column="factory"/>
|
||||
<result property="content" column="content"/>
|
||||
<result property="standard" column="standard"/>
|
||||
<result property="coefficient" column="coefficient"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectXzDryMatterCorrectionVo">
|
||||
select id, datetime, factory, content, standard, coefficient from xz_dry_matter_correction
|
||||
</sql>
|
||||
|
||||
<select id="selectXzDryMatterCorrectionList" parameterType="XzDryMatterCorrection" resultMap="XzDryMatterCorrectionResult">
|
||||
<include refid="selectXzDryMatterCorrectionVo"/>
|
||||
<where>
|
||||
<if test="datetime != null "> and datetime = #{datetime}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectXzDryMatterCorrectionById" parameterType="Long" resultMap="XzDryMatterCorrectionResult">
|
||||
<include refid="selectXzDryMatterCorrectionVo"/>
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<insert id="insertXzDryMatterCorrection" parameterType="XzDryMatterCorrection" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into xz_dry_matter_correction
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="datetime != null">datetime,</if>
|
||||
<if test="factory != null">factory,</if>
|
||||
<if test="content != null">content,</if>
|
||||
<if test="standard != null">standard,</if>
|
||||
<if test="coefficient != null">coefficient,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="datetime != null">#{datetime},</if>
|
||||
<if test="factory != null">#{factory},</if>
|
||||
<if test="content != null">#{content},</if>
|
||||
<if test="standard != null">#{standard},</if>
|
||||
<if test="coefficient != null">#{coefficient},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateXzDryMatterCorrection" parameterType="XzDryMatterCorrection">
|
||||
update xz_dry_matter_correction
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="datetime != null">datetime = #{datetime},</if>
|
||||
<if test="factory != null">factory = #{factory},</if>
|
||||
<if test="content != null">content = #{content},</if>
|
||||
<if test="standard != null">standard = #{standard},</if>
|
||||
<if test="coefficient != null">coefficient = #{coefficient},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<delete id="deleteXzDryMatterCorrectionById" parameterType="Long">
|
||||
delete from xz_dry_matter_correction where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteXzDryMatterCorrectionByIds" parameterType="String">
|
||||
delete from xz_dry_matter_correction where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
x
Reference in New Issue
Block a user