jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/DeviceController.java
@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; import java.time.LocalDate; import java.util.*; import java.io.IOException; @@ -80,6 +81,16 @@ return success(BeanUtils.toBean(device, DeviceRespVO.class)); } @PostMapping("/update-dev-state") @Operation(summary = "更新设备状态") @Parameter(name = "devId", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('ecg:doctor:task')") public CommonResult<Integer> updateDeviceState(@Valid @RequestBody DeviceSaveReqVO updateReqVO) { updateReqVO.setStateDate( LocalDate.now() ); Integer ret = deviceService.updateDeviceState(updateReqVO); return success(ret); } @GetMapping("/page") @Operation(summary = "获得设备分页") @PreAuthorize("@ss.hasPermission('ecg:device:query')") jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DevicePageReqVO.java
@@ -37,12 +37,9 @@ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; @Schema(description = "遗失") private Integer lost; @Schema(description = "遗失日期") @Schema(description = "状态日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDate loseDate[]; private LocalDate stateDate[]; /** * 0 - 空闲 10 - 使用中 20 - 已遗失 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceRespVO.java
@@ -42,13 +42,9 @@ @ExcelProperty("创建时间") private LocalDateTime createTime; @Schema(description = "遗失") @ExcelProperty("是否遗失") private Integer lost; @Schema(description = "遗失日期") @ExcelProperty("遗失日期") private LocalDate loseDate; @Schema(description = "状态日期") @ExcelProperty("状态日期") private LocalDate stateDate; /** * 0 - 空闲 10 - 使用中 20 - 已遗失 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devmanage/vo/DeviceSaveReqVO.java
@@ -34,8 +34,8 @@ @Schema(description = "采购日期") private LocalDate purchaseDate; @Schema(description = "遗失标记") private Integer lost; @Schema(description = "状态日期") private LocalDate stateDate; /** * 0 - 空闲 10 - 使用中 20 - 已遗失 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
@@ -54,7 +54,7 @@ * 遗失日期 */ @TableField(updateStrategy = FieldStrategy.ALWAYS) private LocalDate loseDate; private LocalDate stateDate; /** * 0 - 空闲 10 - 使用中 20 - 已遗失 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devmanage/DeviceMapper.java
@@ -1,5 +1,6 @@ package cn.lihu.jh.module.ecg.dal.mysql.devmanage; import java.time.LocalDate; import java.util.*; import cn.lihu.jh.framework.common.pojo.PageResult; @@ -10,6 +11,7 @@ import cn.lihu.jh.module.ecg.controller.admin.devmanage.vo.*; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; /** * 设备 Mapper @@ -33,4 +35,7 @@ @Select("select * from lihu.device where dev_id=#{devId}") DeviceDO getDeviceByDevId(@Param("devId") String devId); @Update("update lihu.device set state=#{state}, state_date=#{stateDate} where dev_id=#{devId}") Integer updateDevState(@Param("devId") String devId, @Param("state") Integer state, @Param("stateDate") LocalDate stateDate); } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceService.java
@@ -31,6 +31,13 @@ void updateDevice(@Valid DeviceSaveReqVO updateReqVO); /** * 更新设备状态 * * @param updateReqVO 更新信息 */ Integer updateDeviceState(@Valid DeviceSaveReqVO updateReqVO); /** * 删除设备 * * @param id 编号 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devmanage/DeviceServiceImpl.java
@@ -49,6 +49,15 @@ } @Override public Integer updateDeviceState(DeviceSaveReqVO updateReqVO) { // 校验存在 validateDeviceExists(updateReqVO.getId()); // 更新 DeviceDO updateObj = BeanUtils.toBean(updateReqVO, DeviceDO.class); return deviceMapper.updateDevState(updateObj.getDevId(), updateObj.getState(), updateObj.getStateDate()); } @Override public void deleteDevice(Integer id) { // 校验存在 validateDeviceExists(id); jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -421,6 +421,7 @@ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId); if (null != deviveDO && deviveDO.getState() == DevStateEnum.FREE.getState()) { deviveDO.setState( DevStateEnum.RECEIVED.getState() ); deviveDO.setStateDate( LocalDate.now() ); return deviceMapper.updateById(deviveDO); } @@ -432,6 +433,7 @@ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId); if (null != deviveDO && deviveDO.getState() == DevStateEnum.RECEIVED.getState()) { deviveDO.setState( DevStateEnum.INUSE.getState() ); deviveDO.setStateDate( LocalDate.now() ); return deviceMapper.updateById(deviveDO); } @@ -443,7 +445,7 @@ DeviceDO deviveDO = deviceMapper.getDeviceByDevId(devId); if (null != deviveDO) { deviveDO.setState( DevStateEnum.LOST.getState() ); deviveDO.setLoseDate( localDate ); // createReqVO.getReturnTime().toLocalDate() deviveDO.setStateDate( localDate ); return deviceMapper.updateById(deviveDO); } @@ -455,7 +457,7 @@ DeviceDO deviveDO = deviceMapper.getDeviceByDevId( devId ); if (null != deviveDO) { deviveDO.setState( DevStateEnum.FREE.getState() ); deviveDO.setLoseDate( null ); deviveDO.setStateDate( LocalDate.now() ); return deviceMapper.updateById(deviveDO); }
