git-svn-id: https://192.168.57.71/svn/lyggkj@72 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/cg/CgdtjkController.java

@@ -1,10 +1,15 @@
 package com.jtgh.yjpt.controller.cg;
 
+import java.util.Map;
+
 import org.activiti.engine.impl.util.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.jtgh.yjpt.service.cg.CgdtjkService;
+
 /**
  * 储罐动态信息交换接口controller
  * 
@@ -14,6 +19,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 @RequestMapping("cg")
 public class CgdtjkController {
+	
+	@Autowired
+	private CgdtjkService cgdtjkService;
+	
 	/**
 	 * 储罐信息设置接口
 	 * 
@@ -22,14 +31,11 @@ public class CgdtjkController {
 	 */
 	@RequestMapping(value = "/sz")
 	@ResponseBody
-	public JSONObject sz(CgjkszBean cgjksz) {
+	public Map<String, String> sz(CgjkszBean cgjkszBean) {
+		// 设置储罐适用范围信息
+		Map<String, String> mapObj = cgdtjkService.sz(cgjkszBean);
 		// 返回结果信息
-		JSONObject jsonObj = new JSONObject();
-		// 消息编码
-		jsonObj.put("CODE", "M001");
-		// 消息内容
-		jsonObj.put("MSG", "操作成功");
-		return jsonObj;
+		return mapObj;
 	}
 
 	/**
@@ -40,13 +46,10 @@ public class CgdtjkController {
 	 */
 	@RequestMapping(value = "/jk")
 	@ResponseBody
-	public JSONObject jk(CgjkxxBean cgjkxx) {
+	public Map<String, String> jk(CgjkxxBean cgjkxxBean) {
+		// 设置储罐监控信息
+		Map<String, String> mapObj = cgdtjkService.jk(cgjkxxBean);
 		// 返回结果信息
-		JSONObject jsonObj = new JSONObject();
-		// 消息编码
-		jsonObj.put("CODE", "M009");
-		// 消息内容
-		jsonObj.put("MSG", "操作失败");
-		return jsonObj;
+		return mapObj;
 	}
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/cg/CgjkszBean.java

@@ -21,6 +21,8 @@ public class CgjkszBean {
 	private String zxwd;
 	// 最小压力
 	private String zxyl;
+	// 最小液位
+	private String zxyw;
 
 	public String getKey() {
 		return key;
@@ -85,7 +87,4 @@ public class CgjkszBean {
 	public void setZxyw(String zxyw) {
 		this.zxyw = zxyw;
 	}
-
-	// 最小液位
-	private String zxyw;
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/yjgl/zdwxyfb/CgDao.java

@@ -102,4 +102,9 @@ public interface CgDao extends MyRepository<CgEntity, Long> {
 
 	@Query("from CgEntity where dwmc=?1 and cgqmc like '%?2%' and  recordStatus<>9 ")
 	public List<CgEntity> findByJyrAndName(JyrEntity jyr, String name);
+	
+	@Query(value = "select b.* from T_YJPT_JYRREL a "
+			+ " LEFT JOIN T_YJPT_CG b ON A.JYRID = b.DWMC "
+			+ " WHERE A.KEY = ?1 and b.QYCCBH = ?2" , nativeQuery = true)
+	public List<CgEntity> getCgByKeyAndBh(String key, String cgbh);
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/yjgl/zdwxyfb/CgztEntity.java

@@ -39,6 +39,23 @@ public class CgztEntity extends BaseEntity<Long> {
 	private String zt;
 	/** 填报时间*/
 	private Date tbsj;
+	
+	/** 高位温度℃ */
+	private String gwwd;
+	/** 低位温度℃ */
+	private String dwwd;
+	/** 当前货物容积，单位M³ */
+	private String wlrj;
+	/** 储罐的总容积，单位M³ */
+	private String cgrj;
+	/** 物料密度（t/m³） */
+	private String md;
+	/** 物料质量(t) */
+	private String zl;
+	/** 气体浓度，单位PPM。如2.39ppm */
+	private String qtnd;
+	
+	
 	@Transient
 	public String getSequenceName() {
 		return Constants.SEQ_T_YJPT_CGZT;
@@ -103,4 +120,74 @@ public class CgztEntity extends BaseEntity<Long> {
 		this.zt = zt;
 	}
 
+
+	public String getGwwd() {
+		return gwwd;
+	}
+
+
+	public void setGwwd(String gwwd) {
+		this.gwwd = gwwd;
+	}
+
+
+	public String getDwwd() {
+		return dwwd;
+	}
+
+
+	public void setDwwd(String dwwd) {
+		this.dwwd = dwwd;
+	}
+
+
+	public String getWlrj() {
+		return wlrj;
+	}
+
+
+	public void setWlrj(String wlrj) {
+		this.wlrj = wlrj;
+	}
+
+
+	public String getCgrj() {
+		return cgrj;
+	}
+
+
+	public void setCgrj(String cgrj) {
+		this.cgrj = cgrj;
+	}
+
+
+	public String getMd() {
+		return md;
+	}
+
+
+	public void setMd(String md) {
+		this.md = md;
+	}
+
+
+	public String getZl() {
+		return zl;
+	}
+
+
+	public void setZl(String zl) {
+		this.zl = zl;
+	}
+
+
+	public String getQtnd() {
+		return qtnd;
+	}
+
+
+	public void setQtnd(String qtnd) {
+		this.qtnd = qtnd;
+	}
+
 }

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/cg/CgdtjkService.java

@@ -0,0 +1,20 @@
+package com.jtgh.yjpt.service.cg;
+
+import java.util.Map;
+
+import com.jtgh.yjpt.controller.cg.CgjkszBean;
+import com.jtgh.yjpt.controller.cg.CgjkxxBean;
+
+
+public interface CgdtjkService {
+
+    /**
+     * 储罐信息设置
+     */
+    public Map<String, String> sz(CgjkszBean cgjksz);
+    
+    /**
+     * 储罐监控信息
+     */
+    public Map<String, String> jk(CgjkxxBean cgjkxx);
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/cg/CgdtjkServiceImpl.java

@@ -0,0 +1,165 @@
+package com.jtgh.yjpt.service.impl.cg;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.h2.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.jtgh.yjpt.controller.cg.CgjkszBean;
+import com.jtgh.yjpt.controller.cg.CgjkxxBean;
+import com.jtgh.yjpt.dao.yjgl.zdwxyfb.CgDao;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgsyEntity;
+import com.jtgh.yjpt.entity.yjgl.zdwxyfb.CgztEntity;
+import com.jtgh.yjpt.service.cg.CgdtjkService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgsyService;
+import com.jtgh.yjpt.service.yjgl.zdwxyfb.CgztService;
+
+@Service
+public class CgdtjkServiceImpl implements CgdtjkService {
+
+	@Autowired
+	private CgService cgService;
+	@Autowired
+	private CgztService cgztService;
+	@Autowired
+	private CgsyService cgsyService;
+	@Autowired
+	private CgDao cgDao;
+	
+	private String CODE_KEY = "CODE";
+	private String MSG_KEY = "MSG";
+
+	/**
+     * 储罐信息设置
+     */
+    public Map<String, String> sz(CgjkszBean cgjkszBean) {
+    	Map<String, String> mapObj = new HashMap<String, String>();
+    	if(StringUtils.isNullOrEmpty(cgjkszBean.getKey()) || 
+    			StringUtils.isNullOrEmpty(cgjkszBean.getCgbh())) {
+    		// 消息编码
+    		mapObj.put(CODE_KEY, "M009");
+    		// 消息内容
+    		mapObj.put(MSG_KEY, "操作失败， 请传递正确的KEY和储罐编号！");
+    		return mapObj;
+    	}
+    	List<CgEntity> objList = cgDao.getCgByKeyAndBh(cgjkszBean.getKey(), cgjkszBean.getCgbh());
+    	Long cgId = -1L;
+    	if(null != objList && objList.size() > 0) {
+    		cgId = objList.get(0).getId();
+    	} else {
+    		// 消息编码
+    		mapObj.put(CODE_KEY, "M009");
+    		// 消息内容
+    		mapObj.put(MSG_KEY, "操作失败， 未找到相应储罐！");
+    		return mapObj;
+    	}
+    	CgEntity cgEntity = new CgEntity();
+    	cgEntity.setId(cgId);
+    	// 根据储罐信息查找储罐适用信息
+    	CgsyEntity cgsyEntity = cgsyService.findByCg(cgEntity);
+    	if(null != cgsyEntity) {
+        	// 设置储罐适用信息
+    		// 最大温度
+    		cgsyEntity.setZdwd(cgjkszBean.getZdwd());
+    		// 最大压力
+    		cgsyEntity.setZdyl(cgjkszBean.getZdyl());
+    		// 最大液位
+    		cgsyEntity.setZdyw(cgjkszBean.getZdyw());
+    		// 最小温度
+    		cgsyEntity.setZxwd(cgjkszBean.getZxwd());
+    		// 最小压力
+    		cgsyEntity.setZxyl(cgjkszBean.getZxyl());
+    		// 最小液位
+    		cgsyEntity.setZxyw(cgjkszBean.getZxyw());
+    		// 更新日期
+    		cgsyEntity.setUpdateDate(new Date());
+        	// 保存 
+        	cgsyService.save(cgsyEntity);
+    	} else {
+    		// 消息编码
+    		mapObj.put(CODE_KEY, "M009");
+    		// 消息内容
+    		mapObj.put(MSG_KEY, "操作失败， 未找到相应储罐。");
+        	return mapObj;
+    	}
+		// 消息编码
+		mapObj.put(CODE_KEY, "M001");
+		// 消息内容
+		mapObj.put(MSG_KEY, "操作成功");
+    	return mapObj;
+    }
+    
+    /**
+     * 储罐监控信息
+     */
+    public Map<String, String> jk(CgjkxxBean cgjkxxBean) {
+    	Map<String, String> mapObj = new HashMap<String, String>();
+    	if(StringUtils.isNullOrEmpty(cgjkxxBean.getKey()) || 
+    			StringUtils.isNullOrEmpty(cgjkxxBean.getCgbh())) {
+    		// 消息编码
+    		mapObj.put(CODE_KEY, "M009");
+    		// 消息内容
+    		mapObj.put(MSG_KEY, "操作失败， 请传递正确的KEY和储罐编号！");
+    		return mapObj;
+    	}
+    	List<CgEntity> objList = cgDao.getCgByKeyAndBh(cgjkxxBean.getKey(), cgjkxxBean.getCgbh());
+    	CgEntity cgEntity = null;
+    	if(null != objList && objList.size() > 0) {
+    		cgEntity = objList.get(0);
+    	} else {
+    		// 消息编码
+    		mapObj.put(CODE_KEY, "M009");
+    		// 消息内容
+    		mapObj.put(MSG_KEY, "操作失败， 未找到相应储罐！");
+    		return mapObj;
+    	}
+    	// 根据储罐信息查找储罐适用信息
+    	CgztEntity cgztEntity = new CgztEntity();
+		// 货种中文名称
+		cgztEntity.setHz(cgjkxxBean.getHz());
+		// 当前压力单位MPa
+		cgztEntity.setYl(cgjkxxBean.getYl());
+		// 当前液位单位m
+		cgztEntity.setYw(cgjkxxBean.getYw());
+		// 温度
+		cgztEntity.setWd(cgjkxxBean.getGwwd());
+		// 高位温度℃
+		cgztEntity.setGwwd(cgjkxxBean.getGwwd());
+		// 低位温度℃
+		cgztEntity.setDwwd(cgjkxxBean.getDwwd());
+		// 当前货物容积，单位M³
+		cgztEntity.setWlrj(cgjkxxBean.getWlrj());
+		// 储罐的总容积，单位M³
+		cgztEntity.setCgrj(cgjkxxBean.getCgrj());
+		// 物料密度（t/m³）
+		cgztEntity.setMd(cgjkxxBean.getMd());
+		// 物料质量(t)
+		cgztEntity.setZl(cgjkxxBean.getZl());
+		// 气体浓度，单位PPM。如2.39ppm
+		cgztEntity.setQtnd(cgjkxxBean.getQtnd());
+    	// 设置储罐监控信息
+    	cgztEntity.setCg(cgEntity);
+		cgztEntity.setRecordCode(cgEntity.getRecordCode());
+		cgztEntity.setSzd(cgEntity.getSzd());
+		// 填报时间
+		cgztEntity.setTbsj(new Date());
+		// 增加日期
+		cgztEntity.setAddDate(new Date());
+		// 更新日期
+		cgztEntity.setUpdateDate(new Date());
+    	// 保存 
+    	cgztService.saveCgzt(cgztEntity);
+		// 消息编码
+		mapObj.put(CODE_KEY, "M001");
+		// 消息内容
+		mapObj.put(MSG_KEY, "操作成功");
+    	return mapObj;
+    }
+
+}