--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/constant/BaseRequestPath.java

@@ -18,6 +18,8 @@ public class BaseRequestPath {
 	public static final String IDSTRING = "id";
 	
 	public static final String RESOURCE = "/resource";
+	
+	public static final String BIGRESOURCE = "/bigresource";
 	// 一元
 	/** /{wid} 根据id获取 搭配@PathVariable使用 */
 	// 解决 {wid}占位符造成api冲突 

com.zrqx.core/src/main/java/com/zrqx/core/constant/geography/GeographyRequestPath.java

@@ -25,6 +25,9 @@ public class GeographyRequestPath extends BaseRequestPath{
 	/** 导入 */
 	public static final String DETAILED = "/detailed";
 	
+
+	
+	
 	/** 分类 */
 	public static final String QUERY = "/query";
 	
@@ -56,6 +59,19 @@ public class GeographyRequestPath extends BaseRequestPath{
 	/**key明细 */
 	public static final String KEYPDETAILED = "/keypdetailed";
 	
+	/** 大屏地理标志 */
+	public static final String GEOGRAPHYSIGN = "/geographysign";
+	
+	/** 大屏曲线图 */
+	public static final String DIAGRAM = "/diagram";
+	
+	
+	/** 大屏地理标志申请机构 */
+	public static final String APPLICANTAGENCY = "/applicantagency";
+	
+	/** 大屏省市县数量 */
+	public static final String PROVINCECOUNT = "/provincecount";
+	
 	
 	
 	

com.zrqx.core/src/main/java/com/zrqx/core/model/geography/ApprovalEnterprise.java

@@ -61,7 +61,7 @@ public class ApprovalEnterprise {
 	@ApiModelProperty(" 1：未爬数据 2：已爬数据 3：数据有问题")
 	private String ReptileState;
 	
-	@ApiModelProperty("冗余字段1")
+	@ApiModelProperty("冗余字段1,品类类型")
 	private String reserve1;
 	
 	@ApiModelProperty("冗余字段2,区分sorl查询用的字段")

com.zrqx.core/src/main/java/com/zrqx/core/vo/Geographysign/CategoryDateVo.java

+package com.zrqx.core.vo.Geographysign;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "CategoryDateVo", description = "查询分类返回数组Vo")
+public class CategoryDateVo {
+	
+	@ApiModelProperty(value = "品类名称")
+	 List <String> category;
+	
+	@ApiModelProperty(value = "注册数量")
+	 List <Integer> registerNumber;
+	
+	@ApiModelProperty(value = "核准企业数量")
+	 List <Integer> approvalNumber;
+	
+	
+}

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/mapper/geographysign/GeographysignMapper.java

@@ -283,6 +283,79 @@ public interface GeographysignMapper extends BaseMapper<Geographysign> {
 			+ " group by  province"
 		    + "</script>")
 	List<ProvinceVo> provincecount(@Param("form")GeographyForm form);
+	
+	
+	/** 大屏柱状图分类*/
+	@Select("<script>" 
+			+ "select reserve1 name from  dl_geographysign where 1 = 1"
+			+ "<if test='"+NOTBLANK+"(form.province) '>"  
+			+ " and province = #{form.province} "
+			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.city)'>"  
+			+ "and city = #{form.city}"
+            + "</if>"
+        	+ "<if test='"+ NOTBLANK +"(form.county)'>"  
+			+ "and county = #{form.county}"
+            + "</if>"
+		
+			+ "<if test='"+ NOTBLANK +"(form.signstate)'>"  
+			+ "and signstate = #{form.signstate}"
+			+ "</if>"
+			
+			+ "<if test='"+ NOTBLANK +"(form.categoryOne)'>"  
+			+ "and reserve1 = #{form.categoryOne}"
+			+ "</if>"
+			+ " GROUP BY reserve1 ORDER BY reserve1 desc"
+		    + "</script>")
+	List<String> categorystate(@Param("form")GeographyForm form);
+	
+	/** 大屏柱状图注册数据*/
+	@Select("<script>" 
+			+ "select count(reserve1) from dl_geographysign where 1 = 1 and registerState = '已注册'"
+			+ "<if test='"+NOTBLANK+"(form.province) '>"  
+			+ " and province = #{form.province} "
+			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.city)'>"  
+			+ "and city = #{form.city}"
+            + "</if>"
+        	+ "<if test='"+ NOTBLANK +"(form.county)'>"  
+			+ "and county = #{form.county}"
+            + "</if>"
+		
+			+ "<if test='"+ NOTBLANK +"(form.signstate)'>"  
+			+ "and signstate = #{form.signstate}"
+			+ "</if>"
+			
+			+ "<if test='"+ NOTBLANK +"(form.categoryOne)'>"  
+			+ "and reserve1 = #{form.categoryOne}"
+			+ "</if>"
+			+ " GROUP BY reserve1  ORDER BY reserve1 desc"
+		    + "</script>")
+	List<Integer> registerNumber(@Param("form")GeographyForm form);
+	
+	/** 大屏柱状图核准企业数量*/
+	@Select("<script>" 
+			+ "select count(reserve1) from dl_approvalenterprise where 1 = 1 "
+			+ "<if test='"+NOTBLANK+"(form.province) '>"  
+			+ " and province = #{form.province} "
+			+ "</if>" 
+			+ "<if test='"+ NOTBLANK +"(form.city)'>"  
+			+ "and city = #{form.city}"
+            + "</if>"
+        	+ "<if test='"+ NOTBLANK +"(form.county)'>"  
+			+ "and county = #{form.county}"
+            + "</if>"
+		
+			+ "<if test='"+ NOTBLANK +"(form.signstate)'>"  
+			+ "and signstate = #{form.signstate}"
+			+ "</if>"
+			
+			+ "<if test='"+ NOTBLANK +"(form.categoryOne)'>"  
+			+ "and reserve1 = #{form.categoryOne}"
+			+ "</if>"
+			+ " GROUP BY reserve1  ORDER BY reserve1 desc"
+		    + "</script>")
+	List<Integer> approvalNumber(@Param("form")GeographyForm form);
 
 
 }

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/service/geographysign/GeographysignService.java

