增加功图诊断标准功图管理模块

src/main/java/com/hb/proj/analysis/controller/DiagramDiagnoseController.java

@@ -0,0 +1,112 @@
+package com.hb.proj.analysis.controller;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.hb.proj.allconfig.AccessToken;
+import com.hb.proj.allconfig.SysLog;
+import com.hb.proj.analysis.service.DiagramDiagnoseService;
+import com.hb.proj.model.DiagramDiagnoseStandardPO;
+import com.hb.proj.model.DiagramDiagnoseStandardVO;
+import com.hb.proj.utils.RequestParams;
+import com.hb.proj.utils.RespVO;
+import com.hb.proj.utils.RespVOBuilder;
+import com.hb.xframework.dao.util.PageModel;
+
+import jakarta.validation.constraints.NotBlank;
+
+@RestController
+@RequestMapping("/diagnose/standard")
+@Validated
+public class DiagramDiagnoseController {
+
+	@Autowired
+	private DiagramDiagnoseService  service;
+	
+	@Value("${upload.access.path}")
+	private String accessPathPre;
+	
+	/**
+	 * 查询标准功图记录
+	 * @param params  查询参数
+	 * @param pageNum  页码
+	 * @param pageSize 每页记录数
+	 * @return
+	 */
+	@RequestMapping("/query")
+	public RespVO<PageModel<DiagramDiagnoseStandardVO>> query(RequestParams params,
+			@RequestParam(value = "currentPage", defaultValue = "1") Integer pageNum,
+			@RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize) {
+		return RespVOBuilder.ok(service.query(params.getObjectMap(), pageNum, pageSize));
+	}
+	
+	
+	/**
+	 * 获得单个标准功图记录
+	 * @param diagnoseId 记录id
+	 * @return
+	 */
+	@RequestMapping("/get")
+	public RespVO<DiagramDiagnoseStandardVO> get(@NotBlank(message = "缺少记录号") String diagnoseId){
+		DiagramDiagnoseStandardVO vo=service.get(diagnoseId);
+		if(vo.getAccessPath()!=null) {
+			vo.setAccessPath(accessPathPre+vo.getAccessPath());
+		}
+		
+		return RespVOBuilder.ok(vo);
+	}
+	
+	
+	/**
+	 * 删除单个标准功图记录
+	 * @param diagnoseId  待删除记录id
+	 * @return
+	 */
+	@RequestMapping("/delete")
+	@SysLog("删除设备信息：{arg0}")
+	public RespVO<Object> delete(String diagnoseId){
+		service.delete(diagnoseId);
+		return RespVOBuilder.ok();
+	}
+	
+
+	/**
+	 * 增加新标准功图记录
+	 * @param diagnosePO 标准功图记录实体对象
+	 * @param token  当前登录实体
+	 * @return
+	 */
+	@RequestMapping("/add")
+	public RespVO<String> add(@Validated DiagramDiagnoseStandardPO diagnosePO,AccessToken token){
+		 diagnosePO.setModifyBy(token.getUsName());
+		 return RespVOBuilder.ok(service.add(diagnosePO));
+		
+	}
+	
+	
+	/**
+	 * 更新标准功图记录
+	 * @param diagnosePO 标准功图记录实体对象
+	 * @param token  当前登录实体
+	 * @return
+	 */
+	@RequestMapping("/update")
+	public RespVO<Object> update(@Validated DiagramDiagnoseStandardPO diagnosePO,AccessToken token){
+		DiagramDiagnoseStandardPO dbDiagnose=service.getPO(diagnosePO.getDiagnoseId());
+		if(dbDiagnose==null) {
+			return RespVOBuilder.error("该记录已不存在");
+		}
+		dbDiagnose.setModifyBy(token.getUsName());
+		BeanUtils.copyProperties(diagnosePO, dbDiagnose);
+		service.update(dbDiagnose);
+		
+		return RespVOBuilder.ok();
+	  
+		
+	}
+}

src/main/java/com/hb/proj/analysis/service/DiagramDiagnoseService.java

