Commit a6e4f8988b214922bbc68e59d273a9e09965a624
1 parent
aceb80c1
Exists in
master
genggai报表数据
Showing
5 changed files
with
31 additions
and
21 deletions
Show diff stats
springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReport.java
... | ... | @@ -17,12 +17,12 @@ public class StudentCheckReport { |
17 | 17 | /** |
18 | 18 | * 人为判别结果 |
19 | 19 | */ |
20 | - private String checkResult; //json字符串 | |
20 | + private String checkResult; | |
21 | 21 | |
22 | 22 | /** |
23 | 23 | * 机器判别结果 |
24 | 24 | */ |
25 | - private String robotResult; //json字符串 | |
25 | + private String robotResult; | |
26 | 26 | |
27 | 27 | private Date checkTime; |
28 | 28 | ... | ... |
springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReportHis.java
... | ... | @@ -23,12 +23,12 @@ public class StudentCheckReportHis { |
23 | 23 | /** |
24 | 24 | * 人为判别结果 |
25 | 25 | */ |
26 | - private String checkResult; //json字符串 | |
26 | + private String checkResult; | |
27 | 27 | |
28 | 28 | /** |
29 | 29 | * 机器判别结果 |
30 | 30 | */ |
31 | - private String robotResult; //json字符串 | |
31 | + private String robotResult; | |
32 | 32 | |
33 | 33 | private Date checkTime; |
34 | 34 | ... | ... |
springboot/morning-check/src/main/java/com/sincere/morningcheck/service/impl/StudentCheckReportServiceImpl.java
... | ... | @@ -109,69 +109,69 @@ public class StudentCheckReportServiceImpl implements StudentCheckReportService |
109 | 109 | |
110 | 110 | long count1 = checkResults.stream().filter(n->!n.getHandNoEx()).count(); |
111 | 111 | if(count1>0){ |
112 | - checkTypeList.add("handNoEx"); | |
112 | + checkTypeList.add("手部异常"); | |
113 | 113 | checkTypeCount.add(count1); |
114 | 114 | } |
115 | 115 | long count2= checkResults.stream().filter(n->!n.getMouthNoEx()).count(); |
116 | 116 | if(count2>0){ |
117 | - checkTypeList.add("mouthNoEx"); | |
117 | + checkTypeList.add("口腔异常"); | |
118 | 118 | checkTypeCount.add(count2); |
119 | 119 | } |
120 | 120 | long count3= checkResults.stream().filter(n->!n.getNoRedEye()).count(); |
121 | 121 | if(count3>0){ |
122 | - checkTypeList.add("noRedEye"); | |
122 | + checkTypeList.add("红眼"); | |
123 | 123 | checkTypeCount.add(count3); |
124 | 124 | } |
125 | 125 | long count4= checkResults.stream().filter(n->!n.getNoFever()).count(); |
126 | 126 | if(count4>0){ |
127 | - checkTypeList.add("noFever"); | |
127 | + checkTypeList.add("发烧"); | |
128 | 128 | checkTypeCount.add(count4); |
129 | 129 | } |
130 | 130 | |
131 | 131 | long count5= checkResults.stream().filter(n->!n.getNoCrotchBig()).count(); |
132 | 132 | if(count5>0){ |
133 | - checkTypeList.add("noCrotchBig"); | |
133 | + checkTypeList.add("腮部肿大"); | |
134 | 134 | checkTypeCount.add(count5); |
135 | 135 | } |
136 | 136 | |
137 | 137 | long count6= checkResults.stream().filter(n->!n.getNoPoorSpirit()).count(); |
138 | 138 | if(count6>0){ |
139 | - checkTypeList.add("noPoorSpirit"); | |
139 | + checkTypeList.add("精神不佳"); | |
140 | 140 | checkTypeCount.add(count6); |
141 | 141 | } |
142 | 142 | long count7= checkResults.stream().filter(n->!n.getNoPharyngitis()).count(); |
143 | 143 | if(count7>0){ |
144 | - checkTypeList.add("noPharyngitis"); | |
144 | + checkTypeList.add("咽炎"); | |
145 | 145 | checkTypeCount.add(count7); |
146 | 146 | } |
147 | 147 | |
148 | 148 | long count8= checkResults.stream().filter(n->!n.getNoTrauma()).count(); |
149 | 149 | if(count8>0){ |
150 | - checkTypeList.add("noTrauma"); | |
150 | + checkTypeList.add("外伤"); | |
151 | 151 | checkTypeCount.add(count8); |
152 | 152 | } |
153 | 153 | |
154 | 154 | long count9= checkResults.stream().filter(n->!n.getNoCough()).count(); |
155 | 155 | if(count9>0){ |
156 | - checkTypeList.add("noCough"); | |
156 | + checkTypeList.add("咳嗽"); | |
157 | 157 | checkTypeCount.add(count9); |
158 | 158 | } |
159 | 159 | |
160 | 160 | long count10= checkResults.stream().filter(n->!n.getNoNail()).count(); |
161 | 161 | if(count10>0){ |
162 | - checkTypeList.add("noNail"); | |
162 | + checkTypeList.add("指甲过长"); | |
163 | 163 | checkTypeCount.add(count10); |
164 | 164 | } |
165 | 165 | |
166 | 166 | long count11= checkResults.stream().filter(n->!n.getNoToothDecay()).count(); |
167 | 167 | if(count11>0){ |
168 | - checkTypeList.add("noToothDecay"); | |
168 | + checkTypeList.add("蛀牙"); | |
169 | 169 | checkTypeCount.add(count11); |
170 | 170 | } |
171 | 171 | |
172 | 172 | long count12= checkResults.stream().filter(n->!n.getOther()).count(); |
173 | 173 | if(count12>0){ |
174 | - checkTypeList.add("other"); | |
174 | + checkTypeList.add("其他"); | |
175 | 175 | checkTypeCount.add(count12); |
176 | 176 | } |
177 | 177 | map.put("checkTypeList",checkTypeList); | ... | ... |
springboot/morning-check/src/main/resources/application-prod.properties
0 → 100644
... | ... | @@ -0,0 +1,15 @@ |
1 | +salt = sincere | |
2 | + | |
3 | +server.port=8999 | |
4 | + | |
5 | +#正式站点数据库 | |
6 | +spring.datasource.username=szjxtuser | |
7 | +spring.datasource.password=RQminVCJota3H1u8bBYH | |
8 | +spring.datasource.url=jdbc:sqlserver://116.62.155.137:33419;database=smartcampus | |
9 | +spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver | |
10 | + | |
11 | +mybatis.mapper-locations=classpath:/mapper/*.xml | |
12 | +mybatis.type-aliases-package=com.sincere.morningcheck.model | |
13 | + | |
14 | +# springboot 部署环境的选取 | |
15 | +spring.profiles.active=dev | ... | ... |
springboot/morning-check/src/main/resources/application.properties
... | ... | @@ -2,11 +2,6 @@ salt = sincere |
2 | 2 | |
3 | 3 | server.port=8999 |
4 | 4 | |
5 | -#正式站点数据库 | |
6 | -#spring.datasource.username=szjxtuser | |
7 | -#spring.datasource.password=RQminVCJota3H1u8bBYH | |
8 | -#spring.datasource.url=jdbc:sqlserver://116.62.155.137:33419;database=smartcampus | |
9 | - | |
10 | 5 | #测试站点数据库 |
11 | 6 | spring.datasource.username=SZJXTUSER |
12 | 7 | spring.datasource.password=xst200919 | ... | ... |