drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -114,6 +114,15 @@ public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) { return R.status(fwDeviceService.saveOrUpdateDevice(FwDeviceWrapper.build().entityDTO(fwDevice))); } /** * 设备表 新增或修改 */ @PostMapping("/updateTrackStatus") @ApiOperationSupport(order = 4) @ApiOperation(value = "修改设备出入库状态", notes = "传入fwDevice") public R updateTrackStatus(@ApiParam(value = "", required = true) @RequestParam Long deviceId) { return R.status(fwDeviceService.updateTrackStatusByDeviceId(deviceId,0)); } /** * 设备表 删除 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java
@@ -39,6 +39,7 @@ import org.sxkj.fw.device.entity.FwDeviceTrackEntity; import org.sxkj.fw.device.excel.FwDeviceTrackExcel; import org.sxkj.fw.device.param.FwDeviceTrackPageParam; import org.sxkj.fw.device.service.IFwDeviceService; import org.sxkj.fw.device.service.IFwDeviceTrackService; import org.sxkj.fw.device.vo.FwDeviceTrackVO; import org.sxkj.fw.device.wrapper.FwDeviceTrackWrapper; @@ -62,6 +63,7 @@ public class FwDeviceTrackController extends BladeController { private final IFwDeviceTrackService fwDeviceTrackService; private final IFwDeviceService fwDeviceService; /** * 设备跟踪流转表 详情 @@ -102,7 +104,12 @@ return R.fail("设备ID不能为空"); } return R.status(fwDeviceTrackService.saveOrUpdate(FwDeviceTrackWrapper.build().entityDTO(fwDeviceTrack))); boolean saved = fwDeviceTrackService.saveOrUpdate(FwDeviceTrackWrapper.build().entityDTO(fwDeviceTrack)); if (!saved) { return R.status(false); } return R.status(fwDeviceService.updateTrackStatusByDeviceId(fwDeviceTrack.getDeviceId(), 1)); } /** drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
@@ -155,4 +155,10 @@ @ApiModelProperty(value = "区域编码") private String areaCode; /** * 设备出入库状态 0未出库1已出库 */ @ApiModelProperty(value = "设备出入库状态 0未出库1已出库") private Integer trackStatus; } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java
@@ -102,4 +102,13 @@ * @return */ List<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice); /** * 按设备ID更新出入库状态 * * @param deviceId 设备ID * @param trackStatus 出入库状态 * @return 影响行数 */ int updateTrackStatusByDeviceId(@Param("deviceId") Long deviceId, @Param("trackStatus") Integer trackStatus); } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -27,6 +27,7 @@ <result column="longitude" property="longitude"/> <result column="area_code" property="areaCode"/> <result column="device_sn" property="deviceSn"/> <result column="track_status" property="trackStatus"/> <result column="create_user" property="createUser"/> <result column="create_dept" property="createDept"/> <result column="create_time" property="createTime"/> @@ -456,4 +457,11 @@ </where> </select> <update id="updateTrackStatusByDeviceId"> update ja_fw_device set track_status = #{trackStatus} where id = #{deviceId} and is_deleted = 0 </update> </mapper> drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
@@ -136,4 +136,13 @@ * @return */ boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity); /** * 按设备ID更新出入库状态 * * @param deviceId 设备ID * @param trackStatus 出入库状态 * @return 是否更新成功 */ boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus); } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -180,4 +180,9 @@ } return saveOrUpdate(fwDeviceEntity); } @Override public boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus) { return baseMapper.updateTrackStatusByDeviceId(deviceId, trackStatus) > 0; } } drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java
@@ -91,6 +91,12 @@ private Long belongDept; /** * 设备出入库状态 0未出库1已出库 */ @ApiModelProperty(value = "设备出入库状态 0未出库1已出库") private Integer trackStatus; /** * 负责人 */ @ApiModelProperty(value = "负责人")
