--no commit message

com.zrqx.geography/src/main/java/com/zrqx/geography/bg/controller/geographysign/GeographysignController.java

@@ -4,6 +4,7 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.net.URL;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -27,9 +28,14 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSONObject;
+import com.hankcs.hanlp.HanLP;
+import com.hankcs.hanlp.seg.common.Term;
+import com.hankcs.hanlp.tokenizer.NLPTokenizer;
+import com.hankcs.hanlp.tokenizer.StandardTokenizer;
 import com.zrqx.core.constant.BaseRequestPath;
 import com.zrqx.core.constant.geography.GeographyRequestPath;
 import com.zrqx.core.form.geography.GeographyForm;
+import com.zrqx.core.model.geography.ApprovalEnterprise;
 import com.zrqx.core.model.geography.Geographysign;
 import com.zrqx.core.util.CallBack;
 import com.zrqx.core.util.PageInfo;
@@ -60,6 +66,12 @@ public class GeographysignController {
 
 	@Value("${spring.data.solr.host}")
 	private String BASE_URL;
+	
+	@Value("${HANLP_ROOT}")
+	private String  dada;
+	
+	@Value("${root}")
+	private String  root;
 
 	@Autowired
 	private SolrAdapter solrAdapter;
@@ -102,6 +114,17 @@ public class GeographysignController {
 	@ApiOperation(value = "明细数据", notes = "明细数据")
 	@GetMapping(value = GeographyRequestPath.PDETAILED)
 	public CallBack<Geographysign> detailed(String id) {
+		Geographysign geography = geographysignService.selectByPrimaryKey(id);
+		
+		Criteria criteria = approvalEnterpriseService.createCriteria();
+		criteria.andEqualTo("productName", geography.getProductName());
+		List<ApprovalEnterprise> list = approvalEnterpriseService.selectByCriteria();
+		List<String> appo = new ArrayList<>();
+		for (ApprovalEnterprise approvalEnterprise : list) {
+			appo.add(approvalEnterprise.getProductName());
+		}
+		geography.setApproval(appo);
+		
 		return CallBack.success(geographysignService.selectByPrimaryKey(id));
 	}
 
@@ -126,8 +149,25 @@ public class GeographysignController {
 	@ApiOperation(value = "所有县标点", notes = "所有县标点")
 	@GetMapping(value = GeographyRequestPath.COUNTY)
 	public CallBack<CountyVo> querypunct(GeographyForm form) {
+		System.out.println(BASE_URL);
+		System.out.println(dada);
+		System.out.println(root);
+		tiant();
 		return CallBack.success(geographysignService.queryPunct(form));
 	}
+	
+	public void tiant() {
+		System.out.println(HanLP.segment("你好，欢迎使用HanLP汉语处理包！"));
+		List<Term> termList = StandardTokenizer.segment("商品和服务");
+		System.out.println(termList);
+		
+		
+		System.out.println(dada);
+		System.out.println(NLPTokenizer.segment("我新造一个词叫幻想乡你能识别并标注正确词性吗？"));
+		// 注意观察下面两个“希望”的词性、两个“晚霞”的词性
+		System.out.println(NLPTokenizer.analyze("我的希望是希望张晚霞的背影被晚霞映红").translateLabels());
+		System.out.println(NLPTokenizer.analyze("支援臺灣正體香港繁體：微软公司於1975年由比爾·蓋茲和保羅·艾倫創立。"));
+	}
 
 	@ApiOperation(value = "查询所有一级分类", notes = "查询所有一级分类")
 	@GetMapping(value = GeographyRequestPath.QUERY)