pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaUserMapper.java
@@ -133,4 +133,9 @@ */ List<Map<String, Object>> getRoleNamesByUserId(@Param("userId") Long userId); /** * 得到所有手机号(登录账号) * @return */ List<String> getPhones(); } 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/BaUserMapper.xml
@@ -366,4 +366,8 @@ from ba_user where id = #{id,jdbcType=BIGINT} </select> <select id="getPhones" resultType="java.lang.String"> SELECT phone FROM ba_user WHERE deleted = 0 and disabled = 0 </select> </mapper> 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-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
@@ -104,6 +104,7 @@ prController.setRtuAddr(prControllerTramp.getRtuAddr()); prController.setProtocol(prControllerTramp.getProtocol()); prController.setFindDt(prControllerTramp.getFindDt()); prController.setOrgTag(prControllerTramp.getOrgTag()); prController.setAddWays((byte) 1); prController.setOperator(operator); Date operateTime = new Date(); @@ -188,6 +189,7 @@ prControllerTramp.setRtuAddr(ControllerList.getRtuAddr()); prControllerTramp.setProtocol(ControllerList.getProtocol()); prControllerTramp.setFindDt(new Date()); prControllerTramp.setOrgTag(ControllerList.getOrgTag()); Integer rec_addControllerTramp = Optional.ofNullable(intakeControllerSv.addTrampController(prControllerTramp)).orElse(0); if (rec_addControllerTramp == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage()); pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -102,6 +102,9 @@ if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } if(vo.phone == null || vo.phone.trim().length() == 0){ return BaseResponseUtils.buildFail("手机号不能为空"); } if(!vo.phone.equals("admin")){ if(vo.phone.length() != 11){ return BaseResponseUtils.buildFail("手机号（长度不是11位）不正确"); @@ -112,6 +115,12 @@ } //把组织单位标签作为数据源名称 DataSourceContext.set(vo.orgTag); //得到所有用户账号 List<String> phones = sv.getPhones(); if(!phones.contains(vo.phone)){ return BaseResponseUtils.buildFail("账号不存在"); } String uuid ; BaUser userPo ; @@ -136,7 +145,7 @@ uVo.token = uuid ; return BaseResponseUtils.buildSuccess(uVo); }else{ return BaseResponseUtils.buildFail("登录失败"); return BaseResponseUtils.buildFail("密码错误"); } }
@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; @Slf4j @Service public class SsoSv { @@ -67,4 +69,11 @@ return null ; } /** * 得到所有用户手机号 * @return */ public List<String> getPhones(){ return baUserMapper.getPhones() ; } } 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; /**
