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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/LoginFilter.java

@@ -33,7 +33,8 @@ public class LoginFilter implements Filter {
 			"/yjpt/resource.*", "/yjpt/img.*", "/yjpt/messagebroker/amf.*",
 			"/yjpt/upload.*", "/yjpt/downloadImage.*",
 			"/yjpt/.*QrCodePrint.do", "/yjpt/checkcode.do", "/yjpt/state.do",
-			"/yjpt/loginForExtra.do" ,"/yjpt/jyxkzAndFz.do","/yjpt/downloadYhsc.do","/yjpt/GetmSignatureData.do"};
+			"/yjpt/loginForExtra.do" ,"/yjpt/jyxkzAndFz.do","/yjpt/downloadYhsc.do","/yjpt/GetmSignatureData.do",
+			"/yjpt/cg/sz.do","/yjpt/cg/jk.do"};
 
 	/**
 	 * 初始化

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

@@ -5,6 +5,7 @@ import java.util.Map;
 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.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.jtgh.yjpt.service.cg.CgdtjkService;
@@ -27,8 +28,16 @@ public class CgdtjkController {
 	 * 
 	 * @param jsonStr
 	 * @return
+	 * 
+	 * {
+	 * 		@RequestMapping(value = "/sz",method=RequestMethod.GET)
+	 * 		@RequestParam String key,@RequestParam String cgbh,@RequestParam String zdwd,@RequestParam String zdyl,@RequestParam String zdyw
+	 * 
+	 * 		@RequestBody CgjkszBean cgjkszBean
+	 * 		@RequestMapping(value = "/sz",method=RequestMethod.POST)
+	 * }
 	 */
-	@RequestMapping(value = "/sz")
+	@RequestMapping(value = "/sz",method=RequestMethod.GET)//POST方式，bean属性都是空的？
 	@ResponseBody
 	public Map<String, String> sz(CgjkszBean cgjkszBean) {
 		// 设置储罐适用范围信息

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

@@ -1,11 +1,12 @@
 package com.jtgh.yjpt.controller.cg;
 
+
 /**
  * 储罐设置bean
  * 
  * @author yuanxd
  *
- */
+ */ 
 public class CgjkszBean {
 	// uuid
 	private String key;

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

@@ -103,8 +103,8 @@ 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)
+	@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/jyr/JyrEntity.java

@@ -2,6 +2,7 @@ package com.jtgh.yjpt.entity.jyr;
 
 import java.util.Date;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
@@ -127,6 +128,17 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 	/** 行政区划 */
 	private CodeEntity xzqh;
 
+	private Integer dangerSrcUnitNum;
+
+	@Column(name = "DANGER_SRC_UNIT_NUM")
+	public Integer getDangerSrcUnitNum() {
+		return dangerSrcUnitNum;
+	}
+
+	public void setDangerSrcUnitNum(Integer dangerSrcUnitNum) {
+		this.dangerSrcUnitNum = dangerSrcUnitNum;
+	}
+	
 	@ManyToOne(fetch = FetchType.EAGER, targetEntity = JyrEntity.class)
 	@JoinColumn(name = "parent_jyr_id")
 	public JyrEntity getParentJyr() {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/yjgl/cg/CgxxglWebService.java

@@ -183,8 +183,7 @@ public class CgxxglWebService extends BaseController {
 	 * @return
 	 */
 	public List<CgEntity> getCgPageListByParams(final Long szd,
-			final Long szgq, final Long gkjyr, final String cgmc, int n,
-			int pageCount) {
+			final Long szgq, final Long gkjyr, final String cgmc, int n,int pageCount) {
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zcdc/zc/ZczbWebService.java

@@ -627,7 +627,7 @@ public class ZczbWebService extends BaseController {
 	
 	
 	/**
-	 * 获得根据储罐获取自查隐患列表数据总条数  
+	 * 获得根据储罐获取自查隐患列表  数据总条数  
 	 * @param cgId
 	 * @return
 	 */

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -25,7 +25,7 @@ web.service.url=localhost
 web.service.port=8087
 
 # Province WebService 
-web.province.service.url = 192.168.57.37
+web.province.service.url = 192.168.57.71
 web.province.service.port=8089
 
 #\u4f5c\u4e1a\u7533\u62a5\uff0c\u95f4\u9694\u7684\u65f6\u95f4\uff0c\u5fc5\u987b\u5b8c\u6210

gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -8832,4 +8832,8 @@ ALTER TABLE T_YJPT_DC ADD (CG NUMBER NULL)  ;
 COMMENT ON COLUMN T_YJPT_DC.CG IS '储罐id'; 
 --补上自查隐患中CG的comments
 COMMENT ON COLUMN T_YJPT_ZCYH.CG IS '储罐id';
+</#if>
+<#if versionDate?date("yyyyMMdd") lt "20161206"?date("yyyyMMdd")>
+ALTER TABLE T_YJPT_JYRJCXX ADD DANGER_SRC_UNIT_NUM NUMBER;
+COMMENT ON COLUMN T_YJPT_JYRJCXX.DANGER_SRC_UNIT_NUM IS '重大危险源单元';
 </#if>

gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml

@@ -7,7 +7,7 @@
 	<context-param>
 		<description>系统版本</description>
 		<param-name>version</param-name>
-		<param-value>4.1.3</param-value>
+		<param-value>4.2.1</param-value>
 	</context-param>	
 	<context-param>
 		<description>0:省级;1:市级</description>