pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
@@ -5,10 +5,10 @@ #name: ym type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull # url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull #url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull # url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull username: root password: dysql,;.abc!@# druid: pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -71,7 +71,7 @@ pipIrr: global: dev: false #是否开发阶段，true或false dev: true #是否开发阶段，true或false dsName: ym #开发阶段，设置临时的数据库名称 mw: webPort: 8070 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOnHourReportHistoryMapper.xml
@@ -260,8 +260,15 @@ SELECT COUNT(*) AS recordCount FROM pr_intake inta LEFT JOIN (SELECT * FROM rm_on_hour_report_history WHERE dt BETWEEN #{timeStart} AND #{timeStop}) his ON his.intake_id = inta.id INNER JOIN ba_block blo ON blo.id = inta.blockId LEFT JOIN (SELECT * FROM rm_on_hour_report_history <where> <if test = "timeStart != null and timeStop != null"> dt BETWEEN #{timeStart} AND #{timeStop} </if> </where>) his ON his.intake_id = inta.id INNER JOIN ba_block blo ON blo.id = inta.blockId WHERE his.intake_id IS NULL AND inta.deleted = 0 </select> @@ -273,8 +280,15 @@ inta.name AS intakeNum, blo.name AS blockName FROM pr_intake inta LEFT JOIN (SELECT * FROM rm_on_hour_report_history WHERE dt BETWEEN #{timeStart} AND #{timeStop}) his ON his.intake_id = inta.id INNER JOIN ba_block blo ON blo.id = inta.blockId LEFT JOIN (SELECT * FROM rm_on_hour_report_history <where> <if test = "timeStart != null and timeStop != null"> dt BETWEEN #{timeStart} AND #{timeStop} </if> </where>) his ON his.intake_id = inta.id INNER JOIN ba_block blo ON blo.id = inta.blockId WHERE his.intake_id IS NULL AND inta.deleted = 0 ORDER BY inta.id <trim prefix="limit " > pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -623,7 +623,9 @@ SELECT COUNT(*) AS recordCount FROM rm_open_close_valve_history <where> AND op_type = #{openType} <if test="openType != null"> AND op_type = #{openType} </if> <if test="timeStart != null and timeStop != null"> AND op_dt BETWEEN #{timeStart} AND #{timeStop} </if> pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -64,13 +64,16 @@ */ String timeStart = qo.getTimeStart(); String timeStop = qo.getTimeStop(); if(timeStart != null) { timeStart = timeStart + " 00:00:00"; }else { timeStart = LocalDate.now() + " 00:00:00"; } if(timeStop != null) { timeStop = timeStop + " 23:59:59"; if(timeStart != null) { timeStart = timeStart + " 00:00:00"; }else { timeStart = LocalDate.now() + " 00:00:00"; } }else { timeStart = null; } qo.setTimeStart(timeStart); qo.setTimeStop(timeStop); @@ -306,39 +309,47 @@ */ public VoCountOfOpenType getCountByOpenType(OpenTypeQO qo) { /** * 补齐起止时间，如果开始时间为空，则默认为当前日期 * 补齐起止时间，如果开始时间为空，则默认为当前日期，如果结束时间为空，则查询时间为空 */ String timeStart = qo.getTimeStart(); String timeStop = qo.getTimeStop(); if(timeStart != null) { timeStart = timeStart + " 00:00:00"; }else { timeStart = LocalDate.now() + " 00:00:00"; } if(timeStop != null) { timeStop = timeStop + " 23:59:59"; if(timeStart != null) { timeStart = timeStart + " 00:00:00"; }else { timeStart = LocalDate.now() + " 00:00:00"; } }else { timeStart = null; } qo.setTimeStart(timeStart); qo.setTimeStop(timeStop); Integer openType = qo.getOpenType(); String openTypeName = ""; switch (openType) { case 1: openTypeName = "刷卡开阀"; break; case 3: openTypeName = "中心站开阀"; break; case 8: openTypeName = "用户远程开阀"; break; case 11: openTypeName = "开关阀卡开阀"; break; case 13: openTypeName = "开关阀卡开阀"; break; if (openType == null){ openTypeName = "未知"; }else { switch (openType) { case 1: openTypeName = "刷卡开阀"; break; case 3: openTypeName = "中心站开阀"; break; case 8: openTypeName = "用户远程开阀"; break; case 11: openTypeName = "开关阀卡开阀"; break; case 13: openTypeName = "开关阀卡开阀"; break; default: openTypeName = "未知"; } } // 生成查询参数 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/CommonQO.java
@@ -27,6 +27,5 @@ * 结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @NotBlank(message = "结束时间不能为空") private String timeStop; } pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java
@@ -19,7 +19,7 @@ /** * 开阀类型 */ @NotNull(message = "开阀类型不能为空") // @NotNull(message = "开阀类型不能为空") private Integer openType; /** @@ -32,6 +32,6 @@ * 结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @NotBlank(message = "结束时间不能为空") // @NotBlank(message = "结束时间不能为空") private String timeStop; } pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/SignalIntensityQO.java
@@ -21,9 +21,9 @@ /** * 信号强度：1-弱，2-一般，3-强 */ @NotNull(message = "信号强度不能为空") @Min(value = 1, message = "信号强度选择错误") @Max(value = 3, message = "信号强度选择错误") // @NotNull(message = "信号强度不能为空") // @Min(value = 1, message = "信号强度选择错误") // @Max(value = 3, message = "信号强度选择错误") private Integer signalIntensity; /**
