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; pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoMd/MdParamMapper.java
File was deleted 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否 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdParam.java
File was deleted 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; /** pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoParam.java
File was deleted 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}, pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdParamMapper.xml
File was deleted 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") 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; pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/param/ParamCtrl.java
File was deleted pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/param/ParamSv.java
File was deleted
