Explorar o código

调整井参数管理接口(调整、增加字段)

chenwen %!s(int64=2) %!d(string=hai) anos
pai
achega
ee4fda80fa

+ 4 - 3
src/main/java/com/hb/proj/base/controller/ParamMgrController.java

@@ -80,11 +80,12 @@ public class ParamMgrController {
 	 */
 	@RequestMapping("/add")
 	@SysLog("新增参数类型定义:{arg0.paramName}")
-	public RespVO<String> add(ParamDefinePO param,AccessToken token){
+	public RespVO<String> add(@Validated ParamDefinePO param,AccessToken token){
 		 ParamDefinePO dbParam=service.getByCode(param.getParamCode());
 		 if(dbParam!=null) {
 			 return RespVOBuilder.error("该参数编码已在使用,请更换");
 		 }
+		 param.setParamCode(param.getParamCode().toLowerCase());
 		 param.setModifyTime(new Date());
 		 param.setModifyBy(token.getTokenId());
 		 return RespVOBuilder.ok(service.add(param));
@@ -100,8 +101,8 @@ public class ParamMgrController {
 	 */
 	@RequestMapping("/update")
 	@SysLog("更新参数类型定义:{arg0.paramName}")
-	public RespVO<Object> update(ParamDefinePO param,AccessToken token){
-		
+	public RespVO<Object> update(@Validated ParamDefinePO param,AccessToken token){
+		param.setParamCode(param.getParamCode().toLowerCase());
 		param.setDelIf(false);
 		param.setModifyTime(new Date());
 		param.setModifyBy(token.getTokenId());

+ 1 - 1
src/main/java/com/hb/proj/base/service/ParamMgrService.java

@@ -22,7 +22,7 @@ public class ParamMgrService {
 	
 	
 	public List<ParamDefinePO>  loadAll(){
-		return dao.queryForList("select param_name,param_code,param_unit from tzl_param_define  where del_if=false order by param_name", ParamDefinePO.class);
+		return dao.queryForList("select param_name,param_code,param_unit from tzl_param_define  where del_if=false order by param_code", ParamDefinePO.class);
 	}
 	
 	

+ 2 - 0
src/main/java/com/hb/proj/model/ParamDefinePO.java

@@ -2,6 +2,7 @@ package com.hb.proj.model;
 
 import java.util.Date;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Data
@@ -9,6 +10,7 @@ public class ParamDefinePO {
 
 	private String id;
 	
+	@NotBlank(message="参数编码不能为空")
 	private String paramCode;
 	
 	private String paramName;

+ 14 - 4
src/main/java/com/hb/proj/model/WellParamPO.java

@@ -15,19 +15,29 @@ public class WellParamPO {
 	
 	private String paramCode;
 	
-	private String paramUnit;
+	private String displayUnit;
 	
-	private String unitScale;
+	private String insertUnit;
 	
-	private String unitGroup;
+	private String gatherUnit;
 	
-	private String format;
+	private Double disInsScale;
+	
+	private Double gatInsScale;
+	
+	private String displayFormat;
 	
 	private Boolean delIf;
 	
 	private String modifyBy;
 	
 	private Date modifyTime;
+	
+	private Double calibrateA;
+	
+	private Double calibrateB;
+	
+	private Double calibrateC;
 
 	
 }