From 8d76e801e612abb38123acc7edaccd24887a685b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 15 八月 2025 09:07:42 +0800
Subject: [PATCH] 根据韩月设计，去除参数实体类(Param)及相关逻辑代码，作物实体类的开始日期与结束日期属性改为月日型。
---
/dev/null | 71 -----------------------------------
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdCropsMapper.java | 1
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java | 8 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java | 15 +++----
pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml | 20 +++++-----
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java | 4 -
7 files changed, 22 insertions(+), 98 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdCropsMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdCropsMapper.java
index 191e268..fa84c22 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdCropsMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdCropsMapper.java
@@ -2,7 +2,6 @@
import com.dy.pipIrrGlobal.pojoMd.MdCrops;
import com.dy.pipIrrGlobal.voMd.VoCrops;
-import com.dy.pipIrrGlobal.voMd.VoParam;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdParamMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdParamMapper.java
deleted file mode 100644
index 1eedcbd..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdParamMapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.dy.pipIrrGlobal.daoMd;
-
-import com.dy.pipIrrGlobal.pojoMd.MdParam;
-import com.dy.pipIrrGlobal.voMd.VoParam;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author: liurunyu
- * @Date: 2025/8/6 10:51
- * @Description
- */
-public interface MdParamMapper {
- int deleteByPrimaryKey(Long id);
-
- int insert(MdParam record);
-
- int insertSelective(MdParam record);
-
- MdParam selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(MdParam record);
-
- int updateByPrimaryKey(MdParam record);
-
-
- VoParam selectById(Long id);
-
- /**
- * 鏌ヨ鎵�鏈夊疄浣�
- * @return 瀹炰綋闆嗗悎
- * */
- List<VoParam> selectAll(Long cropsId);
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
index 21aec32..9bd2000 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
@@ -51,15 +51,15 @@
* 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
*/
@Schema(description = "璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date startDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String startDt;
/**
* 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
*/
@Schema(description = "璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date endDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String endDt;
/**
* 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdParam.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdParam.java
deleted file mode 100644
index a7c1d6e..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdParam.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.dy.pipIrrGlobal.pojoMd;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.*;
-import org.hibernate.validator.constraints.Length;
-
-/**
- * @Author: liurunyu
- * @Date: 2025/8/6 10:51
- * @Description
- */
-@TableName(value="md_param", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "浣滅墿璁＄畻鍙傛暟")
-public class MdParam implements BaseEntity {
-
- public static final long serialVersionUID = 202508061621001L;
- /**
- * 涓婚敭
- */
- @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id;
-
- @Schema(description = "浣滅墿瀹炰綋澶栭敭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long cropsId;
-
- /**
- * 鍙傛暟鍚嶇О
- */
- @Schema(description = "鍙傛暟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鍙傛暟鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
- public String name;
-
- /**
- * 鍙傛暟鍊�
- */
- @Schema(description = "鍙傛暟鍊�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鍙傛暟鍊间笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- public Double value;
-
- /**
- * 鍙傛暟鍚箟
- */
- @Schema(description = "鍙傛暟鍚箟", requiredMode = Schema.RequiredMode.REQUIRED)
- public String sense;
-
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
index 8b0235d..11ba859 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
@@ -16,7 +16,7 @@
*/
@Data
-@JsonPropertyOrder({"id", "name", "startDt", "endDt", "isStopped", "remarks", "createDt"})
+@JsonPropertyOrder({"id", "name", "startDt", "endDt", "stopped", "isStopped", "remarks", "createDt"})
public class VoCrops implements Serializable {
public static final long serialVersionUID = 202508061124001L;
@@ -33,21 +33,20 @@
public String name;
/**
- * 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ * 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡mm-dd
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date startDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String startDt;
/**
- * 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ * 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡mm-dd
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- public Date endDt;
+ @JsonFormat(pattern = "MM-dd")
+ public String endDt;
/**
* 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
*/
- @JSONField(serialize = false)
public Byte stopped;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoParam.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoParam.java
deleted file mode 100644
index 1ff00ba..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoParam.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.dy.pipIrrGlobal.voMd;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import java.io.Serializable;
-
-/**
- * @Author: liurunyu
- * @Date: 2025/8/6 11:41
- * @Description
- */
-
-@Data
-@JsonPropertyOrder({"id", "name", "value", "sense"})
-public class VoParam implements Serializable {
-
- public static final long serialVersionUID = 202508061141001L;
-
- /**
- * 涓婚敭
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long id;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long cropsId;
-
- /**
- * 鍙傛暟鍚嶇О
- */
- public String name;
-
- /**
- * 鍙傛暟鍊�
- */
- public Double value;
-
- /**
- * 鍙傛暟鍚箟
- */
- public String sense;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
index aa909aa..b738134 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
@@ -6,8 +6,8 @@
<!--@Table md_crops-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
- <result column="start_dt" jdbcType="DATE" property="startDt" />
- <result column="end_dt" jdbcType="DATE" property="endDt" />
+ <result column="start_dt" jdbcType="VARCHAR" property="startDt" />
+ <result column="end_dt" jdbcType="VARCHAR" property="endDt" />
<result column="stopped" jdbcType="TINYINT" property="stopped" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="create_dt" jdbcType="TIMESTAMP" property="createDt" />
@@ -47,8 +47,8 @@
insert into md_crops (id, `name`, start_dt,
end_dt, stopped, remarks,
create_dt, deleted)
- values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{startDt,jdbcType=DATE},
- #{endDt,jdbcType=DATE}, #{stopped,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR},
+ values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{startDt,jdbcType=VARCHAR},
+ #{endDt,jdbcType=VARCHAR}, #{stopped,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR},
#{createDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoMd.MdCrops">
@@ -88,10 +88,10 @@
#{name,jdbcType=VARCHAR},
</if>
<if test="startDt != null">
- #{startDt,jdbcType=DATE},
+ #{startDt,jdbcType=VARCHAR},
</if>
<if test="endDt != null">
- #{endDt,jdbcType=DATE},
+ #{endDt,jdbcType=VARCHAR},
</if>
<if test="stopped != null">
#{stopped,jdbcType=TINYINT},
@@ -115,10 +115,10 @@
`name` = #{name,jdbcType=VARCHAR},
</if>
<if test="startDt != null">
- start_dt = #{startDt,jdbcType=DATE},
+ start_dt = #{startDt,jdbcType=VARCHAR},
</if>
<if test="endDt != null">
- end_dt = #{endDt,jdbcType=DATE},
+ end_dt = #{endDt,jdbcType=VARCHAR},
</if>
<if test="stopped != null">
stopped = #{stopped,jdbcType=TINYINT},
@@ -139,8 +139,8 @@
<!--@mbg.generated-->
update md_crops
set `name` = #{name,jdbcType=VARCHAR},
- start_dt = #{startDt,jdbcType=DATE},
- end_dt = #{endDt,jdbcType=DATE},
+ start_dt = #{startDt,jdbcType=VARCHAR},
+ end_dt = #{endDt,jdbcType=VARCHAR},
stopped = #{stopped,jdbcType=TINYINT},
remarks = #{remarks,jdbcType=VARCHAR},
create_dt = #{createDt,jdbcType=TIMESTAMP},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdParamMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdParamMapper.xml
deleted file mode 100644
index e7cc0c2..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdParamMapper.xml
+++ /dev/null
@@ -1,121 +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="com.dy.pipIrrGlobal.daoMd.MdParamMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoMd.MdParam">
- <!--@mbg.generated-->
- <!--@Table md_param-->
- <id column="id" jdbcType="BIGINT" property="id" />
- <result column="crops_id" jdbcType="BIGINT" property="cropsId" />
- <result column="name" jdbcType="VARCHAR" property="name" />
- <result column="value" jdbcType="FLOAT" property="value" />
- <result column="sense" jdbcType="VARCHAR" property="sense" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, crops_id, `name`, `value`, sense
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from md_param
- where id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- <!--@mbg.generated-->
- delete from md_param
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoMd.MdParam">
- <!--@mbg.generated-->
- insert into md_param (id, crops_id, `name`,
- `value`, sense)
- values (#{id,jdbcType=BIGINT}, #{cropsId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
- #{value,jdbcType=FLOAT}, #{sense,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoMd.MdParam">
- <!--@mbg.generated-->
- insert into md_param
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="cropsId != null">
- crops_id,
- </if>
- <if test="name != null">
- `name`,
- </if>
- <if test="value != null">
- `value`,
- </if>
- <if test="sense != null">
- sense,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=BIGINT},
- </if>
- <if test="cropsId != null">
- #{cropsId,jdbcType=BIGINT},
- </if>
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="value != null">
- #{value,jdbcType=FLOAT},
- </if>
- <if test="sense != null">
- #{sense,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoMd.MdParam">
- <!--@mbg.generated-->
- update md_param
- <set>
- <if test="cropsId != null">
- crops_id = #{cropsId,jdbcType=BIGINT},
- </if>
- <if test="name != null">
- `name` = #{name,jdbcType=VARCHAR},
- </if>
- <if test="value != null">
- `value` = #{value,jdbcType=FLOAT},
- </if>
- <if test="sense != null">
- sense = #{sense,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoMd.MdParam">
- <!--@mbg.generated-->
- update md_param
- set crops_id = #{cropsId,jdbcType=BIGINT},
- `name` = #{name,jdbcType=VARCHAR},
- `value` = #{value,jdbcType=FLOAT},
- sense = #{sense,jdbcType=VARCHAR}
- where id = #{id,jdbcType=BIGINT}
- </update>
-
-
-
- <select id="selectById" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voMd.VoParam">
- <!--@mbg.generated-->
- select
- <include refid="Base_Column_List" />
- from md_param
- where id = #{id,jdbcType=BIGINT}
- </select>
-
-
- <select id="selectAll" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voMd.VoParam">
- select
- <include refid="Base_Column_List" />
- from md_param tb
- where crops_id = #{cropsId,jdbcType=BIGINT}
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
index 5c94eeb..a5d2f82 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
@@ -1,14 +1,12 @@
package com.dy.pipIrrModel.crops;
import com.dy.common.aop.SsoAop;
-import com.dy.common.util.DateTime;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoMd.MdCrops;
import com.dy.pipIrrGlobal.voMd.VoCrops;
-import com.dy.pipIrrGlobal.voMd.VoParam;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -95,7 +93,7 @@
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
description = "杩斿洖鎵�鏈変綔鐗╂暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = VoParam.class))}
+ schema = @Schema(implementation = VoCrops.class))}
)
})
@GetMapping(path = "all")
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
index b3eb92b..235913f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
@@ -4,7 +4,6 @@
import com.dy.pipIrrGlobal.daoMd.MdCropsMapper;
import com.dy.pipIrrGlobal.pojoMd.MdCrops;
import com.dy.pipIrrGlobal.voMd.VoCrops;
-import com.dy.pipIrrGlobal.voMd.VoParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/param/ParamCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/param/ParamCtrl.java
deleted file mode 100644
index 427917a..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/param/ParamCtrl.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.dy.pipIrrModel.param;
-
-import com.dy.common.aop.SsoAop;
-import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
-import com.dy.common.webUtil.QueryResultVo;
-import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoMd.MdParam;
-import com.dy.pipIrrGlobal.voMd.VoParam;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @Author: liurunyu
- * @Date: 2025/8/6 13:44
- * @Description
- */
-@Slf4j
-@Tag(name = "璁＄畻鍙傛暟绠＄悊", description = "璁＄畻鍙傛暟绠＄悊")
-@RestController
-@RequestMapping(path = "mdParam")
-public class ParamCtrl {
-
- private ParamSv sv;
-
- @Autowired
- private void setSv(ParamSv sv) { this.sv = sv; }
-
- /**
- * 寰楀埌涓�涓绠楀弬鏁版暟鎹�
- * @return 涓�涓绠楀弬鏁版暟鎹�
- */
- @Operation(summary = "涓�涓绠楀弬鏁�", description = "寰楀埌涓�涓绠楀弬鏁版暟鎹�")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖涓�涓绠楀弬鏁版暟鎹紙BaseResponse.content:{}锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = VoParam.class))}
- )
- })
- @GetMapping(path = "one")
- @SsoAop()
- public BaseResponse<VoParam> one(Long id){
- return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
- }
- /**
- * 瀹㈡埛绔姹傚緱鍒颁竴涓綔鐗╃殑鎵�鏈夎绠楀弬鏁版暟鎹�
- * @return 涓�涓綔鐗╃殑鎵�鏈夎绠楀弬鏁版暟鎹�
- */
- @Operation(summary = "鑾峰緱涓�涓綔鐗╃殑鎵�鏈夎绠楀弬鏁�", description = "杩斿洖涓�涓綔鐗╃殑鎵�鏈夎绠楀弬鏁版暟鎹�")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖涓�涓綔鐗╃殑鎵�鏈夎绠楀弬鏁版暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = VoParam.class))}
- )
- })
- @GetMapping(path = "all")
- @SsoAop()
- public BaseResponse<List<VoParam>> all(Long cropsId){
- try {
- List<VoParam> res = this.sv.selectAll(cropsId) ;
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ璁＄畻鍙傛暟寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
- /**
- * 鏂板淇濆瓨璁＄畻鍙傛暟
- * @param po 鏂板淇濆瓨璁＄畻鍙傛暟form琛ㄥ崟瀵硅薄
- * @return 鏄惁鎴愬姛
- */
- @Operation(summary = "淇濆瓨璁＄畻鍙傛暟", description = "鎻愪氦璁＄畻鍙傛暟鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇濆瓨")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = Boolean.class))}
- )
- })
- @PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop()
- public BaseResponse<Boolean> save(@RequestBody @Valid MdParam po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- po.id = null ;
- int count;
- try {
- count = this.sv.save(po);
- } catch (Exception e) {
- log.error("淇濆瓨璁＄畻鍙傛暟寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
- }
- }
- /**
- * 缂栬緫淇敼璁＄畻鍙傛暟
- * @param po 淇濆瓨璁＄畻鍙傛暟form琛ㄥ崟瀵硅薄
- * @return 鏄惁鎴愬姛
- */
- @Operation(summary = "缂栬緫淇敼鐗囧尯", description = "鎻愪氦鐗囧尯鏁版嵁锛坒orm琛ㄥ崟锛夛紝杩涜淇敼")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = Boolean.class))}
- )
- })
- @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Valid MdParam po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
- if(po.id == null){
- return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
- }
- int count;
- try {
- count = this.sv.update(po);
- } catch (Exception e) {
- log.error("淇濆瓨璁＄畻鍙傛暟寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
- }
- }
-
-
- /**
- * 鍒犻櫎璁＄畻鍙傛暟
- * @param id 璁＄畻鍙傛暟ID
- * @return 鏄惁鎴愬姛
- */
- @Operation(summary = "鍒犻櫎璁＄畻鍙傛暟", description = "鎻愪氦璁＄畻鍙傛暟ID锛岃繘琛岄�昏緫鍒犻櫎")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = Boolean.class))}
- )
- })
- @GetMapping(path = "delete")
- @SsoAop()
- public BaseResponse<Boolean> delete(Long id){
- if(id == null){
- return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
- }
- int count;
- try {
- count = this.sv.delete(id);
- } catch (Exception e) {
- log.error("淇濆瓨璁＄畻鍙傛暟寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
- }
- }
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/param/ParamSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/param/ParamSv.java
deleted file mode 100644
index bb69a82..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/param/ParamSv.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.dy.pipIrrModel.param;
-
-import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.daoMd.MdParamMapper;
-import com.dy.pipIrrGlobal.pojoMd.MdParam;
-import com.dy.pipIrrGlobal.voMd.VoParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Author: liurunyu
- * @Date: 2025/8/6 13:44
- * @Description
- */
-
-@Slf4j
-@Service
-public class ParamSv {
-
- private MdParamMapper mdParamDao ;
-
- @Autowired
- private void setDao(MdParamMapper dao) { this.mdParamDao = dao; }
-
- /**
- * 寰楀埌涓�涓垎姘村彛
- * @param id 鍒嗘按鍙D
- * @return 鍒嗘按鍙ｅ疄浣�
- */
- public VoParam selectById(Long id){
- return this.mdParamDao.selectById(id) ;
- }
-
- /**
- * 鏌ヨ鎵�鏈夊疄浣�
- * @return 鍖呭惈瀹炰綋闆嗗悎鐨勭粨鏋滃璞�
- */
- @SuppressWarnings("unchecked")
- public List<VoParam> selectAll(Long cropsId){
- return this.mdParamDao.selectAll(cropsId) ;
- }
- /**
- * 娣诲姞瀹炰綋
- * @param po 瀹炰綋
- * @return 瀹炰綋ID
- */
- public Integer save(MdParam po){
- return mdParamDao.insert(po);
- }
- /**
- * 淇敼瀹炰綋
- * @param po
- * @return
- */
- public int update(MdParam po) {
- return mdParamDao.updateByPrimaryKeySelective(po);
- }
-
- /**
- * 鏍规嵁瀹炰綋ID閫昏緫鍒犻櫎瀹炰綋
- * @param id 瀹炰綋
- * @return
- */
- public Integer delete(Long id) {
- return mdParamDao.deleteByPrimaryKey(id);
- }
-
-}
--
Gitblit v1.8.0