@@ -0,0 +1,84 @@
+package com.hb.proj.analysis.service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.hb.proj.model.DiagramDiagnoseStandardPO;
+import com.hb.proj.model.DiagramDiagnoseStandardVO;
+import com.hb.xframework.dao.core.SpringJdbcDAO;
+import com.hb.xframework.dao.util.PageModel;
+import com.hb.xframework.dao.util.UUIDHexGenerator;
+
+@Service
+public class DiagramDiagnoseService {
+
+	@Autowired
+	private SpringJdbcDAO  dao;
+	
+	
+	public PageModel<DiagramDiagnoseStandardVO> query(Map<String,Object> args,int pageNo,int pageSize){
+		
+		List<Object> sqlParams=new ArrayList<Object>();
+		StringBuilder sql=new StringBuilder(100);
+		sql.append("select d.*,access_path ");
+		sql.append(" from tzl_diagram_diagnose_standard d ");
+		sql.append(" left join tsys_file_info f on d.file_id=f.file_id");
+		sql.append(" where d.del_if=false ");
+		
+		if(args!=null&&StringUtils.isNotBlank((String)args.get("conclusion"))) {
+			sql.append(" and conclusion like ? ");
+			sqlParams.add("%"+args.get("conclusion")+"%");
+		}
+		
+		sql.append(" order by create_time");
+		
+		Object[] sqlArgs=sqlParams.size()>0?sqlParams.toArray():null;
+		return dao.queryForPagedData(sql.toString(),pageNo, pageSize,DiagramDiagnoseStandardVO.class ,sqlArgs);
+		
+	}
+	
+	public String add(DiagramDiagnoseStandardPO diagnosePO) {
+		UUIDHexGenerator uuid=UUIDHexGenerator.getInstance();
+		diagnosePO.setDiagnoseId(uuid.generate());
+		diagnosePO.setModifyTime(new Date());
+		diagnosePO.setDelIf(false);
+		dao.insert(diagnosePO,"tzl_diagram_diagnose_standard");
+		return diagnosePO.getDiagnoseId();
+	}
+	
+	public boolean delete(String diagnoseId) {
+		String sql="update  tzl_diagram_diagnose_standard set del_if=true,modify_time=now() where diagnose_id=?";
+		dao.exeUpdate(sql,diagnoseId);
+		return true;
+	}
+	
+	public DiagramDiagnoseStandardVO get(String diagnoseId) {
+		String sql="""
+				 select d.*,f.access_path from tzl_diagram_diagnose_standard d 
+				 left join tsys_file_info f on d.file_id=f.file_id and d.del_if=false
+				 where d.diagnose_id=?
+				""";
+		return dao.queryForPojo(sql,DiagramDiagnoseStandardVO.class,diagnoseId);
+	}
+	
+	public DiagramDiagnoseStandardPO getPO(String diagnoseId) {
+		String sql="""
+				 select d.* from tzl_diagram_diagnose_standard d 
+				 where d.diagnose_id=?
+				""";
+		return dao.queryForPojo(sql,DiagramDiagnoseStandardPO.class,diagnoseId);
+	}
+	
+	public boolean update(DiagramDiagnoseStandardPO diagnosePO) {
+		diagnosePO.setModifyTime(new Date());
+		diagnosePO.setDelIf(false);
+		return dao.update(diagnosePO, "tzl_diagram_diagnose_standard", "diagnose_id")>0;
+	}
+	
+}

src/main/java/com/hb/proj/model/DiagramDiagnoseStandardPO.java

@@ -0,0 +1,88 @@
+package com.hb.proj.model;
+
+import java.util.Date;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class DiagramDiagnoseStandardPO {
+
+	private String diagnoseId;
+	
+	/**
+	 * 标准图形文件id
+	 */
+	private String fileId;
+	
+	/**
+	 * 充满系数(%)
+	 */
+	private Double fillCoe;
+	
+	/**
+	 * 漏失系数
+	 */
+	private Double leakCoe;
+	
+	/**
+	 * 气体影响程度  如：严重、一般
+	 */
+	private String gasEffect;
+	
+	/**
+	 * 排出漏失系数
+	 */
+	private Double dischargeLeakCoe;
+	
+	/**
+	 * 吸入漏失系数
+	 */
+	private Double  inhaleLeakCoe;
+	
+	/**
+	 * 油管漏失系数
+	 */
+	private Double  pipeLeakCoe;
+	
+	/**
+	 * 出砂程度  如：严重、一般
+	 */
+	private String sandDegree;
+	
+	/**
+	 * 结蜡程度
+	 */
+	private String waxDegree;
+	
+	/**
+	 * 活塞脱出程度
+	 */
+	private String pistonSlipDegree;
+	
+	/**
+	 * 下行碰泵程度
+	 */
+	private String  pumpDownBump;
+	
+	/**
+	 * 诊断结论
+	 */
+	@NotBlank(message="诊断结论不能为空")
+	private String  conclusion;
+	
+	/**
+	 * 建议措施
+	 */
+	private String advise;
+	
+	private Date createTime;
+	
+	private Date modifyTime;
+	
+	private String createBy;
+	
+	private String modifyBy;
+	
+	private Boolean delIf;
+}

src/main/java/com/hb/proj/model/DiagramDiagnoseStandardVO.java

@@ -0,0 +1,11 @@
+package com.hb.proj.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class DiagramDiagnoseStandardVO extends DiagramDiagnoseStandardPO {
+
+	private String accessPath;
+}

src/main/resources/application-dev.properties

@@ -66,4 +66,7 @@ sys.admin.pwd=2f459bf76f471ff9753caffd1be02bac
 #gather api url
 gather.api.url=http://127.0.0.1:8090/zl-opd-gather
 
+#上传文件配置
+upload.access.path=http://127.0.0.1:8080/zl
+
 

src/main/resources/application-pro.properties

@@ -64,4 +64,7 @@ sys.admin.account=admin
 sys.admin.pwd=2f459bf76f471ff9753caffd1be02bac
 
 #gather api url
-gather.api.url=http://127.0.0.1:8090/zl-opd-gather
+gather.api.url=http://127.0.0.1:8090/zl-opd-gather
+
+#上传文件配置
+upload.access.path=http://42.56.120.107:9602/zl-opd-server