@@ -10,6 +10,7 @@ import com.zrqx.core.util.CallBack;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.vo.Geographysign.CaregoryVo;
+import com.zrqx.core.vo.Geographysign.CategoryDateVo;
 import com.zrqx.core.vo.Geographysign.CountyVo;
 import com.zrqx.core.vo.Geographysign.GeographysignVo;
 import com.zrqx.core.vo.Geographysign.ProvinceQueryVo;
@@ -114,6 +115,12 @@ public interface GeographysignService extends BaseService<Geographysign, String>
 	 */
 	List<ProvinceVo>  provincecount(GeographyForm form);
 	
+	/**
+	 * 查询大屏品类树状图数据
+	 * @return
+	 */
+	CategoryDateVo querycategory(GeographyForm form);	
+	
 	
 	
 	

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/service/geographysign/GeographysignServiceImpl.java

@@ -21,6 +21,7 @@ import com.zrqx.core.util.CallBack;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.vo.Geographysign.CaregoryVo;
+import com.zrqx.core.vo.Geographysign.CategoryDateVo;
 import com.zrqx.core.vo.Geographysign.CountyTwoVo;
 import com.zrqx.core.vo.Geographysign.CountyVo;
 import com.zrqx.core.vo.Geographysign.GeographysignVo;
@@ -250,4 +251,17 @@ public class GeographysignServiceImpl extends BaseServiceImpl<Geographysign, Str
 		return mapper.provincecount(form);
 	}
 
+	@Override
+	public CategoryDateVo querycategory(GeographyForm form) {
+		CategoryDateVo category = new CategoryDateVo();
+		//品类类型
+		category.setCategory(mapper.categorystate(form));
+		//品类注册数量
+		category.setRegisterNumber(mapper.registerNumber(form));
+		//品类核准企业数量
+		category.setApprovalNumber(mapper.approvalNumber(form));
+		
+		return category;
+	}
+
 }