浏览代码

增加动液面量液配置模块(设置量液计算条件)

chenwen 1 周之前
父节点
当前提交
253e827836

+ 23 - 0
src/main/java/com/hb/proj/analysis/controller/LiquidMeasureController.java

@@ -17,11 +17,13 @@ import com.hb.proj.model.IPRRegressionPO;
 import com.hb.proj.model.LiquidMeasurePO;
 import com.hb.proj.model.LiquidMeasureVO;
 import com.hb.proj.model.LiquidPO;
+import com.hb.proj.model.WellConfigPO;
 import com.hb.proj.utils.DateParamUtils;
 import com.hb.proj.utils.RespVO;
 import com.hb.proj.utils.RespVOBuilder;
 import com.hb.xframework.dao.util.PageModel;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
@@ -109,4 +111,25 @@ public class LiquidMeasureController {
 		return RespVOBuilder.ok(service.loadYield(wellId, dates[0], dates[1]));
 	}
 	
+	/**
+	 * 获取动液面量液配置
+	 * @param wellId
+	 * @return
+	 */
+	@RequestMapping("/getConfig")
+	public RespVO<Object> getConfig(@NotBlank(message="缺少井号") String wellId){
+		return RespVOBuilder.ok(service.getConfig(wellId));
+	}
+	
+	/**
+	 * 保存动液面量液配置
+	 * @param config
+	 * @return
+	 */
+	@RequestMapping("/saveConfig")
+	public RespVO<Object> saveConfig(@Valid WellConfigPO config){
+		service.saveConfig(config);
+		return RespVOBuilder.ok();
+	}
+	
 }

+ 26 - 0
src/main/java/com/hb/proj/analysis/service/LiquidMeasureService.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 
 import com.hb.proj.model.LiquidMeasurePO;
 import com.hb.proj.model.LiquidMeasureVO;
+import com.hb.proj.model.WellConfigPO;
 import com.hb.xframework.dao.core.SpringJdbcDAO;
 import com.hb.xframework.dao.util.PageModel;
 
@@ -81,4 +82,29 @@ public class LiquidMeasureService {
 		measurePO.setCreateTime(new Date());
 		dao.insert(measurePO,"tzl_liquid_measure","measure_id");
 	}
+	
+	/**
+	 * 获取动液面量液配置
+	 * @param wellId
+	 * @return
+	 */
+	public WellConfigPO  getConfig(String wellId) {
+		return dao.queryForPojo("select * from tzl_well_config where well_id=? and del_if=false and config_type=? ", WellConfigPO.class, wellId,WellConfigPO.TYPE_LIQUID_MEASURE);
+	}
+	
+	/**
+	 * 保存动液面量液配置
+	 * @param config
+	 */
+	public void saveConfig(WellConfigPO config) {
+		String sql="update tzl_well_config set config_express=?,config_desc=?,modify_time=now() where well_id=? and config_type=? ";
+		int num=dao.exeUpdate(sql, config.getConfigExpress(),config.getConfigDesc(),config.getWellId(),WellConfigPO.TYPE_LIQUID_MEASURE);
+		if(num==0) {
+			config.setDelIf(false);
+			config.setModifyTime(new Date());
+			config.setConfigType(WellConfigPO.TYPE_LIQUID_MEASURE);
+			
+			dao.insert(config, "tzl_well_config", "rec_id");
+		}
+	}
 }

+ 30 - 0
src/main/java/com/hb/proj/model/WellConfigPO.java

@@ -0,0 +1,30 @@
+package com.hb.proj.model;
+
+import java.util.Date;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class WellConfigPO {
+	
+	public static final String  TYPE_LIQUID_MEASURE="liquid-measure";
+
+	private Integer recId;
+	
+	@NotBlank(message="井号不能为空")
+	private String wellId;
+	
+	private String useFor;
+	
+	private String configType;
+	
+	@NotBlank(message="表达式不能为空")
+	private String configExpress;
+	
+	private String configDesc;
+	
+	private Date modifyTime;
+	
+	private Boolean delIf;
+}