jiangjiazhi / regional-platform

Download as
Browse Code »

Commit de1cd4914621fb9e6876b5b8f06a65b4760bc707

Authored by yangfei
1 parent 110be563bf
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改名称为模糊

Showing 7 changed files with 22 additions and 64 deletions

.idea/artifacts/platform_sync_data_war_exploded.xml View file @ de1cd49
... ... @@ -112,7 +112,7 @@
112 112 </element>
113 113 </element>
114 114 <element id="directory" name="META-INF">
115   - <element id="file-copy" path="$PROJECT_DIR$/platform-sync-data/target/MANIFEST.MF" />
  115 + <element id="file-copy" path="$PROJECT_DIR$/platform-sync-data/target/platform-sync-data/META-INF/MANIFEST.MF" />
116 116 </element>
117 117 <element id="javaee-facet-resources" facet="platform-sync-data/web/Web" />
118 118 </root>
platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java View file @ de1cd49
... ... @@ -21,36 +21,36 @@
21 21 List<String> list = new ArrayList<String>();
22 22 StringReader input = new StringReader(address.trim());
23 23 IKSegmenter ikSeg = new IKSegmenter(input, true); // true 用智能分词
24   - StringBuffer sb = new StringBuffer(); // ，false细粒度
  24 + StringBuffer sb = new StringBuffer(); // ，false细粒度
25 25 try {
26 26 int i = 0;
27   - for (Lexeme lexeme = ikSeg.next(); lexeme != null; lexeme = ikSeg
28   - .next()) {
  27 + for (Lexeme lexeme = ikSeg.next(); lexeme != null; lexeme = ikSeg.next()) {
29 28 i++;
30 29 String item = lexeme.getLexemeText();
31   - if (item != null && !isNumeric(item) && item.length() > 1)
32   - {
33   - if (i < 5)
34   - {
  30 + if (item != null && !isNumeric(item) && item.length() > 1) {
  31 + if (i < 5) {
35 32 list.add(item);
36   - }
37   - else
38   - {
  33 + } else {
39 34 sb.append(item);
40 35 }
41 36  
42   - }
43   - else
44   - {
  37 + } else {
45 38 sb.append(item);
46 39 }
47 40 }
48 41 } catch (Exception e) {
49   - ExceptionUtils.catchException(e,"地址解析出错");
  42 + ExceptionUtils.catchException(e, "地址解析出错");
50 43 return null;
51 44 }
52 45 list.add(sb.toString());
53 46 return list;
  47 + }
  48 +
  49 + public static void main(String[] ages) {
  50 + List<String> addrs = AddressUtil.getAddress("四川省成都市武侯区双楠路23号");
  51 + for (String ad : addrs) {
  52 + System.out.println(ad);
  53 + }
54 54 }
55 55 }
platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java View file @ de1cd49
... ... @@ -5,7 +5,6 @@
5 5 import java.net.HttpURLConnection;
6 6 import java.net.URL;
7 7 import java.net.URLConnection;
8   -import java.util.HashMap;
9 8 import java.util.Iterator;
10 9 import java.util.List;
11 10 import java.util.Map;
... ... @@ -401,6 +400,8 @@
401 400 }
402 401  
403 402 public static void main(String[] args) {
  403 +
  404 +
404 405 // sendGet("http://localhost:8080/message_develop/sendMMS","id=222222");
405 406 // String str = sendGet("http://data.api.healthbaby.com.cn/v1/messages","hospitalId=1&tagName=,高血压,&page=1&limit=9999");
406 407 // Map<String, String> headers = new HashMap<String, String>();
... ... @@ -415,7 +416,7 @@
415 416 // params,headers);
416 417 // System.out.println(str);
417 418 String json = "[{\"key\":\"6\",\"value\":\"true\"},{\"key\":\"7\",\"value\":\"true\"},{\"key\":\"2\",\"value\":\"false\"},{\"key\":\"3\",\"value\":\"false\"},{\"key\":\"8\",\"value\":\"false\"},{\"key\":\"9\",\"value\":\"false\"},{\"key\":\"10\",\"value\":\"false\"},{\"key\":\"12\",\"value\":\"false\"},{\"key\":\"13\",\"value\":\"false\"},{\"key\":\"15\",\"value\":\"false\"},{\"key\":\"16\",\"value\":\"false\"},{\"key\":\"17\",\"value\":\"false\"},{\"key\":\"19\",\"value\":\"false\"},{\"key\":\"20\",\"value\":\"false\"},{\"key\":\"22\",\"value\":\"false\"},{\"key\":\"23\",\"value\":\"false\"}]";
418   - String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/196",json,"YMer2016");
  419 + // String result = HttpRequest.sendPut("http://192.168.5.13:8080/v1/serviceConfig/196",json,"YMer2016");
419 420 }
420 421 }
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ de1cd49
... ... @@ -1053,7 +1053,7 @@
1053 1053 if (null != queryNo) {
1054 1054 MongoCondition c = MongoCondition.newInstance();
1055 1055 MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
1056   - MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS);
  1056 + MongoCondition con2 = MongoCondition.newInstance("username", "^" + queryNo, MongoOper.LIKE);
