drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
@@ -39,6 +39,7 @@ import org.sxkj.gd.workorder.dto.GdManageDeviceDTO; import org.sxkj.gd.workorder.entity.GdManageDeviceEntity; import org.sxkj.gd.workorder.excel.GdManageDeviceExcel; import org.sxkj.gd.workorder.param.GdManageDevicePageParam; import org.sxkj.gd.workorder.service.IGdManageDeviceService; import org.sxkj.gd.workorder.vo.GdManageDeviceVO; import org.sxkj.gd.workorder.wrapper.GdManageDeviceWrapper; @@ -83,7 +84,7 @@ @GetMapping("/list") @ApiOperationSupport(order = 3) @ApiOperation(value = "不分页", notes = "传入gdManageDevice") public R<List<GdManageDeviceVO>> page(GdManageDeviceVO gdManageDevice) { public R<List<GdManageDeviceVO>> page(GdManageDevicePageParam gdManageDevice) { List<GdManageDeviceVO> pages = gdManageDeviceService.selectGdManageDevice(gdManageDevice); return R.data(pages); } @@ -94,7 +95,7 @@ @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入gdManageDevice") public R<IPage<GdManageDeviceVO>> page(GdManageDeviceVO gdManageDevice, Query query) { public R<IPage<GdManageDeviceVO>> page(GdManageDevicePageParam gdManageDevice, Query query) { IPage<GdManageDeviceVO> pages = gdManageDeviceService.selectGdManageDevicePage(Condition.getPage(query), gdManageDevice); return R.data(pages); } drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/WorkOrderStatusEnum.java
@@ -239,6 +239,9 @@ case RESPONDING_REJECT_MODIFY: // 响应中_拒绝修改状态允许：4申请修改 return operationType == 4; case ACCEPTED_TO_BE_SETTLED: // 验收通过_待结算状态允许：11结算完成 return operationType == 11; default: // 其他状态不允许操作 return false; drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.java
@@ -17,6 +17,7 @@ package org.sxkj.gd.workorder.mapper; import org.sxkj.gd.workorder.entity.GdManageDeviceEntity; import org.sxkj.gd.workorder.param.GdManageDevicePageParam; import org.sxkj.gd.workorder.vo.GdManageDeviceVO; import org.sxkj.gd.workorder.excel.GdManageDeviceExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -40,7 +41,7 @@ * @param gdManageDevice * @return */ List<GdManageDeviceVO> selectGdManageDevicePage(IPage page, GdManageDeviceVO gdManageDevice); List<GdManageDeviceVO> selectGdManageDevicePage(IPage page, GdManageDevicePageParam gdManageDevice); /** @@ -56,5 +57,5 @@ * @param gdManageDevice * @return */ List<GdManageDeviceVO> selectGdManageDevice(GdManageDeviceVO gdManageDevice); List<GdManageDeviceVO> selectGdManageDevice(GdManageDevicePageParam gdManageDevice); } drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdManageDevicePageParam.java
New file @@ -0,0 +1,53 @@ package org.sxkj.gd.workorder.param; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.List; @Data public class GdManageDevicePageParam implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("主键id") @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value = "设备型号") private String deviceName; /** * custom name of the device */ @ApiModelProperty(value = "设备名称") private String nickname; /** * 设备负载（红外，喇叭，闪光灯） */ @ApiModelProperty(value = "设备负载（红外，喇叭，闪光灯）") private String devicePayload; /** * 当前经度 */ @ApiModelProperty(value = "当前经度") private Double longitude; /** * 当前纬度 */ @ApiModelProperty(value = "当前纬度") private Double latitude; @ApiModelProperty(value = "设备ids") private List<String> deviceIds; @ApiModelProperty(value = "设备位置") private String geom; @ApiModelProperty(value = "5公里范围面数据") private String fiveKmArea; } drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderStatusParam.java
@@ -23,7 +23,7 @@ /** * 操作类型：1接单，2拒接接单 */ @ApiModelProperty(value = "操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改 ", required = true) @ApiModelProperty(value = "操作类型：1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改 11.结算 ", required = true) @NotNull(message = "操作类型不能为空") private Integer operationType;
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.sxkj.gd.workorder.entity.GdManageDeviceEntity; import org.sxkj.gd.workorder.param.GdManageDevicePageParam; import org.sxkj.gd.workorder.vo.GdManageDeviceVO; import org.sxkj.gd.workorder.excel.GdManageDeviceExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,7 +39,7 @@ * @param gdManageDevice * @return */ IPage<GdManageDeviceVO> selectGdManageDevicePage(IPage<GdManageDeviceVO> page, GdManageDeviceVO gdManageDevice); IPage<GdManageDeviceVO> selectGdManageDevicePage(IPage<GdManageDeviceVO> page, GdManageDevicePageParam gdManageDevice); /** @@ -54,7 +55,7 @@ * @param gdManageDevice * @return */ List<GdManageDeviceVO> selectGdManageDevice(GdManageDeviceVO gdManageDevice); List<GdManageDeviceVO> selectGdManageDevice(GdManageDevicePageParam gdManageDevice); /** * 新增或修改 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdManageDeviceServiceImpl.java
@@ -18,6 +18,7 @@ import org.sxkj.gd.utils.GeomUtils; import org.sxkj.gd.workorder.entity.GdManageDeviceEntity; import org.sxkj.gd.workorder.param.GdManageDevicePageParam; import org.sxkj.gd.workorder.vo.GdManageDeviceVO; import org.sxkj.gd.workorder.excel.GdManageDeviceExcel; import org.sxkj.gd.workorder.mapper.GdManageDeviceMapper; @@ -39,12 +40,12 @@ public class GdManageDeviceServiceImpl extends BaseServiceImpl<GdManageDeviceMapper, GdManageDeviceEntity> implements IGdManageDeviceService { @Override public IPage<GdManageDeviceVO> selectGdManageDevicePage(IPage<GdManageDeviceVO> page, GdManageDeviceVO gdManageDevice) { public IPage<GdManageDeviceVO> selectGdManageDevicePage(IPage<GdManageDeviceVO> page, GdManageDevicePageParam gdManageDevice) { return page.setRecords(baseMapper.selectGdManageDevicePage(page, gdManageDevice)); } @Override public List<GdManageDeviceVO> selectGdManageDevice(GdManageDeviceVO gdManageDevice) { public List<GdManageDeviceVO> selectGdManageDevice(GdManageDevicePageParam gdManageDevice) { return baseMapper.selectGdManageDevice(gdManageDevice); }
@@ -201,6 +201,9 @@ case 10: // 同意协商修改 --> 待拆分 newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT; break; case 11: // 结算 --> 结算完成 newStatusEnum = WorkOrderStatusEnum.SETTLEMENT_COMPLETED; break; default: // 无效操作类型 return false; } drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDeviceVO.java
@@ -64,7 +64,7 @@ private Double latitude; @ApiModelProperty(value = "设备ids") private List<Integer> deviceIds; private List<String> deviceIds; @ApiModelProperty(value = "设备位置") private String geom;
