diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 0e9ea97..9b05095 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -14,13 +14,15 @@ SELECT d.DEV_NAME AS deviceName, - count(r.id) AS count, - SUM(case when r.TEMPERATURE 37.2 then 1 else 0 end) as normal, - SUM(case when r.TEMPERATURE ]]> 37.2 then 1 else 0 end) as abnormal + SUM(case when r.INOUT_TYPE IS NOT NULL and r.INOUT_TYPE != '' then 1 else 0 end) AS count, + SUM(case when r.TEMPERATURE 36.0 then 1 else 0 end) as temp1, + SUM(case when r.TEMPERATURE = ]]> 36.1 and r.TEMPERATURE 36.6 then 1 else 0 end) as temp2, + SUM(case when r.TEMPERATURE = ]]> 36.7 and r.TEMPERATURE 37.3 then 1 else 0 end) as temp3, + SUM(case when r.TEMPERATURE = ]]> 37.4 then 1 else 0 end) as temp4 FROM recognition_records r LEFT JOIN bus_device d ON r.DEV_CODE = d.DEV_CODE LEFT JOIN person_ext_view p ON p.ID = r.PERSON_ID - WHERE r.INOUT_TYPE IS NOT NULL and r.INOUT_TYPE != '' + WHERE 1=1 AND p.DEPTID IN diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index e929c09..9ac8dda 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -3,26 +3,28 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://localhost:3306/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://111.198.10.15:11102/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root - password: Casic203 + password: Casic203! initial-size: 2 min-idle: 1 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram - export-temp-path: D:\java\boot\iris\temp\ + export-temp-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ iris: recServiceHost: localhost recServicePort: 20004 sync: cron: "0 0 1 * * ?" #每天凌晨1点执行一次 + generate: + cron: "0 08 18 * * ?" #每天凌晨4点执行一次 jdbc: - port: 8098 + port: 11102 dbName: casic_iris_temperature userName: root - userPwd: Casic203 + userPwd: Casic203! mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject @@ -35,4 +37,5 @@ iris: socket-port: 8000 config: - export-path: D:\java\boot\iris\temp\ + export-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ + static-location: C:\casic\tmp\