1057 1057 MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
1058 1058 MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
1059 1059 if(c1!=null) {
platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java View file @ de1cd49
... ... @@ -201,7 +201,7 @@
201 201 if (StringUtils.isNotBlank(queryNo)) {
202 202 MongoCondition c = MongoCondition.newInstance();
203 203 MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
204   - MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS);
  204 + MongoCondition con2 = MongoCondition.newInstance("username", "^"+queryNo, MongoOper.LIKE);
205 205 MongoCondition con3 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS);
206 206 if(c1!=null) {
207 207 c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria());
platform-sync-data/platform-sync-data.iml View file @ de1cd49
... ... @@ -9,11 +9,6 @@
9 9 <webroots>
10 10 <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
11 11 </webroots>
12   - <sourceRoots>
13   - <root url="file://$MODULE_DIR$/../platform-resource/resources" />
14   - <root url="file://$MODULE_DIR$/src/main/java" />
15   - <root url="file://$MODULE_DIR$/src/main/resources" />
16   - </sourceRoots>
17 12 </configuration>
18 13 </facet>
19 14 </component>
20 15  
21 16  
... ... @@ -25,29 +20,9 @@
25 20 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
26 21 <excludeFolder url="file://$MODULE_DIR$/target" />
27 22 </content>
28   - <orderEntry type="inheritedJdk" />
  23 + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
29 24 <orderEntry type="sourceFolder" forTests="false" />
30   - <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
31   - <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.8" level="project" />
32 25 <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.15" level="project" />
33   - <orderEntry type="module-library">
34   - <library name="Maven: com.alibaba:jconsole:1.8.0">
35   - <CLASSES>
36   - <root url="jar://C:/Program Files (x86)/Java/jdk1.7.0_03/lib/jconsole.jar!/" />
37   - </CLASSES>
38   - <JAVADOC />
39   - <SOURCES />
40   - </library>
41   - </orderEntry>
42   - <orderEntry type="module-library">
43   - <library name="Maven: com.alibaba:tools:1.8.0">
44   - <CLASSES>
45   - <root url="jar://C:/Program Files (x86)/Java/jdk1.7.0_03/lib/tools.jar!/" />
46   - </CLASSES>
47   - <JAVADOC />
48   - <SOURCES />
49   - </library>
50   - </orderEntry>
51 26 <orderEntry type="module" module-name="platform-common" />
52 27 <orderEntry type="module-library">
53 28 <library name="Maven: org.wltea.analyzer:IKAnalyzer:2012_u6">
regional-etl/regional-etl.iml View file @ de1cd49
... ... @@ -8,7 +8,7 @@
8 8 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9 9 <excludeFolder url="file://$MODULE_DIR$/target" />
10 10 </content>
11   - <orderEntry type="inheritedJdk" />
  11 + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
12 12 <orderEntry type="sourceFolder" forTests="false" />
13 13 <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.3.RELEASE" level="project" />
14 14 <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.3.RELEASE" level="project" />
... ... @@ -57,24 +57,6 @@
57 57 <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
58 58 <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.41" level="project" />
59 59 <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.31" level="project" />
60   - <orderEntry type="module-library">
61   - <library name="Maven: com.alibaba:jconsole:1.8.0">
62   - <CLASSES>
63   - <root url="jar://C:/Program Files (x86)/Java/jdk1.7.0_03/lib/jconsole.jar!/" />
64   - </CLASSES>
65   - <JAVADOC />
66   - <SOURCES />
67   - </library>
68   - </orderEntry>
69   - <orderEntry type="module-library">
70   - <library name="Maven: com.alibaba:tools:1.8.0">
71   - <CLASSES>
72   - <root url="jar://C:/Program Files (x86)/Java/jdk1.7.0_03/lib/tools.jar!/" />
73   - </CLASSES>
74   - <JAVADOC />
75   - <SOURCES />
76   - </library>
77   - </orderEntry>
78 60 <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:1.5.3.RELEASE" level="project" />
79 61 <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
80 62 <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" />