From a6e4f8988b214922bbc68e59d273a9e09965a624 Mon Sep 17 00:00:00 2001 From: baishou_zjx <2710684311@qq.com> Date: Fri, 9 Aug 2019 17:01:07 +0800 Subject: [PATCH] genggai报表数据 --- springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReport.java | 4 ++-- springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReportHis.java | 4 ++-- springboot/morning-check/src/main/java/com/sincere/morningcheck/service/impl/StudentCheckReportServiceImpl.java | 24 ++++++++++++------------ springboot/morning-check/src/main/resources/application-prod.properties | 15 +++++++++++++++ springboot/morning-check/src/main/resources/application.properties | 5 ----- 5 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 springboot/morning-check/src/main/resources/application-prod.properties diff --git a/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReport.java b/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReport.java index bb96a9c..d09427f 100644 --- a/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReport.java +++ b/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReport.java @@ -17,12 +17,12 @@ public class StudentCheckReport { /** * 人为判别结果 */ - private String checkResult; //json字符串 + private String checkResult; /** * 机器判别结果 */ - private String robotResult; //json字符串 + private String robotResult; private Date checkTime; diff --git a/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReportHis.java b/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReportHis.java index 2a7f015..af55037 100644 --- a/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReportHis.java +++ b/springboot/morning-check/src/main/java/com/sincere/morningcheck/model/StudentCheckReportHis.java @@ -23,12 +23,12 @@ public class StudentCheckReportHis { /** * 人为判别结果 */ - private String checkResult; //json字符串 + private String checkResult; /** * 机器判别结果 */ - private String robotResult; //json字符串 + private String robotResult; private Date checkTime; diff --git a/springboot/morning-check/src/main/java/com/sincere/morningcheck/service/impl/StudentCheckReportServiceImpl.java b/springboot/morning-check/src/main/java/com/sincere/morningcheck/service/impl/StudentCheckReportServiceImpl.java index a5e90ba..341fa40 100644 --- a/springboot/morning-check/src/main/java/com/sincere/morningcheck/service/impl/StudentCheckReportServiceImpl.java +++ b/springboot/morning-check/src/main/java/com/sincere/morningcheck/service/impl/StudentCheckReportServiceImpl.java @@ -109,69 +109,69 @@ public class StudentCheckReportServiceImpl implements StudentCheckReportService long count1 = checkResults.stream().filter(n->!n.getHandNoEx()).count(); if(count1>0){ - checkTypeList.add("handNoEx"); + checkTypeList.add("手部异常"); checkTypeCount.add(count1); } long count2= checkResults.stream().filter(n->!n.getMouthNoEx()).count(); if(count2>0){ - checkTypeList.add("mouthNoEx"); + checkTypeList.add("口腔异常"); checkTypeCount.add(count2); } long count3= checkResults.stream().filter(n->!n.getNoRedEye()).count(); if(count3>0){ - checkTypeList.add("noRedEye"); + checkTypeList.add("红眼"); checkTypeCount.add(count3); } long count4= checkResults.stream().filter(n->!n.getNoFever()).count(); if(count4>0){ - checkTypeList.add("noFever"); + checkTypeList.add("发烧"); checkTypeCount.add(count4); } long count5= checkResults.stream().filter(n->!n.getNoCrotchBig()).count(); if(count5>0){ - checkTypeList.add("noCrotchBig"); + checkTypeList.add("腮部肿大"); checkTypeCount.add(count5); } long count6= checkResults.stream().filter(n->!n.getNoPoorSpirit()).count(); if(count6>0){ - checkTypeList.add("noPoorSpirit"); + checkTypeList.add("精神不佳"); checkTypeCount.add(count6); } long count7= checkResults.stream().filter(n->!n.getNoPharyngitis()).count(); if(count7>0){ - checkTypeList.add("noPharyngitis"); + checkTypeList.add("咽炎"); checkTypeCount.add(count7); } long count8= checkResults.stream().filter(n->!n.getNoTrauma()).count(); if(count8>0){ - checkTypeList.add("noTrauma"); + checkTypeList.add("外伤"); checkTypeCount.add(count8); } long count9= checkResults.stream().filter(n->!n.getNoCough()).count(); if(count9>0){ - checkTypeList.add("noCough"); + checkTypeList.add("咳嗽"); checkTypeCount.add(count9); } long count10= checkResults.stream().filter(n->!n.getNoNail()).count(); if(count10>0){ - checkTypeList.add("noNail"); + checkTypeList.add("指甲过长"); checkTypeCount.add(count10); } long count11= checkResults.stream().filter(n->!n.getNoToothDecay()).count(); if(count11>0){ - checkTypeList.add("noToothDecay"); + checkTypeList.add("蛀牙"); checkTypeCount.add(count11); } long count12= checkResults.stream().filter(n->!n.getOther()).count(); if(count12>0){ - checkTypeList.add("other"); + checkTypeList.add("其他"); checkTypeCount.add(count12); } map.put("checkTypeList",checkTypeList); diff --git a/springboot/morning-check/src/main/resources/application-prod.properties b/springboot/morning-check/src/main/resources/application-prod.properties new file mode 100644 index 0000000..c3c2523 --- /dev/null +++ b/springboot/morning-check/src/main/resources/application-prod.properties @@ -0,0 +1,15 @@ +salt = sincere + +server.port=8999 + +#ʽվݿ +spring.datasource.username=szjxtuser +spring.datasource.password=RQminVCJota3H1u8bBYH +spring.datasource.url=jdbc:sqlserver://116.62.155.137:33419;database=smartcampus +spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver + +mybatis.mapper-locations=classpath:/mapper/*.xml +mybatis.type-aliases-package=com.sincere.morningcheck.model + +# springboot 𻷾ѡȡ +spring.profiles.active=dev diff --git a/springboot/morning-check/src/main/resources/application.properties b/springboot/morning-check/src/main/resources/application.properties index 9b2d847..cc3ba11 100644 --- a/springboot/morning-check/src/main/resources/application.properties +++ b/springboot/morning-check/src/main/resources/application.properties @@ -2,11 +2,6 @@ salt = sincere server.port=8999 -#ʽվݿ -#spring.datasource.username=szjxtuser -#spring.datasource.password=RQminVCJota3H1u8bBYH -#spring.datasource.url=jdbc:sqlserver://116.62.155.137:33419;database=smartcampus - #վݿ spring.datasource.username=SZJXTUSER spring.datasource.password=xst200919 -- libgit2 0.21.0