|  | @@ -3,6 +3,8 @@ package com.miniframe.bisiness.system;
 | 
											
												
													
														|  |  import java.util.ArrayList;
 |  |  import java.util.ArrayList;
 | 
											
												
													
														|  |  import java.util.List;
 |  |  import java.util.List;
 | 
											
												
													
														|  |  import java.util.Map;
 |  |  import java.util.Map;
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +import com.alibaba.nacos.shaded.io.grpc.netty.shaded.io.netty.util.internal.StringUtil;
 | 
											
												
													
														|  |  import com.miniframe.core.ExecProcessFlow;
 |  |  import com.miniframe.core.ExecProcessFlow;
 | 
											
												
													
														|  |  import com.miniframe.core.exception.BusinessException;
 |  |  import com.miniframe.core.exception.BusinessException;
 | 
											
												
													
														|  |  import com.miniframe.core.ext.UtilTools;
 |  |  import com.miniframe.core.ext.UtilTools;
 | 
											
										
											
												
													
														|  | @@ -14,7 +16,6 @@ import com.miniframe.model.system.*;
 | 
											
												
													
														|  |  import com.miniframe.model.system.dao.DAccidentMapper;
 |  |  import com.miniframe.model.system.dao.DAccidentMapper;
 | 
											
												
													
														|  |  import com.miniframe.model.system.dao.DChecknodeValMapper;
 |  |  import com.miniframe.model.system.dao.DChecknodeValMapper;
 | 
											
												
													
														|  |  import com.miniframe.model.system.dao.DChecknodeValcodeMapper;
 |  |  import com.miniframe.model.system.dao.DChecknodeValcodeMapper;
 | 
											
												
													
														|  | -import tk.mybatis.mapper.util.StringUtil;
 |  | 
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  /**
 |  |  /**
 | 
											
												
													
														|  |   * 基础系统,“监测点结果获取”逻辑处理(重新生成不覆盖)。
 |  |   * 基础系统,“监测点结果获取”逻辑处理(重新生成不覆盖)。
 | 
											
										
											
												
													
														|  | @@ -80,38 +81,37 @@ public class D10018Service extends D10018BaseModel implements ExecProcessFlow {
 | 
											
												
													
														|  |  	}
 |  |  	}
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  	private void setCodes(DChecknodeValcode valcode, List<D_D10018_CODES_RECODE> codes) {
 |  |  	private void setCodes(DChecknodeValcode valcode, List<D_D10018_CODES_RECODE> codes) {
 | 
											
												
													
														|  | -		if(!StringUtil.isEmpty(valcode.getValCode1()));
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(!StringUtil.isNullOrEmpty(valcode.getValCode1()))
 | 
											
												
													
														|  |  		{
 |  |  		{
 | 
											
												
													
														|  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 |  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 | 
											
												
													
														|  |  			code.setCode(valcode.getValCode1());
 |  |  			code.setCode(valcode.getValCode1());
 | 
											
												
													
														|  |  			codes.add(code);
 |  |  			codes.add(code);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  | -		if(!StringUtil.isEmpty(valcode.getValCode2()));
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(!StringUtil.isNullOrEmpty(valcode.getValCode2()))
 | 
											
												
													
														|  |  		{
 |  |  		{
 | 
											
												
													
														|  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 |  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 | 
											
												
													
														|  |  			code.setCode(valcode.getValCode2());
 |  |  			code.setCode(valcode.getValCode2());
 | 
											
												
													
														|  |  			codes.add(code);
 |  |  			codes.add(code);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -		if(!StringUtil.isEmpty(valcode.getValCode3()));
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(!StringUtil.isNullOrEmpty(valcode.getValCode3()))
 | 
											
												
													
														|  |  		{
 |  |  		{
 | 
											
												
													
														|  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 |  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 | 
											
												
													
														|  |  			code.setCode(valcode.getValCode3());
 |  |  			code.setCode(valcode.getValCode3());
 | 
											
												
													
														|  |  			codes.add(code);
 |  |  			codes.add(code);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  | -		if(!StringUtil.isEmpty(valcode.getValCode4()));
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(!StringUtil.isNullOrEmpty(valcode.getValCode4()))
 | 
											
												
													
														|  |  		{
 |  |  		{
 | 
											
												
													
														|  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 |  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 | 
											
												
													
														|  |  			code.setCode(valcode.getValCode4());
 |  |  			code.setCode(valcode.getValCode4());
 | 
											
												
													
														|  |  			codes.add(code);
 |  |  			codes.add(code);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  | -		if(!StringUtil.isEmpty(valcode.getValCode5()));
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(!StringUtil.isNullOrEmpty(valcode.getValCode5()))
 | 
											
												
													
														|  |  		{
 |  |  		{
 | 
											
												
													
														|  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 |  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 | 
											
												
													
														|  |  			code.setCode(valcode.getValCode5());
 |  |  			code.setCode(valcode.getValCode5());
 | 
											
												
													
														|  |  			codes.add(code);
 |  |  			codes.add(code);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  | -		if(!StringUtil.isEmpty(valcode.getValCode6()));
 |  | 
 | 
											
												
													
														|  | 
 |  | +		if(!StringUtil.isNullOrEmpty(valcode.getValCode6()))
 | 
											
												
													
														|  |  		{
 |  |  		{
 | 
											
												
													
														|  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 |  |  			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
 | 
											
												
													
														|  |  			code.setCode(valcode.getValCode6());
 |  |  			code.setCode(valcode.getValCode6());
 | 
											
										
											
												
													
														|  | @@ -119,6 +119,7 @@ public class D10018Service extends D10018BaseModel implements ExecProcessFlow {
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  |  	}
 |  |  	}
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  	/**
 |  |  	/**
 | 
											
												
													
														|  |  	 * 基础系统,“监测点结果获取”业务前处理
 |  |  	 * 基础系统,“监测点结果获取”业务前处理
 | 
											
												
													
														|  |   	 */
 |  |   	 */
 |