修改各模块库表分类前缀
This commit is contained in:
@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerCreateReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerQueryReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacBoxTransformerVo;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
|
||||
import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
|
||||
import org.dromara.facility.service.IFacBoxTransformerService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -44,7 +44,7 @@ public class FacBoxTransformerController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("facility:boxTransformer:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<FacBoxTransformerVo> list(BoxTransformerQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacBoxTransformerVo> list(FacBoxTransformerQueryReq req, PageQuery pageQuery) {
|
||||
return facBoxTransformerService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ public class FacBoxTransformerController extends BaseController {
|
||||
@SaCheckPermission("facility:boxTransformer:export")
|
||||
@Log(title = "设施-箱变", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(BoxTransformerQueryReq req, HttpServletResponse response) {
|
||||
public void export(FacBoxTransformerQueryReq req, HttpServletResponse response) {
|
||||
List<FacBoxTransformerVo> list = facBoxTransformerService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "设施-箱变", FacBoxTransformerVo.class, response);
|
||||
}
|
||||
@ -78,7 +78,7 @@ public class FacBoxTransformerController extends BaseController {
|
||||
@Log(title = "设施-箱变", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody BoxTransformerCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody FacBoxTransformerCreateReq req) {
|
||||
return R.ok(facBoxTransformerService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ public class FacBoxTransformerController extends BaseController {
|
||||
@Log(title = "设施-箱变", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody BoxTransformerUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacBoxTransformerUpdateReq req) {
|
||||
return toAjax(facBoxTransformerService.updateByBo(req));
|
||||
}
|
||||
|
||||
|
||||
@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.facility.domain.req.inverter.InverterCreateReq;
|
||||
import org.dromara.facility.domain.req.inverter.InverterQueryReq;
|
||||
import org.dromara.facility.domain.req.inverter.InverterUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacInverterVo;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
|
||||
import org.dromara.facility.domain.vo.inverter.FacInverterVo;
|
||||
import org.dromara.facility.service.IFacInverterService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -44,7 +44,7 @@ public class FacInverterController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("facility:inverter:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<FacInverterVo> list(InverterQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacInverterVo> list(FacInverterQueryReq req, PageQuery pageQuery) {
|
||||
return facInverterService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ public class FacInverterController extends BaseController {
|
||||
@SaCheckPermission("facility:inverter:export")
|
||||
@Log(title = "设施-逆变器", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(InverterQueryReq req, HttpServletResponse response) {
|
||||
public void export(FacInverterQueryReq req, HttpServletResponse response) {
|
||||
List<FacInverterVo> list = facInverterService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "设施-逆变器", FacInverterVo.class, response);
|
||||
}
|
||||
@ -78,7 +78,7 @@ public class FacInverterController extends BaseController {
|
||||
@Log(title = "设施-逆变器", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody InverterCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody FacInverterCreateReq req) {
|
||||
return R.ok(facInverterService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ public class FacInverterController extends BaseController {
|
||||
@Log(title = "设施-逆变器", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody InverterUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacInverterUpdateReq req) {
|
||||
return toAjax(facInverterService.updateByBo(req));
|
||||
}
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.facility.domain.req.matrix.*;
|
||||
import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
|
||||
import org.dromara.facility.domain.vo.matrix.MatrixDetailGisVo;
|
||||
import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;
|
||||
import org.dromara.facility.service.IFacMatrixService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -43,7 +43,7 @@ public class FacMatrixController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("facility:matrix:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<FacMatrixVo> list(MatrixQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacMatrixVo> list(FacMatrixQueryReq req, PageQuery pageQuery) {
|
||||
return facMatrixService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -53,7 +53,7 @@ public class FacMatrixController extends BaseController {
|
||||
@SaCheckPermission("facility:matrix:export")
|
||||
@Log(title = "设施-方阵", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(MatrixQueryReq req, HttpServletResponse response) {
|
||||
public void export(FacMatrixQueryReq req, HttpServletResponse response) {
|
||||
List<FacMatrixVo> list = facMatrixService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "设施-方阵", FacMatrixVo.class, response);
|
||||
}
|
||||
@ -75,7 +75,7 @@ public class FacMatrixController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("facility:matrix:query")
|
||||
@GetMapping("/gis")
|
||||
public R<MatrixDetailGisVo> getMatrixDetailGis(MatrixDetailGisReq req) {
|
||||
public R<FacMatrixDetailGisVo> getMatrixDetailGis(FacMatrixDetailGisReq req) {
|
||||
return R.ok(facMatrixService.getMatrixDetailGis(req));
|
||||
}
|
||||
|
||||
@ -86,7 +86,7 @@ public class FacMatrixController extends BaseController {
|
||||
@Log(title = "设施-方阵", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/geoJson")
|
||||
public R<Void> insertByGeoJson(@RequestBody MatrixCreateByGeoJsonReq req) {
|
||||
public R<Void> insertByGeoJson(@RequestBody FacMatrixCreateByGeoJsonReq req) {
|
||||
return toAjax(facMatrixService.insertByGeoJson(req));
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@ public class FacMatrixController extends BaseController {
|
||||
@Log(title = "设施-方阵", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody MatrixCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody FacMatrixCreateReq req) {
|
||||
return R.ok(facMatrixService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -108,7 +108,7 @@ public class FacMatrixController extends BaseController {
|
||||
@Log(title = "设施-方阵", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody MatrixUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacMatrixUpdateReq req) {
|
||||
return toAjax(facMatrixService.updateByBo(req));
|
||||
}
|
||||
|
||||
|
||||
@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelColumnVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelColumnService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -44,7 +44,7 @@ public class FacPhotovoltaicPanelColumnController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("facility:photovoltaicPanelColumn:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<FacPhotovoltaicPanelColumnVo> list(PhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacPhotovoltaicPanelColumnVo> list(FacPhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery) {
|
||||
return facPhotovoltaicPanelColumnService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ public class FacPhotovoltaicPanelColumnController extends BaseController {
|
||||
@SaCheckPermission("facility:photovoltaicPanelColumn:export")
|
||||
@Log(title = "设施-光伏板立柱", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(PhotovoltaicPanelColumnQueryReq req, HttpServletResponse response) {
|
||||
public void export(FacPhotovoltaicPanelColumnQueryReq req, HttpServletResponse response) {
|
||||
List<FacPhotovoltaicPanelColumnVo> list = facPhotovoltaicPanelColumnService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "设施-光伏板立柱", FacPhotovoltaicPanelColumnVo.class, response);
|
||||
}
|
||||
@ -78,7 +78,7 @@ public class FacPhotovoltaicPanelColumnController extends BaseController {
|
||||
@Log(title = "设施-光伏板立柱", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody PhotovoltaicPanelColumnCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody FacPhotovoltaicPanelColumnCreateReq req) {
|
||||
return R.ok(facPhotovoltaicPanelColumnService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ public class FacPhotovoltaicPanelColumnController extends BaseController {
|
||||
@Log(title = "设施-光伏板立柱", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhotovoltaicPanelColumnUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacPhotovoltaicPanelColumnUpdateReq req) {
|
||||
return toAjax(facPhotovoltaicPanelColumnService.updateByBo(req));
|
||||
}
|
||||
|
||||
|
||||
@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -45,7 +45,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("facility:photovoltaicPanel:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<FacPhotovoltaicPanelVo> list(PhotovoltaicPanelQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacPhotovoltaicPanelVo> list(FacPhotovoltaicPanelQueryReq req, PageQuery pageQuery) {
|
||||
return facPhotovoltaicPanelService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
|
||||
@SaCheckPermission("facility:photovoltaicPanel:export")
|
||||
@Log(title = "设施-光伏板", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(PhotovoltaicPanelQueryReq req, HttpServletResponse response) {
|
||||
public void export(FacPhotovoltaicPanelQueryReq req, HttpServletResponse response) {
|
||||
List<FacPhotovoltaicPanelVo> list = facPhotovoltaicPanelService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "设施-光伏板", FacPhotovoltaicPanelVo.class, response);
|
||||
}
|
||||
@ -79,7 +79,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
|
||||
@Log(title = "设施-光伏板", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody PhotovoltaicPanelCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody FacPhotovoltaicPanelCreateReq req) {
|
||||
return R.ok(facPhotovoltaicPanelService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -90,7 +90,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
|
||||
@Log(title = "设施-光伏板", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/geoJson")
|
||||
public R<Void> insertByGeoJson(@RequestBody PhotovoltaicPanelCreateByGeoJsonReq geoJson) {
|
||||
public R<Void> insertByGeoJson(@RequestBody FacPhotovoltaicPanelCreateByGeoJsonReq geoJson) {
|
||||
return toAjax(facPhotovoltaicPanelService.insertByGeoJson(geoJson));
|
||||
}
|
||||
|
||||
@ -101,7 +101,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
|
||||
@Log(title = "设施-光伏板", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhotovoltaicPanelUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacPhotovoltaicPanelUpdateReq req) {
|
||||
return toAjax(facPhotovoltaicPanelService.updateByBo(req));
|
||||
}
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@ import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
@ -35,7 +35,7 @@ public class FacPhotovoltaicPanelPartsController extends BaseController {
|
||||
@Log(title = "设施-光伏板（桩点、立柱、支架）", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping("/geoJson")
|
||||
public R<Void> insertPartsByGeoJson(@RequestBody PhotovoltaicPanelPartsCreateByGeoJsonReq req) {
|
||||
public R<Void> insertPartsByGeoJson(@RequestBody FacPhotovoltaicPanelPartsCreateByGeoJsonReq req) {
|
||||
return toAjax(photovoltaicPanelPartsService.insertPartsByGeoJson(req));
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ public class FacPhotovoltaicPanelPartsController extends BaseController {
|
||||
@Log(title = "设施-光伏板（桩点、立柱、支架）", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Boolean> insertPartsByBatch(PhotovoltaicPanelPartsCreateReq req) {
|
||||
public R<Boolean> insertPartsByBatch(FacPhotovoltaicPanelPartsCreateReq req) {
|
||||
return R.ok(photovoltaicPanelPartsService.insertPartsByBatch(req));
|
||||
}
|
||||
|
||||
|
||||
@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelPointVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelPointService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -44,7 +44,7 @@ public class FacPhotovoltaicPanelPointController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("facility:photovoltaicPanelPoint:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<FacPhotovoltaicPanelPointVo> list(PhotovoltaicPanelPointQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacPhotovoltaicPanelPointVo> list(FacPhotovoltaicPanelPointQueryReq req, PageQuery pageQuery) {
|
||||
return facPhotovoltaicPanelPointService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ public class FacPhotovoltaicPanelPointController extends BaseController {
|
||||
@SaCheckPermission("facility:photovoltaicPanelPoint:export")
|
||||
@Log(title = "设施-光伏板桩点", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(PhotovoltaicPanelPointQueryReq req, HttpServletResponse response) {
|
||||
public void export(FacPhotovoltaicPanelPointQueryReq req, HttpServletResponse response) {
|
||||
List<FacPhotovoltaicPanelPointVo> list = facPhotovoltaicPanelPointService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "设施-光伏板桩点", FacPhotovoltaicPanelPointVo.class, response);
|
||||
}
|
||||
@ -78,7 +78,7 @@ public class FacPhotovoltaicPanelPointController extends BaseController {
|
||||
@Log(title = "设施-光伏板桩点", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody PhotovoltaicPanelPointCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody FacPhotovoltaicPanelPointCreateReq req) {
|
||||
return R.ok(facPhotovoltaicPanelPointService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ public class FacPhotovoltaicPanelPointController extends BaseController {
|
||||
@Log(title = "设施-光伏板桩点", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhotovoltaicPanelPointUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacPhotovoltaicPanelPointUpdateReq req) {
|
||||
return toAjax(facPhotovoltaicPanelPointService.updateByBo(req));
|
||||
}
|
||||
|
||||
|
||||
@ -15,10 +15,10 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelSupportVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelSupportService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -44,7 +44,7 @@ public class FacPhotovoltaicPanelSupportController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("facility:photovoltaicPanelSupport:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<FacPhotovoltaicPanelSupportVo> list(PhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacPhotovoltaicPanelSupportVo> list(FacPhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery) {
|
||||
return facPhotovoltaicPanelSupportService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ public class FacPhotovoltaicPanelSupportController extends BaseController {
|
||||
@SaCheckPermission("facility:photovoltaicPanelSupport:export")
|
||||
@Log(title = "设施-光伏板支架", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(PhotovoltaicPanelSupportQueryReq req, HttpServletResponse response) {
|
||||
public void export(FacPhotovoltaicPanelSupportQueryReq req, HttpServletResponse response) {
|
||||
List<FacPhotovoltaicPanelSupportVo> list = facPhotovoltaicPanelSupportService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "设施-光伏板支架", FacPhotovoltaicPanelSupportVo.class, response);
|
||||
}
|
||||
@ -78,7 +78,7 @@ public class FacPhotovoltaicPanelSupportController extends BaseController {
|
||||
@Log(title = "设施-光伏板支架", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody PhotovoltaicPanelSupportCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody FacPhotovoltaicPanelSupportCreateReq req) {
|
||||
return R.ok(facPhotovoltaicPanelSupportService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ public class FacPhotovoltaicPanelSupportController extends BaseController {
|
||||
@Log(title = "设施-光伏板支架", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhotovoltaicPanelSupportUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody FacPhotovoltaicPanelSupportUpdateReq req) {
|
||||
return toAjax(facPhotovoltaicPanelSupportService.updateByBo(req));
|
||||
}
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ import lombok.Getter;
|
||||
* @date 2025/4/28 16:34
|
||||
*/
|
||||
@Getter
|
||||
public enum FinishStatusEnum {
|
||||
public enum FacFinishStatusEnum {
|
||||
|
||||
UNFINISH("未完成", "0"),
|
||||
FINISH("已完成", "1");
|
||||
@ -16,7 +16,7 @@ public enum FinishStatusEnum {
|
||||
|
||||
private final String value;
|
||||
|
||||
FinishStatusEnum(String text, String value) {
|
||||
FacFinishStatusEnum(String text, String value) {
|
||||
this.text = text;
|
||||
this.value = value;
|
||||
}
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 16:54
|
||||
*/
|
||||
@Data
|
||||
public class BoxTransformerCreateReq implements Serializable {
|
||||
public class FacBoxTransformerCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 4380175902468104569L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/21 17:20
|
||||
*/
|
||||
@Data
|
||||
public class BoxTransformerQueryReq implements Serializable {
|
||||
public class FacBoxTransformerQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -1963080752094759008L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 17:20
|
||||
*/
|
||||
@Data
|
||||
public class BoxTransformerUpdateReq implements Serializable {
|
||||
public class FacBoxTransformerUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -7030781044685790507L;
|
||||
@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class Feature {
|
||||
public class FacFeature {
|
||||
|
||||
private String type;
|
||||
|
||||
private Geometry geometry;
|
||||
private FacGeometry geometry;
|
||||
|
||||
private Properties properties;
|
||||
private FacProperties properties;
|
||||
|
||||
}
|
||||
@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FeatureByPoint {
|
||||
public class FacFeatureByLine {
|
||||
|
||||
private String type;
|
||||
|
||||
private GeometryByPoint geometry;
|
||||
private FacGeometryByLine geometry;
|
||||
|
||||
private Properties properties;
|
||||
private FacProperties properties;
|
||||
|
||||
}
|
||||
@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FeatureByPlane {
|
||||
public class FacFeatureByPlane {
|
||||
|
||||
private String type;
|
||||
|
||||
private GeometryByPlane geometry;
|
||||
private FacGeometryByPlane geometry;
|
||||
|
||||
private Properties properties;
|
||||
private FacProperties properties;
|
||||
|
||||
}
|
||||
@ -11,12 +11,12 @@ import lombok.NoArgsConstructor;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FeatureByLine {
|
||||
public class FacFeatureByPoint {
|
||||
|
||||
private String type;
|
||||
|
||||
private GeometryByLine geometry;
|
||||
private FacGeometryByPoint geometry;
|
||||
|
||||
private Properties properties;
|
||||
private FacProperties properties;
|
||||
|
||||
}
|
||||
@ -13,12 +13,12 @@ import java.util.List;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class GeoJson {
|
||||
public class FacGeoJson {
|
||||
|
||||
private String name;
|
||||
|
||||
private String type;
|
||||
|
||||
private List<Feature> features;
|
||||
private List<FacFeature> features;
|
||||
|
||||
}
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/24 10:38
|
||||
*/
|
||||
@Data
|
||||
public class GeoJsonByLine implements Serializable {
|
||||
public class FacGeoJsonByLine implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -1019429627483913266L;
|
||||
@ -20,6 +20,6 @@ public class GeoJsonByLine implements Serializable {
|
||||
|
||||
private String type;
|
||||
|
||||
private List<FeatureByLine> features;
|
||||
private List<FacFeatureByLine> features;
|
||||
|
||||
}
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/24 10:32
|
||||
*/
|
||||
@Data
|
||||
public class GeoJsonByPlane implements Serializable {
|
||||
public class FacGeoJsonByPlane implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 7407176569611285023L;
|
||||
@ -20,6 +20,6 @@ public class GeoJsonByPlane implements Serializable {
|
||||
|
||||
private String type;
|
||||
|
||||
private List<FeatureByPlane> features;
|
||||
private List<FacFeatureByPlane> features;
|
||||
|
||||
}
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/24 10:38
|
||||
*/
|
||||
@Data
|
||||
public class GeoJsonByPoint implements Serializable {
|
||||
public class FacGeoJsonByPoint implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 3829419654737988678L;
|
||||
@ -20,6 +20,6 @@ public class GeoJsonByPoint implements Serializable {
|
||||
|
||||
private String type;
|
||||
|
||||
private List<FeatureByPoint> features;
|
||||
private List<FacFeatureByPoint> features;
|
||||
|
||||
}
|
||||
@ -13,7 +13,7 @@ import java.util.List;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class Geometry {
|
||||
public class FacGeometry {
|
||||
|
||||
private String type;
|
||||
|
||||
@ -13,7 +13,7 @@ import java.util.List;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class GeometryByLine {
|
||||
public class FacGeometryByLine {
|
||||
|
||||
private String type;
|
||||
|
||||
@ -13,7 +13,7 @@ import java.util.List;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class GeometryByPlane {
|
||||
public class FacGeometryByPlane {
|
||||
|
||||
private String type;
|
||||
|
||||
@ -13,7 +13,7 @@ import java.util.List;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class GeometryByPoint {
|
||||
public class FacGeometryByPoint {
|
||||
|
||||
private String type;
|
||||
|
||||
@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class Properties {
|
||||
public class FacProperties {
|
||||
|
||||
private String type;
|
||||
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 17:57
|
||||
*/
|
||||
@Data
|
||||
public class InverterCreateReq implements Serializable {
|
||||
public class FacInverterCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1722660769314535318L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/21 17:57
|
||||
*/
|
||||
@Data
|
||||
public class InverterQueryReq implements Serializable {
|
||||
public class FacInverterQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 6022414407700545902L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 17:58
|
||||
*/
|
||||
@Data
|
||||
public class InverterUpdateReq implements Serializable {
|
||||
public class FacInverterUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 8042273364046693533L;
|
||||
@ -1,8 +1,8 @@
|
||||
package org.dromara.facility.domain.req.matrix;
|
||||
|
||||
import lombok.Data;
|
||||
import org.dromara.facility.domain.req.geojson.GeoJson;
|
||||
import org.dromara.facility.domain.req.geojson.GeoJsonByPoint;
|
||||
import org.dromara.facility.domain.req.geojson.FacGeoJson;
|
||||
import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
@ -12,7 +12,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/24 11:03
|
||||
*/
|
||||
@Data
|
||||
public class MatrixCreateByGeoJsonReq implements Serializable {
|
||||
public class FacMatrixCreateByGeoJsonReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -3636617370172414549L;
|
||||
@ -25,11 +25,11 @@ public class MatrixCreateByGeoJsonReq implements Serializable {
|
||||
/**
|
||||
* 地理位置
|
||||
*/
|
||||
private GeoJson locationGeoJson;
|
||||
private FacGeoJson locationGeoJson;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
private GeoJsonByPoint nameGeoJson;
|
||||
private FacGeoJsonByPoint nameGeoJson;
|
||||
|
||||
}
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 14:55
|
||||
*/
|
||||
@Data
|
||||
public class MatrixCreateReq implements Serializable {
|
||||
public class FacMatrixCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -9094117932741747339L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/28 16:27
|
||||
*/
|
||||
@Data
|
||||
public class MatrixDetailGisReq implements Serializable {
|
||||
public class FacMatrixDetailGisReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 6514291289474982208L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/21 14:58
|
||||
*/
|
||||
@Data
|
||||
public class MatrixQueryReq implements Serializable {
|
||||
public class FacMatrixQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -6595145503602439606L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 14:57
|
||||
*/
|
||||
@Data
|
||||
public class MatrixUpdateReq implements Serializable {
|
||||
public class FacMatrixUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 384644288316208875L;
|
||||
@ -1,8 +1,8 @@
|
||||
package org.dromara.facility.domain.req.photovoltaicpanel;
|
||||
|
||||
import lombok.Data;
|
||||
import org.dromara.facility.domain.req.geojson.GeoJsonByPlane;
|
||||
import org.dromara.facility.domain.req.geojson.GeoJsonByPoint;
|
||||
import org.dromara.facility.domain.req.geojson.FacGeoJsonByPlane;
|
||||
import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
@ -12,7 +12,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/24 9:53
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelCreateByGeoJsonReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelCreateByGeoJsonReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -14887945592031533L;
|
||||
@ -25,11 +25,11 @@ public class PhotovoltaicPanelCreateByGeoJsonReq implements Serializable {
|
||||
/**
|
||||
* 地理位置
|
||||
*/
|
||||
private GeoJsonByPlane locationGeoJson;
|
||||
private FacGeoJsonByPlane locationGeoJson;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
private GeoJsonByPoint nameGeoJson;
|
||||
private FacGeoJsonByPoint nameGeoJson;
|
||||
|
||||
}
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 14:00
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelCreateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -6155515510030793296L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/21 14:02
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelQueryReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 4450293360698837635L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 14:03
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelUpdateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -7179168647795418115L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/22 9:50
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelColumnCreateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelColumnCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 5783638527565322237L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/22 9:51
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelColumnQueryReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelColumnQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -4288306372664325906L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/22 9:50
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelColumnUpdateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelColumnUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 6489049981734037038L;
|
||||
@ -1,7 +1,7 @@
|
||||
package org.dromara.facility.domain.req.photovoltaicpanelparts;
|
||||
|
||||
import lombok.Data;
|
||||
import org.dromara.facility.domain.req.geojson.GeoJsonByPoint;
|
||||
import org.dromara.facility.domain.req.geojson.FacGeoJsonByPoint;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
@ -11,7 +11,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/24 11:01
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelPartsCreateByGeoJsonReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelPartsCreateByGeoJsonReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 5682597792623228174L;
|
||||
@ -24,6 +24,6 @@ public class PhotovoltaicPanelPartsCreateByGeoJsonReq implements Serializable {
|
||||
/**
|
||||
* 桩点、立柱、支架 GeoJson
|
||||
*/
|
||||
private GeoJsonByPoint pointGeoJson;
|
||||
private FacGeoJsonByPoint pointGeoJson;
|
||||
|
||||
}
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/21 15:45
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelPartsCreateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelPartsCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -584396159753737769L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/22 9:48
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelPointCreateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelPointCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -8316395563268976925L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/22 9:48
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelPointQueryReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelPointQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 5325875051802738981L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/22 9:48
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelPointUpdateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelPointUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -6060380651961899938L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/22 9:40
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelSupportCreateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelSupportCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 2859712819532622700L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/22 9:43
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelSupportQueryReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelSupportQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 6204782404060432065L;
|
||||
@ -11,7 +11,7 @@ import java.util.List;
|
||||
* @date 2025/4/22 9:40
|
||||
*/
|
||||
@Data
|
||||
public class PhotovoltaicPanelSupportUpdateReq implements Serializable {
|
||||
public class FacPhotovoltaicPanelSupportUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 2466440719288904185L;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dromara.facility.domain.vo;
|
||||
package org.dromara.facility.domain.vo.boxtransformer;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dromara.facility.domain.vo;
|
||||
package org.dromara.facility.domain.vo.inverter;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/28 16:19
|
||||
*/
|
||||
@Data
|
||||
public class MatrixDetailGisVo implements Serializable {
|
||||
public class FacMatrixDetailGisVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 138750225601876373L;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dromara.facility.domain.vo;
|
||||
package org.dromara.facility.domain.vo.photovoltaicpanel;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dromara.facility.domain.vo;
|
||||
package org.dromara.facility.domain.vo.photovoltaicpanelcolumn;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dromara.facility.domain.vo;
|
||||
package org.dromara.facility.domain.vo.photovoltaicpanelpoint;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dromara.facility.domain.vo;
|
||||
package org.dromara.facility.domain.vo.photovoltaicpanelsupport;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@ -1,7 +1,7 @@
|
||||
package org.dromara.facility.mapper;
|
||||
|
||||
import org.dromara.facility.domain.FacBoxTransformer;
|
||||
import org.dromara.facility.domain.vo.FacBoxTransformerVo;
|
||||
import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package org.dromara.facility.mapper;
|
||||
|
||||
import org.dromara.facility.domain.FacInverter;
|
||||
import org.dromara.facility.domain.vo.FacInverterVo;
|
||||
import org.dromara.facility.domain.vo.inverter.FacInverterVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package org.dromara.facility.mapper;
|
||||
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelColumnVo;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package org.dromara.facility.mapper;
|
||||
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanel;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelVo;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package org.dromara.facility.mapper;
|
||||
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelPointVo;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package org.dromara.facility.mapper;
|
||||
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelSupportVo;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
|
||||
@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.facility.domain.FacBoxTransformer;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerCreateReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerQueryReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacBoxTransformerVo;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
|
||||
import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -37,7 +37,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
|
||||
* @param pageQuery 分页参数
|
||||
* @return 设施-箱变分页列表
|
||||
*/
|
||||
TableDataInfo<FacBoxTransformerVo> queryPageList(BoxTransformerQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<FacBoxTransformerVo> queryPageList(FacBoxTransformerQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的设施-箱变列表
|
||||
@ -45,7 +45,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
|
||||
* @param req 查询条件
|
||||
* @return 设施-箱变列表
|
||||
*/
|
||||
List<FacBoxTransformerVo> queryList(BoxTransformerQueryReq req);
|
||||
List<FacBoxTransformerVo> queryList(FacBoxTransformerQueryReq req);
|
||||
|
||||
/**
|
||||
* 新增设施-箱变
|
||||
@ -53,7 +53,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
|
||||
* @param req 设施-箱变
|
||||
* @return 新增箱变id
|
||||
*/
|
||||
Long insertByBo(BoxTransformerCreateReq req);
|
||||
Long insertByBo(FacBoxTransformerCreateReq req);
|
||||
|
||||
/**
|
||||
* 修改设施-箱变
|
||||
@ -61,7 +61,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
|
||||
* @param req 设施-箱变
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(BoxTransformerUpdateReq req);
|
||||
Boolean updateByBo(FacBoxTransformerUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除设施-箱变信息
|
||||
@ -86,7 +86,7 @@ public interface IFacBoxTransformerService extends IService<FacBoxTransformer> {
|
||||
* @param req 查询条件
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<FacBoxTransformer> buildQueryWrapper(BoxTransformerQueryReq req);
|
||||
LambdaQueryWrapper<FacBoxTransformer> buildQueryWrapper(FacBoxTransformerQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取设施-箱变分页对象视图
|
||||
|
||||
@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.facility.domain.FacInverter;
|
||||
import org.dromara.facility.domain.req.inverter.InverterCreateReq;
|
||||
import org.dromara.facility.domain.req.inverter.InverterQueryReq;
|
||||
import org.dromara.facility.domain.req.inverter.InverterUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacInverterVo;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
|
||||
import org.dromara.facility.domain.vo.inverter.FacInverterVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -37,7 +37,7 @@ public interface IFacInverterService extends IService<FacInverter> {
|
||||
* @param pageQuery 分页参数
|
||||
* @return 设施-逆变器分页列表
|
||||
*/
|
||||
TableDataInfo<FacInverterVo> queryPageList(InverterQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<FacInverterVo> queryPageList(FacInverterQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的设施-逆变器列表
|
||||
@ -45,7 +45,7 @@ public interface IFacInverterService extends IService<FacInverter> {
|
||||
* @param req 查询条件
|
||||
* @return 设施-逆变器列表
|
||||
*/
|
||||
List<FacInverterVo> queryList(InverterQueryReq req);
|
||||
List<FacInverterVo> queryList(FacInverterQueryReq req);
|
||||
|
||||
/**
|
||||
* 新增设施-逆变器
|
||||
@ -53,7 +53,7 @@ public interface IFacInverterService extends IService<FacInverter> {
|
||||
* @param req 设施-逆变器
|
||||
* @return 新增逆变器id
|
||||
*/
|
||||
Long insertByBo(InverterCreateReq req);
|
||||
Long insertByBo(FacInverterCreateReq req);
|
||||
|
||||
/**
|
||||
* 修改设施-逆变器
|
||||
@ -61,7 +61,7 @@ public interface IFacInverterService extends IService<FacInverter> {
|
||||
* @param req 设施-逆变器
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(InverterUpdateReq req);
|
||||
Boolean updateByBo(FacInverterUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除设施-逆变器信息
|
||||
@ -86,7 +86,7 @@ public interface IFacInverterService extends IService<FacInverter> {
|
||||
* @param req 查询条件
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<FacInverter> buildQueryWrapper(InverterQueryReq req);
|
||||
LambdaQueryWrapper<FacInverter> buildQueryWrapper(FacInverterQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取设施-逆变器分页对象视图
|
||||
|
||||
@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.facility.domain.FacMatrix;
|
||||
import org.dromara.facility.domain.req.matrix.*;
|
||||
import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
|
||||
import org.dromara.facility.domain.vo.matrix.MatrixDetailGisVo;
|
||||
import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -36,7 +36,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
|
||||
* @param pageQuery 分页参数
|
||||
* @return 设施-方阵分页列表
|
||||
*/
|
||||
TableDataInfo<FacMatrixVo> queryPageList(MatrixQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<FacMatrixVo> queryPageList(FacMatrixQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的设施-方阵列表
|
||||
@ -44,7 +44,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
|
||||
* @param req 查询条件
|
||||
* @return 设施-方阵列表
|
||||
*/
|
||||
List<FacMatrixVo> queryList(MatrixQueryReq req);
|
||||
List<FacMatrixVo> queryList(FacMatrixQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取大屏方阵详情信息
|
||||
@ -52,7 +52,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
|
||||
* @param req 获取大屏方阵详情信息参数
|
||||
* @return 大屏方阵详情信息
|
||||
*/
|
||||
MatrixDetailGisVo getMatrixDetailGis(MatrixDetailGisReq req);
|
||||
FacMatrixDetailGisVo getMatrixDetailGis(FacMatrixDetailGisReq req);
|
||||
|
||||
/**
|
||||
* 新增设施-方阵
|
||||
@ -60,7 +60,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
|
||||
* @param req 设施-方阵
|
||||
* @return 新增方阵id
|
||||
*/
|
||||
Long insertByBo(MatrixCreateReq req);
|
||||
Long insertByBo(FacMatrixCreateReq req);
|
||||
|
||||
/**
|
||||
* 新增设施-方阵
|
||||
@ -68,7 +68,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
|
||||
* @param geoJson GeoJson格式
|
||||
* @return 新增方阵id
|
||||
*/
|
||||
Boolean insertByGeoJson(MatrixCreateByGeoJsonReq geoJson);
|
||||
Boolean insertByGeoJson(FacMatrixCreateByGeoJsonReq geoJson);
|
||||
|
||||
/**
|
||||
* 修改设施-方阵
|
||||
@ -76,7 +76,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
|
||||
* @param req 设施-方阵
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(MatrixUpdateReq req);
|
||||
Boolean updateByBo(FacMatrixUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除设施-方阵信息
|
||||
@ -101,7 +101,7 @@ public interface IFacMatrixService extends IService<FacMatrix> {
|
||||
* @param req 查询条件
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<FacMatrix> buildQueryWrapper(MatrixQueryReq req);
|
||||
LambdaQueryWrapper<FacMatrix> buildQueryWrapper(FacMatrixQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取设施-方阵分页对象视图
|
||||
|
||||
@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelColumnVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -37,7 +37,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
|
||||
* @param pageQuery 分页参数
|
||||
* @return 设施-光伏板立柱分页列表
|
||||
*/
|
||||
TableDataInfo<FacPhotovoltaicPanelColumnVo> queryPageList(PhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<FacPhotovoltaicPanelColumnVo> queryPageList(FacPhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的设施-光伏板立柱列表
|
||||
@ -45,7 +45,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
|
||||
* @param req 查询条件
|
||||
* @return 设施-光伏板立柱列表
|
||||
*/
|
||||
List<FacPhotovoltaicPanelColumnVo> queryList(PhotovoltaicPanelColumnQueryReq req);
|
||||
List<FacPhotovoltaicPanelColumnVo> queryList(FacPhotovoltaicPanelColumnQueryReq req);
|
||||
|
||||
/**
|
||||
* 新增设施-光伏板立柱
|
||||
@ -53,7 +53,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
|
||||
* @param req 设施-光伏板立柱
|
||||
* @return 新增光伏板立柱id
|
||||
*/
|
||||
Long insertByBo(PhotovoltaicPanelColumnCreateReq req);
|
||||
Long insertByBo(FacPhotovoltaicPanelColumnCreateReq req);
|
||||
|
||||
/**
|
||||
* 修改设施-光伏板立柱
|
||||
@ -61,7 +61,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
|
||||
* @param req 设施-光伏板立柱
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(PhotovoltaicPanelColumnUpdateReq req);
|
||||
Boolean updateByBo(FacPhotovoltaicPanelColumnUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除设施-光伏板立柱信息
|
||||
@ -86,7 +86,7 @@ public interface IFacPhotovoltaicPanelColumnService extends IService<FacPhotovol
|
||||
* @param req 查询条件
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelColumn> buildQueryWrapper(PhotovoltaicPanelColumnQueryReq req);
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelColumn> buildQueryWrapper(FacPhotovoltaicPanelColumnQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取设施-光伏板立柱分页对象视图
|
||||
|
||||
@ -3,8 +3,8 @@ package org.dromara.facility.service;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -23,7 +23,7 @@ public interface IFacPhotovoltaicPanelPartsService {
|
||||
* @param geoJson GeoJson格式
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertPartsByGeoJson(PhotovoltaicPanelPartsCreateByGeoJsonReq geoJson);
|
||||
Boolean insertPartsByGeoJson(FacPhotovoltaicPanelPartsCreateByGeoJsonReq geoJson);
|
||||
|
||||
/**
|
||||
* 批量新增设施-光伏板（桩点、立柱、支架）内部方法
|
||||
@ -53,7 +53,7 @@ public interface IFacPhotovoltaicPanelPartsService {
|
||||
* @param req 设施-光伏板（桩点、立柱、支架）
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertPartsByBatch(PhotovoltaicPanelPartsCreateReq req);
|
||||
Boolean insertPartsByBatch(FacPhotovoltaicPanelPartsCreateReq req);
|
||||
|
||||
/**
|
||||
* 根据方阵主键判断是否存在光伏板点
|
||||
|
||||
@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelPointVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -37,7 +37,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
|
||||
* @param pageQuery 分页参数
|
||||
* @return 设施-光伏板桩点分页列表
|
||||
*/
|
||||
TableDataInfo<FacPhotovoltaicPanelPointVo> queryPageList(PhotovoltaicPanelPointQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<FacPhotovoltaicPanelPointVo> queryPageList(FacPhotovoltaicPanelPointQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的设施-光伏板桩点列表
|
||||
@ -45,7 +45,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
|
||||
* @param req 查询条件
|
||||
* @return 设施-光伏板桩点列表
|
||||
*/
|
||||
List<FacPhotovoltaicPanelPointVo> queryList(PhotovoltaicPanelPointQueryReq req);
|
||||
List<FacPhotovoltaicPanelPointVo> queryList(FacPhotovoltaicPanelPointQueryReq req);
|
||||
|
||||
/**
|
||||
* 新增设施-光伏板桩点
|
||||
@ -53,7 +53,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
|
||||
* @param req 设施-光伏板桩点
|
||||
* @return 新增光伏板桩点id
|
||||
*/
|
||||
Long insertByBo(PhotovoltaicPanelPointCreateReq req);
|
||||
Long insertByBo(FacPhotovoltaicPanelPointCreateReq req);
|
||||
|
||||
/**
|
||||
* 修改设施-光伏板桩点
|
||||
@ -61,7 +61,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
|
||||
* @param req 设施-光伏板桩点
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(PhotovoltaicPanelPointUpdateReq req);
|
||||
Boolean updateByBo(FacPhotovoltaicPanelPointUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除设施-光伏板桩点信息
|
||||
@ -86,7 +86,7 @@ public interface IFacPhotovoltaicPanelPointService extends IService<FacPhotovolt
|
||||
* @param req 查询条件
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelPoint> buildQueryWrapper(PhotovoltaicPanelPointQueryReq req);
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelPoint> buildQueryWrapper(FacPhotovoltaicPanelPointQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取设施-光伏板桩点分页对象视图
|
||||
|
||||
@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanel;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -38,7 +38,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
|
||||
* @param pageQuery 分页参数
|
||||
* @return 设施-光伏板分页列表
|
||||
*/
|
||||
TableDataInfo<FacPhotovoltaicPanelVo> queryPageList(PhotovoltaicPanelQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<FacPhotovoltaicPanelVo> queryPageList(FacPhotovoltaicPanelQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的设施-光伏板列表
|
||||
@ -46,7 +46,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
|
||||
* @param req 查询条件
|
||||
* @return 设施-光伏板列表
|
||||
*/
|
||||
List<FacPhotovoltaicPanelVo> queryList(PhotovoltaicPanelQueryReq req);
|
||||
List<FacPhotovoltaicPanelVo> queryList(FacPhotovoltaicPanelQueryReq req);
|
||||
|
||||
/**
|
||||
* 新增设施-光伏板
|
||||
@ -54,7 +54,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
|
||||
* @param req 设施-光伏板
|
||||
* @return 新增光伏板id
|
||||
*/
|
||||
Long insertByBo(PhotovoltaicPanelCreateReq req);
|
||||
Long insertByBo(FacPhotovoltaicPanelCreateReq req);
|
||||
|
||||
/**
|
||||
* 新增光伏板
|
||||
@ -62,7 +62,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
|
||||
* @param geoJson GeoJson格式
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByGeoJson(PhotovoltaicPanelCreateByGeoJsonReq geoJson);
|
||||
Boolean insertByGeoJson(FacPhotovoltaicPanelCreateByGeoJsonReq geoJson);
|
||||
|
||||
/**
|
||||
* 修改设施-光伏板
|
||||
@ -70,7 +70,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
|
||||
* @param req 设施-光伏板
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(PhotovoltaicPanelUpdateReq req);
|
||||
Boolean updateByBo(FacPhotovoltaicPanelUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除设施-光伏板信息
|
||||
@ -95,7 +95,7 @@ public interface IFacPhotovoltaicPanelService extends IService<FacPhotovoltaicPa
|
||||
* @param req 查询条件
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanel> buildQueryWrapper(PhotovoltaicPanelQueryReq req);
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanel> buildQueryWrapper(FacPhotovoltaicPanelQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取设施-光伏板分页对象视图
|
||||
|
||||
@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelSupportVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -37,7 +37,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
|
||||
* @param pageQuery 分页参数
|
||||
* @return 设施-光伏板支架分页列表
|
||||
*/
|
||||
TableDataInfo<FacPhotovoltaicPanelSupportVo> queryPageList(PhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<FacPhotovoltaicPanelSupportVo> queryPageList(FacPhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的设施-光伏板支架列表
|
||||
@ -45,7 +45,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
|
||||
* @param req 查询条件
|
||||
* @return 设施-光伏板支架列表
|
||||
*/
|
||||
List<FacPhotovoltaicPanelSupportVo> queryList(PhotovoltaicPanelSupportQueryReq req);
|
||||
List<FacPhotovoltaicPanelSupportVo> queryList(FacPhotovoltaicPanelSupportQueryReq req);
|
||||
|
||||
/**
|
||||
* 新增设施-光伏板支架
|
||||
@ -53,7 +53,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
|
||||
* @param req 设施-光伏板支架
|
||||
* @return 新增光伏板支架id
|
||||
*/
|
||||
Long insertByBo(PhotovoltaicPanelSupportCreateReq req);
|
||||
Long insertByBo(FacPhotovoltaicPanelSupportCreateReq req);
|
||||
|
||||
/**
|
||||
* 修改设施-光伏板支架
|
||||
@ -61,7 +61,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
|
||||
* @param req 设施-光伏板支架
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(PhotovoltaicPanelSupportUpdateReq req);
|
||||
Boolean updateByBo(FacPhotovoltaicPanelSupportUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除设施-光伏板支架信息
|
||||
@ -86,7 +86,7 @@ public interface IFacPhotovoltaicPanelSupportService extends IService<FacPhotovo
|
||||
* @param req 查询条件
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelSupport> buildQueryWrapper(PhotovoltaicPanelSupportQueryReq req);
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelSupport> buildQueryWrapper(FacPhotovoltaicPanelSupportQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取设施-光伏板支架分页对象视图
|
||||
|
||||
@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.facility.domain.FacBoxTransformer;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerCreateReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerQueryReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.BoxTransformerUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacBoxTransformerVo;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerCreateReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerQueryReq;
|
||||
import org.dromara.facility.domain.req.boxtransformer.FacBoxTransformerUpdateReq;
|
||||
import org.dromara.facility.domain.vo.boxtransformer.FacBoxTransformerVo;
|
||||
import org.dromara.facility.mapper.FacBoxTransformerMapper;
|
||||
import org.dromara.facility.service.IFacBoxTransformerService;
|
||||
import org.dromara.facility.service.IFacMatrixService;
|
||||
@ -68,7 +68,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
|
||||
* @return 设施-箱变分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<FacBoxTransformerVo> queryPageList(BoxTransformerQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacBoxTransformerVo> queryPageList(FacBoxTransformerQueryReq req, PageQuery pageQuery) {
|
||||
Page<FacBoxTransformer> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
@ -80,7 +80,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
|
||||
* @return 设施-箱变列表
|
||||
*/
|
||||
@Override
|
||||
public List<FacBoxTransformerVo> queryList(BoxTransformerQueryReq req) {
|
||||
public List<FacBoxTransformerVo> queryList(FacBoxTransformerQueryReq req) {
|
||||
List<FacBoxTransformer> boxTransformerList = this.list(this.buildQueryWrapper(req));
|
||||
return boxTransformerList.stream().map(this::getVo).toList();
|
||||
}
|
||||
@ -92,7 +92,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
|
||||
* @return 新增箱变id
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(BoxTransformerCreateReq req) {
|
||||
public Long insertByBo(FacBoxTransformerCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacBoxTransformer boxTransformer = new FacBoxTransformer();
|
||||
BeanUtils.copyProperties(req, boxTransformer);
|
||||
@ -127,7 +127,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(BoxTransformerUpdateReq req) {
|
||||
public Boolean updateByBo(FacBoxTransformerUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacBoxTransformer boxTransformer = new FacBoxTransformer();
|
||||
BeanUtils.copyProperties(req, boxTransformer);
|
||||
@ -235,7 +235,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<FacBoxTransformer> buildQueryWrapper(BoxTransformerQueryReq req) {
|
||||
public LambdaQueryWrapper<FacBoxTransformer> buildQueryWrapper(FacBoxTransformerQueryReq req) {
|
||||
LambdaQueryWrapper<FacBoxTransformer> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
|
||||
@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.facility.domain.FacInverter;
|
||||
import org.dromara.facility.domain.req.inverter.InverterCreateReq;
|
||||
import org.dromara.facility.domain.req.inverter.InverterQueryReq;
|
||||
import org.dromara.facility.domain.req.inverter.InverterUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacInverterVo;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterCreateReq;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterQueryReq;
|
||||
import org.dromara.facility.domain.req.inverter.FacInverterUpdateReq;
|
||||
import org.dromara.facility.domain.vo.inverter.FacInverterVo;
|
||||
import org.dromara.facility.mapper.FacInverterMapper;
|
||||
import org.dromara.facility.service.IFacInverterService;
|
||||
import org.dromara.facility.service.IFacMatrixService;
|
||||
@ -68,7 +68,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
|
||||
* @return 设施-逆变器分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<FacInverterVo> queryPageList(InverterQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacInverterVo> queryPageList(FacInverterQueryReq req, PageQuery pageQuery) {
|
||||
Page<FacInverter> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
@ -80,7 +80,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
|
||||
* @return 设施-逆变器列表
|
||||
*/
|
||||
@Override
|
||||
public List<FacInverterVo> queryList(InverterQueryReq req) {
|
||||
public List<FacInverterVo> queryList(FacInverterQueryReq req) {
|
||||
List<FacInverter> inverterList = this.list(this.buildQueryWrapper(req));
|
||||
return inverterList.stream().map(this::getVo).toList();
|
||||
}
|
||||
@ -92,7 +92,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
|
||||
* @return 新增逆变器id
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(InverterCreateReq req) {
|
||||
public Long insertByBo(FacInverterCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacInverter inverter = new FacInverter();
|
||||
BeanUtils.copyProperties(req, inverter);
|
||||
@ -127,7 +127,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(InverterUpdateReq req) {
|
||||
public Boolean updateByBo(FacInverterUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacInverter inverter = new FacInverter();
|
||||
BeanUtils.copyProperties(req, inverter);
|
||||
@ -235,7 +235,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<FacInverter> buildQueryWrapper(InverterQueryReq req) {
|
||||
public LambdaQueryWrapper<FacInverter> buildQueryWrapper(FacInverterQueryReq req) {
|
||||
LambdaQueryWrapper<FacInverter> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
|
||||
@ -14,13 +14,13 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.facility.domain.*;
|
||||
import org.dromara.facility.domain.enums.FinishStatusEnum;
|
||||
import org.dromara.facility.domain.req.geojson.Feature;
|
||||
import org.dromara.facility.domain.req.geojson.FeatureByPoint;
|
||||
import org.dromara.facility.domain.req.geojson.Geometry;
|
||||
import org.dromara.facility.domain.enums.FacFinishStatusEnum;
|
||||
import org.dromara.facility.domain.req.geojson.FacFeature;
|
||||
import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
|
||||
import org.dromara.facility.domain.req.geojson.FacGeometry;
|
||||
import org.dromara.facility.domain.req.matrix.*;
|
||||
import org.dromara.facility.domain.vo.matrix.FacMatrixVo;
|
||||
import org.dromara.facility.domain.vo.matrix.MatrixDetailGisVo;
|
||||
import org.dromara.facility.domain.vo.matrix.FacMatrixDetailGisVo;
|
||||
import org.dromara.facility.mapper.FacMatrixMapper;
|
||||
import org.dromara.facility.service.*;
|
||||
import org.dromara.project.service.IBusProjectService;
|
||||
@ -97,7 +97,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
* @return 设施-方阵分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<FacMatrixVo> queryPageList(MatrixQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacMatrixVo> queryPageList(FacMatrixQueryReq req, PageQuery pageQuery) {
|
||||
Page<FacMatrix> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
@ -109,7 +109,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
* @return 设施-方阵列表
|
||||
*/
|
||||
@Override
|
||||
public List<FacMatrixVo> queryList(MatrixQueryReq req) {
|
||||
public List<FacMatrixVo> queryList(FacMatrixQueryReq req) {
|
||||
List<FacMatrix> matrixList = this.list(this.buildQueryWrapper(req));
|
||||
return matrixList.stream().map(this::getVo).toList();
|
||||
}
|
||||
@ -121,13 +121,13 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
* @return 大屏方阵详情信息
|
||||
*/
|
||||
@Override
|
||||
public MatrixDetailGisVo getMatrixDetailGis(MatrixDetailGisReq req) {
|
||||
public FacMatrixDetailGisVo getMatrixDetailGis(FacMatrixDetailGisReq req) {
|
||||
Long projectId = req.getProjectId();
|
||||
if (projectId == null || projectService.getById(projectId) == null) {
|
||||
throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
Long matrixId = req.getMatrixId();
|
||||
MatrixDetailGisVo matrixDetailGisVo = new MatrixDetailGisVo();
|
||||
FacMatrixDetailGisVo matrixDetailGisVo = new FacMatrixDetailGisVo();
|
||||
// 获取箱变数量
|
||||
List<FacBoxTransformer> boxTransformerList = boxTransformerService.lambdaQuery()
|
||||
.select(FacBoxTransformer::getId, FacBoxTransformer::getStatus)
|
||||
@ -138,7 +138,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
matrixDetailGisVo.setBoxTransformerCount((long) boxTransformerList.size());
|
||||
matrixDetailGisVo.setBoxTransformerFinishCount(boxTransformerList.stream()
|
||||
.filter(boxTransformer ->
|
||||
FinishStatusEnum.FINISH.getValue().equals(boxTransformer.getStatus())).count());
|
||||
FacFinishStatusEnum.FINISH.getValue().equals(boxTransformer.getStatus())).count());
|
||||
}
|
||||
// 获取逆变器数量
|
||||
List<FacInverter> inverterList = inverterService.lambdaQuery()
|
||||
@ -150,7 +150,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
matrixDetailGisVo.setInverterCount((long) inverterList.size());
|
||||
matrixDetailGisVo.setInverterFinishCount(inverterList.stream()
|
||||
.filter(inverter ->
|
||||
FinishStatusEnum.FINISH.getValue().equals(inverter.getStatus())).count());
|
||||
FacFinishStatusEnum.FINISH.getValue().equals(inverter.getStatus())).count());
|
||||
}
|
||||
// 获取光伏板数量
|
||||
List<FacPhotovoltaicPanel> photovoltaicPanelList = photovoltaicPanelService.lambdaQuery()
|
||||
@ -162,7 +162,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
matrixDetailGisVo.setPhotovoltaicPanelCount((long) photovoltaicPanelList.size());
|
||||
matrixDetailGisVo.setPhotovoltaicPanelFinishCount(photovoltaicPanelList.stream()
|
||||
.filter(photovoltaicPanel ->
|
||||
FinishStatusEnum.FINISH.getValue().equals(photovoltaicPanel.getStatus())).count());
|
||||
FacFinishStatusEnum.FINISH.getValue().equals(photovoltaicPanel.getStatus())).count());
|
||||
}
|
||||
// 获取光伏板点数量
|
||||
List<FacPhotovoltaicPanelPoint> photovoltaicPanelPointList = photovoltaicPanelPointService.lambdaQuery()
|
||||
@ -174,7 +174,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
matrixDetailGisVo.setPointCount((long) photovoltaicPanelPointList.size());
|
||||
matrixDetailGisVo.setPointFinishCount(photovoltaicPanelPointList.stream()
|
||||
.filter(photovoltaicPanelPoint ->
|
||||
FinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelPoint.getStatus())).count());
|
||||
FacFinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelPoint.getStatus())).count());
|
||||
}
|
||||
// 获取支架数量
|
||||
List<FacPhotovoltaicPanelSupport> photovoltaicPanelSupportList = photovoltaicPanelSupportService.lambdaQuery()
|
||||
@ -186,7 +186,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
matrixDetailGisVo.setSupportCount((long) photovoltaicPanelSupportList.size());
|
||||
matrixDetailGisVo.setSupportFinishCount(photovoltaicPanelSupportList.stream()
|
||||
.filter(photovoltaicPanelSupport ->
|
||||
FinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelSupport.getStatus())).count());
|
||||
FacFinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelSupport.getStatus())).count());
|
||||
}
|
||||
// 获取立柱数量
|
||||
List<FacPhotovoltaicPanelColumn> photovoltaicPanelColumnList = photovoltaicPanelColumnService.lambdaQuery()
|
||||
@ -198,7 +198,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
matrixDetailGisVo.setColumnCount((long) photovoltaicPanelColumnList.size());
|
||||
matrixDetailGisVo.setColumnFinishCount(photovoltaicPanelColumnList.stream()
|
||||
.filter(photovoltaicPanelColumn ->
|
||||
FinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelColumn.getStatus())).count());
|
||||
FacFinishStatusEnum.FINISH.getValue().equals(photovoltaicPanelColumn.getStatus())).count());
|
||||
}
|
||||
return matrixDetailGisVo;
|
||||
}
|
||||
@ -210,7 +210,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
* @return 新增方阵id
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(MatrixCreateReq req) {
|
||||
public Long insertByBo(FacMatrixCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacMatrix matrix = new FacMatrix();
|
||||
BeanUtils.copyProperties(req, matrix);
|
||||
@ -246,7 +246,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean insertByGeoJson(MatrixCreateByGeoJsonReq geoJson) {
|
||||
public Boolean insertByGeoJson(FacMatrixCreateByGeoJsonReq geoJson) {
|
||||
Long projectId = geoJson.getProjectId();
|
||||
if (projectService.getById(projectId) == null) {
|
||||
throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
|
||||
@ -255,18 +255,18 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
List<FacMatrix> oldMatrixList = this.lambdaQuery()
|
||||
.eq(FacMatrix::getProjectId, projectId).list();
|
||||
List<FacMatrix> matrixList = new ArrayList<>();
|
||||
List<Feature> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
|
||||
List<FeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
|
||||
List<FacFeature> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
|
||||
List<FacFeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
|
||||
// 遍历位置信息
|
||||
for (Feature feature : locationFeatures) {
|
||||
for (FacFeature feature : locationFeatures) {
|
||||
FacMatrix matrix = new FacMatrix();
|
||||
matrix.setProjectId(projectId);
|
||||
Geometry geometry = feature.getGeometry();
|
||||
FacGeometry geometry = feature.getGeometry();
|
||||
// 获取坐标信息
|
||||
List<List<Double>> coordinatesList = GeoJsonUtils.getTwoDimensionalCoordinates(geometry);
|
||||
// 获取方阵名称
|
||||
String name = null;
|
||||
for (FeatureByPoint nameFeature : nameFeatures) {
|
||||
for (FacFeatureByPoint nameFeature : nameFeatures) {
|
||||
List<Double> nameCoordinates = nameFeature.getGeometry().getCoordinates();
|
||||
Boolean result = GeoJsonUtils.pointIsWithInPlane(coordinatesList, nameCoordinates);
|
||||
if (result) {
|
||||
@ -305,7 +305,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(MatrixUpdateReq req) {
|
||||
public Boolean updateByBo(FacMatrixUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacMatrix matrix = new FacMatrix();
|
||||
BeanUtils.copyProperties(req, matrix);
|
||||
@ -440,7 +440,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<FacMatrix> buildQueryWrapper(MatrixQueryReq req) {
|
||||
public LambdaQueryWrapper<FacMatrix> buildQueryWrapper(FacMatrixQueryReq req) {
|
||||
LambdaQueryWrapper<FacMatrix> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
|
||||
@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.PhotovoltaicPanelColumnUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelColumnVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelcolumn.FacPhotovoltaicPanelColumnVo;
|
||||
import org.dromara.facility.mapper.FacPhotovoltaicPanelColumnMapper;
|
||||
import org.dromara.facility.service.IFacMatrixService;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelColumnService;
|
||||
@ -68,7 +68,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
|
||||
* @return 设施-光伏板立柱分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<FacPhotovoltaicPanelColumnVo> queryPageList(PhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacPhotovoltaicPanelColumnVo> queryPageList(FacPhotovoltaicPanelColumnQueryReq req, PageQuery pageQuery) {
|
||||
Page<FacPhotovoltaicPanelColumn> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
@ -80,7 +80,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
|
||||
* @return 设施-光伏板立柱列表
|
||||
*/
|
||||
@Override
|
||||
public List<FacPhotovoltaicPanelColumnVo> queryList(PhotovoltaicPanelColumnQueryReq req) {
|
||||
public List<FacPhotovoltaicPanelColumnVo> queryList(FacPhotovoltaicPanelColumnQueryReq req) {
|
||||
List<FacPhotovoltaicPanelColumn> photovoltaicPanelColumnList = this.list(this.buildQueryWrapper(req));
|
||||
return photovoltaicPanelColumnList.stream().map(this::getVo).toList();
|
||||
}
|
||||
@ -92,7 +92,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
|
||||
* @return 新增光伏板立柱id
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(PhotovoltaicPanelColumnCreateReq req) {
|
||||
public Long insertByBo(FacPhotovoltaicPanelColumnCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacPhotovoltaicPanelColumn photovoltaicPanelColumn = new FacPhotovoltaicPanelColumn();
|
||||
BeanUtils.copyProperties(req, photovoltaicPanelColumn);
|
||||
@ -127,7 +127,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(PhotovoltaicPanelColumnUpdateReq req) {
|
||||
public Boolean updateByBo(FacPhotovoltaicPanelColumnUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacPhotovoltaicPanelColumn photovoltaicPanelColumn = new FacPhotovoltaicPanelColumn();
|
||||
BeanUtils.copyProperties(req, photovoltaicPanelColumn);
|
||||
@ -235,7 +235,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<FacPhotovoltaicPanelColumn> buildQueryWrapper(PhotovoltaicPanelColumnQueryReq req) {
|
||||
public LambdaQueryWrapper<FacPhotovoltaicPanelColumn> buildQueryWrapper(FacPhotovoltaicPanelColumnQueryReq req) {
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelColumn> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
|
||||
@ -13,9 +13,9 @@ import org.dromara.facility.domain.FacPhotovoltaicPanel;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelColumn;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
|
||||
import org.dromara.facility.domain.req.geojson.FeatureByPoint;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.PhotovoltaicPanelPartsCreateReq;
|
||||
import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelparts.FacPhotovoltaicPanelPartsCreateReq;
|
||||
import org.dromara.facility.service.*;
|
||||
import org.dromara.project.service.IBusProjectService;
|
||||
import org.dromara.utils.GeoJsonUtils;
|
||||
@ -70,7 +70,7 @@ public class FacPhotovoltaicPanelPartsServiceImpl implements IFacPhotovoltaicPan
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertPartsByGeoJson(PhotovoltaicPanelPartsCreateByGeoJsonReq geoJson) {
|
||||
public Boolean insertPartsByGeoJson(FacPhotovoltaicPanelPartsCreateByGeoJsonReq geoJson) {
|
||||
Long projectId = geoJson.getProjectId();
|
||||
if (projectService.getById(projectId) == null) {
|
||||
throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
|
||||
@ -81,7 +81,7 @@ public class FacPhotovoltaicPanelPartsServiceImpl implements IFacPhotovoltaicPan
|
||||
if (CollUtil.isEmpty(photovoltaicPanelList)) {
|
||||
throw new ServiceException("项目下未创建光伏板", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
List<FeatureByPoint> features = geoJson.getPointGeoJson().getFeatures();
|
||||
List<FacFeatureByPoint> features = geoJson.getPointGeoJson().getFeatures();
|
||||
// 获取数据库中所有点的列表
|
||||
List<FacPhotovoltaicPanelPoint> oldPointList = photovoltaicPanelPointService.lambdaQuery()
|
||||
.eq(FacPhotovoltaicPanelPoint::getProjectId, projectId).list();
|
||||
@ -324,7 +324,7 @@ public class FacPhotovoltaicPanelPartsServiceImpl implements IFacPhotovoltaicPan
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean insertPartsByBatch(PhotovoltaicPanelPartsCreateReq req) {
|
||||
public Boolean insertPartsByBatch(FacPhotovoltaicPanelPartsCreateReq req) {
|
||||
// 参数校验
|
||||
Long projectId = req.getProjectId();
|
||||
if (projectId == null || projectService.getById(projectId) == null) {
|
||||
|
||||
@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelPoint;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.PhotovoltaicPanelPointUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelPointVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelpoint.FacPhotovoltaicPanelPointUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelpoint.FacPhotovoltaicPanelPointVo;
|
||||
import org.dromara.facility.mapper.FacPhotovoltaicPanelPointMapper;
|
||||
import org.dromara.facility.service.IFacMatrixService;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelPointService;
|
||||
@ -68,7 +68,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
|
||||
* @return 设施-光伏板桩点分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<FacPhotovoltaicPanelPointVo> queryPageList(PhotovoltaicPanelPointQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacPhotovoltaicPanelPointVo> queryPageList(FacPhotovoltaicPanelPointQueryReq req, PageQuery pageQuery) {
|
||||
Page<FacPhotovoltaicPanelPoint> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
@ -80,7 +80,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
|
||||
* @return 设施-光伏板桩点列表
|
||||
*/
|
||||
@Override
|
||||
public List<FacPhotovoltaicPanelPointVo> queryList(PhotovoltaicPanelPointQueryReq req) {
|
||||
public List<FacPhotovoltaicPanelPointVo> queryList(FacPhotovoltaicPanelPointQueryReq req) {
|
||||
List<FacPhotovoltaicPanelPoint> photovoltaicPanelPointList = this.list(this.buildQueryWrapper(req));
|
||||
return photovoltaicPanelPointList.stream().map(this::getVo).toList();
|
||||
}
|
||||
@ -92,7 +92,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
|
||||
* @return 新增光伏板桩点id
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(PhotovoltaicPanelPointCreateReq req) {
|
||||
public Long insertByBo(FacPhotovoltaicPanelPointCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacPhotovoltaicPanelPoint photovoltaicPanelPoint = new FacPhotovoltaicPanelPoint();
|
||||
BeanUtils.copyProperties(req, photovoltaicPanelPoint);
|
||||
@ -127,7 +127,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(PhotovoltaicPanelPointUpdateReq req) {
|
||||
public Boolean updateByBo(FacPhotovoltaicPanelPointUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacPhotovoltaicPanelPoint photovoltaicPanelPoint = new FacPhotovoltaicPanelPoint();
|
||||
BeanUtils.copyProperties(req, photovoltaicPanelPoint);
|
||||
@ -235,7 +235,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<FacPhotovoltaicPanelPoint> buildQueryWrapper(PhotovoltaicPanelPointQueryReq req) {
|
||||
public LambdaQueryWrapper<FacPhotovoltaicPanelPoint> buildQueryWrapper(FacPhotovoltaicPanelPointQueryReq req) {
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelPoint> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
|
||||
@ -14,14 +14,14 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanel;
|
||||
import org.dromara.facility.domain.req.geojson.FeatureByPlane;
|
||||
import org.dromara.facility.domain.req.geojson.FeatureByPoint;
|
||||
import org.dromara.facility.domain.req.geojson.GeometryByPlane;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.PhotovoltaicPanelUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelVo;
|
||||
import org.dromara.facility.domain.req.geojson.FacFeatureByPlane;
|
||||
import org.dromara.facility.domain.req.geojson.FacFeatureByPoint;
|
||||
import org.dromara.facility.domain.req.geojson.FacGeometryByPlane;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateByGeoJsonReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanel.FacPhotovoltaicPanelUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanel.FacPhotovoltaicPanelVo;
|
||||
import org.dromara.facility.mapper.FacPhotovoltaicPanelMapper;
|
||||
import org.dromara.facility.service.IFacMatrixService;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService;
|
||||
@ -83,7 +83,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
|
||||
* @return 设施-光伏板分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<FacPhotovoltaicPanelVo> queryPageList(PhotovoltaicPanelQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacPhotovoltaicPanelVo> queryPageList(FacPhotovoltaicPanelQueryReq req, PageQuery pageQuery) {
|
||||
Page<FacPhotovoltaicPanel> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
@ -95,7 +95,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
|
||||
* @return 设施-光伏板列表
|
||||
*/
|
||||
@Override
|
||||
public List<FacPhotovoltaicPanelVo> queryList(PhotovoltaicPanelQueryReq req) {
|
||||
public List<FacPhotovoltaicPanelVo> queryList(FacPhotovoltaicPanelQueryReq req) {
|
||||
List<FacPhotovoltaicPanel> photovoltaicPanelList = this.list(this.buildQueryWrapper(req));
|
||||
return photovoltaicPanelList.stream().map(this::getVo).toList();
|
||||
}
|
||||
@ -107,7 +107,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
|
||||
* @return 新增光伏板id
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(PhotovoltaicPanelCreateReq req) {
|
||||
public Long insertByBo(FacPhotovoltaicPanelCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel();
|
||||
BeanUtils.copyProperties(req, photovoltaicPanel);
|
||||
@ -143,7 +143,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean insertByGeoJson(PhotovoltaicPanelCreateByGeoJsonReq geoJson) {
|
||||
public Boolean insertByGeoJson(FacPhotovoltaicPanelCreateByGeoJsonReq geoJson) {
|
||||
Long projectId = geoJson.getProjectId();
|
||||
if (projectService.getById(projectId) == null) {
|
||||
throw new ServiceException("项目不存在", HttpStatus.NOT_FOUND);
|
||||
@ -165,11 +165,11 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
|
||||
));
|
||||
// 获取数据库中光伏板信息
|
||||
List<FacPhotovoltaicPanel> photovoltaicPanelList = new ArrayList<>();
|
||||
List<FeatureByPlane> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
|
||||
List<FeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
|
||||
for (FeatureByPlane locationFeature : locationFeatures) {
|
||||
List<FacFeatureByPlane> locationFeatures = geoJson.getLocationGeoJson().getFeatures();
|
||||
List<FacFeatureByPoint> nameFeatures = geoJson.getNameGeoJson().getFeatures();
|
||||
for (FacFeatureByPlane locationFeature : locationFeatures) {
|
||||
FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel();
|
||||
GeometryByPlane geometry = locationFeature.getGeometry();
|
||||
FacGeometryByPlane geometry = locationFeature.getGeometry();
|
||||
List<List<Double>> coordinates = geometry.getCoordinates().get(0);
|
||||
// todo 判断光伏板在哪个方阵里
|
||||
/* Long matrixId = null;
|
||||
@ -193,7 +193,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
|
||||
photovoltaicPanel.setMatrixId(1L);
|
||||
// 获取光伏板名称
|
||||
String name = null;
|
||||
for (FeatureByPoint nameFeature : nameFeatures) {
|
||||
for (FacFeatureByPoint nameFeature : nameFeatures) {
|
||||
List<Double> nameCoordinates = nameFeature.getGeometry().getCoordinates();
|
||||
Boolean result = GeoJsonUtils.pointIsWithInPlane(coordinates, nameCoordinates);
|
||||
if (result) {
|
||||
@ -240,7 +240,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(PhotovoltaicPanelUpdateReq req) {
|
||||
public Boolean updateByBo(FacPhotovoltaicPanelUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacPhotovoltaicPanel photovoltaicPanel = new FacPhotovoltaicPanel();
|
||||
BeanUtils.copyProperties(req, photovoltaicPanel);
|
||||
@ -362,7 +362,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<FacPhotovoltaicPanel> buildQueryWrapper(PhotovoltaicPanelQueryReq req) {
|
||||
public LambdaQueryWrapper<FacPhotovoltaicPanel> buildQueryWrapper(FacPhotovoltaicPanelQueryReq req) {
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanel> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
|
||||
@ -14,10 +14,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.facility.domain.FacPhotovoltaicPanelSupport;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.PhotovoltaicPanelSupportUpdateReq;
|
||||
import org.dromara.facility.domain.vo.FacPhotovoltaicPanelSupportVo;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportCreateReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportQueryReq;
|
||||
import org.dromara.facility.domain.req.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportUpdateReq;
|
||||
import org.dromara.facility.domain.vo.photovoltaicpanelsupport.FacPhotovoltaicPanelSupportVo;
|
||||
import org.dromara.facility.mapper.FacPhotovoltaicPanelSupportMapper;
|
||||
import org.dromara.facility.service.IFacMatrixService;
|
||||
import org.dromara.facility.service.IFacPhotovoltaicPanelSupportService;
|
||||
@ -68,7 +68,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
|
||||
* @return 设施-光伏板支架分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<FacPhotovoltaicPanelSupportVo> queryPageList(PhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<FacPhotovoltaicPanelSupportVo> queryPageList(FacPhotovoltaicPanelSupportQueryReq req, PageQuery pageQuery) {
|
||||
Page<FacPhotovoltaicPanelSupport> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
@ -80,7 +80,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
|
||||
* @return 设施-光伏板支架列表
|
||||
*/
|
||||
@Override
|
||||
public List<FacPhotovoltaicPanelSupportVo> queryList(PhotovoltaicPanelSupportQueryReq req) {
|
||||
public List<FacPhotovoltaicPanelSupportVo> queryList(FacPhotovoltaicPanelSupportQueryReq req) {
|
||||
List<FacPhotovoltaicPanelSupport> photovoltaicPanelSupportList = this.list(this.buildQueryWrapper(req));
|
||||
return photovoltaicPanelSupportList.stream().map(this::getVo).toList();
|
||||
}
|
||||
@ -92,7 +92,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
|
||||
* @return 新增光伏板支架id
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(PhotovoltaicPanelSupportCreateReq req) {
|
||||
public Long insertByBo(FacPhotovoltaicPanelSupportCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacPhotovoltaicPanelSupport photovoltaicPanelSupport = new FacPhotovoltaicPanelSupport();
|
||||
BeanUtils.copyProperties(req, photovoltaicPanelSupport);
|
||||
@ -127,7 +127,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(PhotovoltaicPanelSupportUpdateReq req) {
|
||||
public Boolean updateByBo(FacPhotovoltaicPanelSupportUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
FacPhotovoltaicPanelSupport photovoltaicPanelSupport = new FacPhotovoltaicPanelSupport();
|
||||
BeanUtils.copyProperties(req, photovoltaicPanelSupport);
|
||||
@ -235,7 +235,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
|
||||
* @return 查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<FacPhotovoltaicPanelSupport> buildQueryWrapper(PhotovoltaicPanelSupportQueryReq req) {
|
||||
public LambdaQueryWrapper<FacPhotovoltaicPanelSupport> buildQueryWrapper(FacPhotovoltaicPanelSupportQueryReq req) {
|
||||
LambdaQueryWrapper<FacPhotovoltaicPanelSupport> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
|
||||
@ -15,13 +15,13 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryGisReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.BusMachineryVo;
|
||||
import org.dromara.machinery.domain.vo.MachineryGisVo;
|
||||
import org.dromara.machinery.service.IBusMachineryService;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
|
||||
import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
|
||||
import org.dromara.machinery.service.IEqpMachineryService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@ -37,16 +37,16 @@ import java.util.List;
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/machinery/machinery")
|
||||
public class BusMachineryController extends BaseController {
|
||||
public class EqpMachineryController extends BaseController {
|
||||
|
||||
private final IBusMachineryService busMachineryService;
|
||||
private final IEqpMachineryService busMachineryService;
|
||||
|
||||
/**
|
||||
* 查询机械列表
|
||||
*/
|
||||
@SaCheckPermission("machinery:machinery:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BusMachineryVo> list(MachineryQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<EqpMachineryVo> list(EqpMachineryQueryReq req, PageQuery pageQuery) {
|
||||
return busMachineryService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -56,9 +56,9 @@ public class BusMachineryController extends BaseController {
|
||||
@SaCheckPermission("machinery:machinery:export")
|
||||
@Log(title = "机械", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(MachineryQueryReq req, HttpServletResponse response) {
|
||||
List<BusMachineryVo> list = busMachineryService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "机械", BusMachineryVo.class, response);
|
||||
public void export(EqpMachineryQueryReq req, HttpServletResponse response) {
|
||||
List<EqpMachineryVo> list = busMachineryService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "机械", EqpMachineryVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -66,7 +66,7 @@ public class BusMachineryController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("machinery:machinery:list")
|
||||
@GetMapping("/list/gis")
|
||||
public R<List<MachineryGisVo>> queryGisList(MachineryGisReq req) {
|
||||
public R<List<EqpMachineryGisVo>> queryGisList(EqpMachineryGisReq req) {
|
||||
return R.ok(busMachineryService.queryGisList(req));
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ public class BusMachineryController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("machinery:machinery:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<BusMachineryVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
public R<EqpMachineryVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(busMachineryService.queryById(id));
|
||||
}
|
||||
@ -89,7 +89,7 @@ public class BusMachineryController extends BaseController {
|
||||
@Log(title = "机械", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody MachineryCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody EqpMachineryCreateReq req) {
|
||||
return R.ok(busMachineryService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -100,7 +100,7 @@ public class BusMachineryController extends BaseController {
|
||||
@Log(title = "机械", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody MachineryUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody EqpMachineryUpdateReq req) {
|
||||
return toAjax(busMachineryService.updateByBo(req));
|
||||
}
|
||||
|
||||
@ -15,11 +15,11 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.BusMachineryDetailVo;
|
||||
import org.dromara.machinery.service.IBusMachineryDetailService;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
|
||||
import org.dromara.machinery.service.IEqpMachineryDetailService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@ -35,16 +35,16 @@ import java.util.List;
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/machinery/machineryDetail")
|
||||
public class BusMachineryDetailController extends BaseController {
|
||||
public class EqpMachineryDetailController extends BaseController {
|
||||
|
||||
private final IBusMachineryDetailService busMachineryDetailService;
|
||||
private final IEqpMachineryDetailService busMachineryDetailService;
|
||||
|
||||
/**
|
||||
* 查询机械详情列表
|
||||
*/
|
||||
@SaCheckPermission("machinery:machineryDetail:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BusMachineryDetailVo> list(MachineryDetailQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<EqpMachineryDetailVo> list(EqpMachineryDetailQueryReq req, PageQuery pageQuery) {
|
||||
return busMachineryDetailService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -54,9 +54,9 @@ public class BusMachineryDetailController extends BaseController {
|
||||
@SaCheckPermission("machinery:machineryDetail:export")
|
||||
@Log(title = "机械详情", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(MachineryDetailQueryReq req, HttpServletResponse response) {
|
||||
List<BusMachineryDetailVo> list = busMachineryDetailService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "机械详情", BusMachineryDetailVo.class, response);
|
||||
public void export(EqpMachineryDetailQueryReq req, HttpServletResponse response) {
|
||||
List<EqpMachineryDetailVo> list = busMachineryDetailService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "机械详情", EqpMachineryDetailVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -66,7 +66,7 @@ public class BusMachineryDetailController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("machinery:machineryDetail:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<BusMachineryDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
public R<EqpMachineryDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(busMachineryDetailService.queryById(id));
|
||||
}
|
||||
@ -78,7 +78,7 @@ public class BusMachineryDetailController extends BaseController {
|
||||
@Log(title = "机械详情", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody MachineryDetailCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody EqpMachineryDetailCreateReq req) {
|
||||
return R.ok(busMachineryDetailService.insertByBo(req));
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ public class BusMachineryDetailController extends BaseController {
|
||||
@Log(title = "机械详情", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody MachineryDetailUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody EqpMachineryDetailUpdateReq req) {
|
||||
return toAjax(busMachineryDetailService.updateByBo(req));
|
||||
}
|
||||
|
||||
@ -11,15 +11,15 @@ import java.io.Serial;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 机械对象 bus_machinery
|
||||
* 机械对象 eqp_machinery
|
||||
*
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("bus_machinery")
|
||||
public class BusMachinery extends BaseEntity {
|
||||
@TableName("eqp_machinery")
|
||||
public class EqpMachinery extends BaseEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
@ -11,15 +11,15 @@ import java.io.Serial;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 机械详情对象 bus_machinery_detail
|
||||
* 机械详情对象 eqp_machinery_detail
|
||||
*
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("bus_machinery_detail")
|
||||
public class BusMachineryDetail extends BaseEntity {
|
||||
@TableName("eqp_machinery_detail")
|
||||
public class EqpMachineryDetail extends BaseEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/3/5 14:05
|
||||
*/
|
||||
@Data
|
||||
public class MachineryCreateReq implements Serializable {
|
||||
public class EqpMachineryCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -7603153089205421154L;
|
||||
@ -11,7 +11,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/28 10:26
|
||||
*/
|
||||
@Data
|
||||
public class MachineryGisReq implements Serializable {
|
||||
public class EqpMachineryGisReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -5157791260034938544L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/3/5 14:31
|
||||
*/
|
||||
@Data
|
||||
public class MachineryQueryReq implements Serializable {
|
||||
public class EqpMachineryQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 3252651952758479341L;
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/3/5 15:04
|
||||
*/
|
||||
@Data
|
||||
public class MachineryUpdateReq implements Serializable {
|
||||
public class EqpMachineryUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -8022860866890925958L;
|
||||
@ -11,7 +11,7 @@ import java.util.Date;
|
||||
* @date 2025/3/5 14:05
|
||||
*/
|
||||
@Data
|
||||
public class MachineryDetailCreateReq implements Serializable {
|
||||
public class EqpMachineryDetailCreateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -7603153089205421154L;
|
||||
@ -11,7 +11,7 @@ import java.util.Date;
|
||||
* @date 2025/3/5 14:31
|
||||
*/
|
||||
@Data
|
||||
public class MachineryDetailQueryReq implements Serializable {
|
||||
public class EqpMachineryDetailQueryReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 3252651952758479341L;
|
||||
@ -11,7 +11,7 @@ import java.util.Date;
|
||||
* @date 2025/3/5 15:04
|
||||
*/
|
||||
@Data
|
||||
public class MachineryDetailUpdateReq implements Serializable {
|
||||
public class EqpMachineryDetailUpdateReq implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -8022860866890925958L;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dromara.machinery.domain.vo;
|
||||
package org.dromara.machinery.domain.vo.machinery;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
* @date 2025/4/28 10:27
|
||||
*/
|
||||
@Data
|
||||
public class MachineryGisVo implements Serializable {
|
||||
public class EqpMachineryGisVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = -724470814094084721L;
|
||||
@ -1,10 +1,10 @@
|
||||
package org.dromara.machinery.domain.vo;
|
||||
package org.dromara.machinery.domain.vo.machinery;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import org.dromara.machinery.domain.BusMachinery;
|
||||
import org.dromara.machinery.domain.EqpMachinery;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
@ -12,15 +12,15 @@ import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* 机械视图对象 bus_machinery
|
||||
* 机械视图对象 eqp_machinery
|
||||
*
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = BusMachinery.class)
|
||||
public class BusMachineryVo implements Serializable {
|
||||
@AutoMapper(target = EqpMachinery.class)
|
||||
public class EqpMachineryVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
@ -1,4 +1,4 @@
|
||||
package org.dromara.machinery.domain.vo;
|
||||
package org.dromara.machinery.domain.vo.machinerydetail;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@ -6,7 +6,7 @@ import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
||||
import org.dromara.common.excel.convert.ExcelDictConvert;
|
||||
import org.dromara.machinery.domain.BusMachineryDetail;
|
||||
import org.dromara.machinery.domain.EqpMachineryDetail;
|
||||
import org.dromara.system.domain.vo.SysOssVo;
|
||||
|
||||
import java.io.Serial;
|
||||
@ -16,15 +16,15 @@ import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 机械详情视图对象 bus_machinery_detail
|
||||
* 机械详情视图对象 eqp_machinery_detail
|
||||
*
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = BusMachineryDetail.class)
|
||||
public class BusMachineryDetailVo implements Serializable {
|
||||
@AutoMapper(target = EqpMachineryDetail.class)
|
||||
public class EqpMachineryDetailVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
@ -1,15 +0,0 @@
|
||||
package org.dromara.machinery.mapper;
|
||||
|
||||
import org.dromara.machinery.domain.BusMachineryDetail;
|
||||
import org.dromara.machinery.domain.vo.BusMachineryDetailVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 机械详情Mapper接口
|
||||
*
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public interface BusMachineryDetailMapper extends BaseMapperPlus<BusMachineryDetail, BusMachineryDetailVo> {
|
||||
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package org.dromara.machinery.mapper;
|
||||
|
||||
import org.dromara.machinery.domain.BusMachinery;
|
||||
import org.dromara.machinery.domain.vo.BusMachineryVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 机械Mapper接口
|
||||
*
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public interface BusMachineryMapper extends BaseMapperPlus<BusMachinery, BusMachineryVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.machinery.mapper;
|
||||
|
||||
import org.dromara.machinery.domain.EqpMachineryDetail;
|
||||
import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 机械详情Mapper接口
|
||||
*
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public interface EqpMachineryDetailMapper extends BaseMapperPlus<EqpMachineryDetail, EqpMachineryDetailVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.machinery.mapper;
|
||||
|
||||
import org.dromara.machinery.domain.EqpMachinery;
|
||||
import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 机械Mapper接口
|
||||
*
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public interface EqpMachineryMapper extends BaseMapperPlus<EqpMachinery, EqpMachineryVo> {
|
||||
|
||||
}
|
||||
@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.machinery.domain.BusMachineryDetail;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.BusMachineryDetailVo;
|
||||
import org.dromara.machinery.domain.EqpMachineryDetail;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -20,7 +20,7 @@ import java.util.List;
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public interface IBusMachineryDetailService extends IService<BusMachineryDetail> {
|
||||
public interface IEqpMachineryDetailService extends IService<EqpMachineryDetail> {
|
||||
|
||||
/**
|
||||
* 查询机械详情
|
||||
@ -28,7 +28,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
|
||||
* @param id 主键
|
||||
* @return 机械详情
|
||||
*/
|
||||
BusMachineryDetailVo queryById(Long id);
|
||||
EqpMachineryDetailVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询机械详情列表
|
||||
@ -37,7 +37,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
|
||||
* @param pageQuery 分页参数
|
||||
* @return 机械详情分页列表
|
||||
*/
|
||||
TableDataInfo<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<EqpMachineryDetailVo> queryPageList(EqpMachineryDetailQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的机械详情列表
|
||||
@ -45,7 +45,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
|
||||
* @param req 查询条件
|
||||
* @return 机械详情列表
|
||||
*/
|
||||
List<BusMachineryDetailVo> queryList(MachineryDetailQueryReq req);
|
||||
List<EqpMachineryDetailVo> queryList(EqpMachineryDetailQueryReq req);
|
||||
|
||||
/**
|
||||
* 新增机械详情
|
||||
@ -53,7 +53,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
|
||||
* @param req 机械详情
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Long insertByBo(MachineryDetailCreateReq req);
|
||||
Long insertByBo(EqpMachineryDetailCreateReq req);
|
||||
|
||||
/**
|
||||
* 修改机械详情
|
||||
@ -61,7 +61,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
|
||||
* @param req 机械详情
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(MachineryDetailUpdateReq req);
|
||||
Boolean updateByBo(EqpMachineryDetailUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除机械详情信息
|
||||
@ -78,7 +78,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
|
||||
* @param machineryDetail 机械详情对象
|
||||
* @return 机械详情视图对象
|
||||
*/
|
||||
BusMachineryDetailVo getVo(BusMachineryDetail machineryDetail);
|
||||
EqpMachineryDetailVo getVo(EqpMachineryDetail machineryDetail);
|
||||
|
||||
/**
|
||||
* 获取机械详情查询条件封装
|
||||
@ -86,7 +86,7 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
|
||||
* @param req 机械详情查询条件
|
||||
* @return 机械详情查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<BusMachineryDetail> buildQueryWrapper(MachineryDetailQueryReq req);
|
||||
LambdaQueryWrapper<EqpMachineryDetail> buildQueryWrapper(EqpMachineryDetailQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取机械详情分页对象视图
|
||||
@ -94,5 +94,5 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
|
||||
* @param machineryDetailPage 机械详情分页对象
|
||||
* @return 机械详情分页对象视图
|
||||
*/
|
||||
Page<BusMachineryDetailVo> getVoPage(Page<BusMachineryDetail> machineryDetailPage);
|
||||
Page<EqpMachineryDetailVo> getVoPage(Page<EqpMachineryDetail> machineryDetailPage);
|
||||
}
|
||||
@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.machinery.domain.BusMachinery;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryGisReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.BusMachineryVo;
|
||||
import org.dromara.machinery.domain.vo.MachineryGisVo;
|
||||
import org.dromara.machinery.domain.EqpMachinery;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
|
||||
import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@ -22,7 +22,7 @@ import java.util.List;
|
||||
* @author lcj
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
public interface IEqpMachineryService extends IService<EqpMachinery> {
|
||||
|
||||
/**
|
||||
* 查询机械
|
||||
@ -30,7 +30,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param id 主键
|
||||
* @return 机械
|
||||
*/
|
||||
BusMachineryVo queryById(Long id);
|
||||
EqpMachineryVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 分页查询机械列表
|
||||
@ -39,7 +39,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param pageQuery 分页条件
|
||||
* @return 机械分页列表
|
||||
*/
|
||||
TableDataInfo<BusMachineryVo> queryPageList(MachineryQueryReq req, PageQuery pageQuery);
|
||||
TableDataInfo<EqpMachineryVo> queryPageList(EqpMachineryQueryReq req, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的机械列表
|
||||
@ -47,7 +47,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param req 查询条件
|
||||
* @return 机械列表
|
||||
*/
|
||||
List<BusMachineryVo> queryList(MachineryQueryReq req);
|
||||
List<EqpMachineryVo> queryList(EqpMachineryQueryReq req);
|
||||
|
||||
/**
|
||||
* 查询机械大屏数据列表
|
||||
@ -55,7 +55,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param req 筛选条件
|
||||
* @return 大屏数据列表
|
||||
*/
|
||||
List<MachineryGisVo> queryGisList(MachineryGisReq req);
|
||||
List<EqpMachineryGisVo> queryGisList(EqpMachineryGisReq req);
|
||||
|
||||
/**
|
||||
* 新增机械
|
||||
@ -63,7 +63,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param req 机械
|
||||
* @return 新增机械id
|
||||
*/
|
||||
Long insertByBo(MachineryCreateReq req);
|
||||
Long insertByBo(EqpMachineryCreateReq req);
|
||||
|
||||
/**
|
||||
* 修改机械
|
||||
@ -71,7 +71,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param req 机械
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(MachineryUpdateReq req);
|
||||
Boolean updateByBo(EqpMachineryUpdateReq req);
|
||||
|
||||
/**
|
||||
* 校验并批量删除机械信息
|
||||
@ -88,7 +88,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param machinery 机械对象
|
||||
* @return 机械视图对象
|
||||
*/
|
||||
BusMachineryVo getVo(BusMachinery machinery);
|
||||
EqpMachineryVo getVo(EqpMachinery machinery);
|
||||
|
||||
/**
|
||||
* 获取机械查询条件封装
|
||||
@ -96,7 +96,7 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param req 机械查询条件
|
||||
* @return 机械查询条件封装
|
||||
*/
|
||||
LambdaQueryWrapper<BusMachinery> buildQueryWrapper(MachineryQueryReq req);
|
||||
LambdaQueryWrapper<EqpMachinery> buildQueryWrapper(EqpMachineryQueryReq req);
|
||||
|
||||
/**
|
||||
* 获取机械分页对象视图
|
||||
@ -104,5 +104,5 @@ public interface IBusMachineryService extends IService<BusMachinery> {
|
||||
* @param machineryPage 机械分页对象
|
||||
* @return 机械分页对象视图
|
||||
*/
|
||||
Page<BusMachineryVo> getVoPage(Page<BusMachinery> machineryPage);
|
||||
Page<EqpMachineryVo> getVoPage(Page<EqpMachinery> machineryPage);
|
||||
}
|
||||
@ -12,15 +12,15 @@ import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.machinery.domain.BusMachinery;
|
||||
import org.dromara.machinery.domain.BusMachineryDetail;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.BusMachineryDetailVo;
|
||||
import org.dromara.machinery.mapper.BusMachineryDetailMapper;
|
||||
import org.dromara.machinery.service.IBusMachineryDetailService;
|
||||
import org.dromara.machinery.service.IBusMachineryService;
|
||||
import org.dromara.machinery.domain.EqpMachinery;
|
||||
import org.dromara.machinery.domain.EqpMachineryDetail;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinerydetail.EqpMachineryDetailUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.machinerydetail.EqpMachineryDetailVo;
|
||||
import org.dromara.machinery.mapper.EqpMachineryDetailMapper;
|
||||
import org.dromara.machinery.service.IEqpMachineryDetailService;
|
||||
import org.dromara.machinery.service.IEqpMachineryService;
|
||||
import org.dromara.project.service.IBusProjectService;
|
||||
import org.dromara.system.domain.vo.SysOssVo;
|
||||
import org.dromara.system.service.ISysOssService;
|
||||
@ -40,11 +40,11 @@ import java.util.List;
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
@Service
|
||||
public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetailMapper, BusMachineryDetail>
|
||||
implements IBusMachineryDetailService {
|
||||
public class EqpMachineryDetailServiceImpl extends ServiceImpl<EqpMachineryDetailMapper, EqpMachineryDetail>
|
||||
implements IEqpMachineryDetailService {
|
||||
|
||||
@Resource
|
||||
private IBusMachineryService machineryService;
|
||||
private IEqpMachineryService machineryService;
|
||||
|
||||
@Resource
|
||||
private IBusProjectService projectService;
|
||||
@ -59,8 +59,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
* @return 机械详情
|
||||
*/
|
||||
@Override
|
||||
public BusMachineryDetailVo queryById(Long id) {
|
||||
BusMachineryDetail machineryDetail = this.getById(id);
|
||||
public EqpMachineryDetailVo queryById(Long id) {
|
||||
EqpMachineryDetail machineryDetail = this.getById(id);
|
||||
if (machineryDetail == null) {
|
||||
throw new ServiceException("机械详情信息不存在", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
@ -75,9 +75,9 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
* @return 机械详情分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<EqpMachineryDetailVo> queryPageList(EqpMachineryDetailQueryReq req, PageQuery pageQuery) {
|
||||
// 查询数据库
|
||||
Page<BusMachineryDetail> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
Page<EqpMachineryDetail> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
|
||||
@ -88,9 +88,9 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
* @return 机械详情列表
|
||||
*/
|
||||
@Override
|
||||
public List<BusMachineryDetailVo> queryList(MachineryDetailQueryReq req) {
|
||||
LambdaQueryWrapper<BusMachineryDetail> lqw = this.buildQueryWrapper(req);
|
||||
List<BusMachineryDetail> list = this.list(lqw);
|
||||
public List<EqpMachineryDetailVo> queryList(EqpMachineryDetailQueryReq req) {
|
||||
LambdaQueryWrapper<EqpMachineryDetail> lqw = this.buildQueryWrapper(req);
|
||||
List<EqpMachineryDetail> list = this.list(lqw);
|
||||
return list.stream().map(this::getVo).toList();
|
||||
}
|
||||
|
||||
@ -101,9 +101,9 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(MachineryDetailCreateReq req) {
|
||||
public Long insertByBo(EqpMachineryDetailCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
BusMachineryDetail machineryDetail = new BusMachineryDetail();
|
||||
EqpMachineryDetail machineryDetail = new EqpMachineryDetail();
|
||||
BeanUtils.copyProperties(req, machineryDetail);
|
||||
// 数据校验
|
||||
validEntityBeforeSave(machineryDetail);
|
||||
@ -122,14 +122,14 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(MachineryDetailUpdateReq req) {
|
||||
public Boolean updateByBo(EqpMachineryDetailUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
BusMachineryDetail machineryDetail = new BusMachineryDetail();
|
||||
EqpMachineryDetail machineryDetail = new EqpMachineryDetail();
|
||||
BeanUtils.copyProperties(req, machineryDetail);
|
||||
// 数据校验
|
||||
validEntityBeforeSave(machineryDetail);
|
||||
// 判断是否存在
|
||||
BusMachineryDetail oldMachineryDetail = this.getById(machineryDetail.getId());
|
||||
EqpMachineryDetail oldMachineryDetail = this.getById(machineryDetail.getId());
|
||||
if (oldMachineryDetail == null) {
|
||||
throw new ServiceException("修改机械详情失败，数据不存在", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
@ -140,7 +140,7 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(BusMachineryDetail entity) {
|
||||
private void validEntityBeforeSave(EqpMachineryDetail entity) {
|
||||
// 做一些数据校验,如唯一约束
|
||||
Long machineryId = entity.getMachineryId();
|
||||
if (machineryId == null) {
|
||||
@ -166,14 +166,14 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
List<BusMachineryDetail> machineryDetailList = this.listByIds(ids);
|
||||
List<EqpMachineryDetail> machineryDetailList = this.listByIds(ids);
|
||||
// 做一些业务上的校验,判断是否需要校验
|
||||
if (isValid) {
|
||||
// 获取机械id列表
|
||||
List<Long> machineryIdList = machineryDetailList.stream().map(BusMachineryDetail::getMachineryId).toList();
|
||||
List<BusMachinery> machineryList = machineryService.listByIds(machineryIdList);
|
||||
List<Long> machineryIdList = machineryDetailList.stream().map(EqpMachineryDetail::getMachineryId).toList();
|
||||
List<EqpMachinery> machineryList = machineryService.listByIds(machineryIdList);
|
||||
// 获取对应项目id列表
|
||||
List<Long> projectIdList = machineryList.stream().map(BusMachinery::getProjectId).toList();
|
||||
List<Long> projectIdList = machineryList.stream().map(EqpMachinery::getProjectId).toList();
|
||||
projectService.validAuth(projectIdList, userId);
|
||||
}
|
||||
if (machineryDetailList.size() != ids.size()) {
|
||||
@ -189,8 +189,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
* @return 机械详情视图对象
|
||||
*/
|
||||
@Override
|
||||
public BusMachineryDetailVo getVo(BusMachineryDetail machineryDetail) {// 对象转封装类
|
||||
BusMachineryDetailVo machineryDetailVo = new BusMachineryDetailVo();
|
||||
public EqpMachineryDetailVo getVo(EqpMachineryDetail machineryDetail) {// 对象转封装类
|
||||
EqpMachineryDetailVo machineryDetailVo = new EqpMachineryDetailVo();
|
||||
if (machineryDetail == null) {
|
||||
return machineryDetailVo;
|
||||
}
|
||||
@ -214,8 +214,8 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
* @return 机械详情查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<BusMachineryDetail> buildQueryWrapper(MachineryDetailQueryReq req) {
|
||||
LambdaQueryWrapper<BusMachineryDetail> lqw = new LambdaQueryWrapper<>();
|
||||
public LambdaQueryWrapper<EqpMachineryDetail> buildQueryWrapper(EqpMachineryDetailQueryReq req) {
|
||||
LambdaQueryWrapper<EqpMachineryDetail> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
}
|
||||
@ -230,16 +230,16 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
String remark = req.getRemark();
|
||||
Long machineryId = req.getMachineryId();
|
||||
// 模糊查询
|
||||
lqw.like(StringUtils.isNotBlank(checkoutNumber), BusMachineryDetail::getCheckoutNumber, checkoutNumber);
|
||||
lqw.like(StringUtils.isNotBlank(checkoutUnit), BusMachineryDetail::getCheckoutUnit, checkoutUnit);
|
||||
lqw.like(StringUtils.isNotBlank(checkoutDate), BusMachineryDetail::getCheckoutDate, checkoutDate);
|
||||
lqw.like(StringUtils.isNotBlank(remark), BusMachineryDetail::getRemark, remark);
|
||||
lqw.like(StringUtils.isNotBlank(checkoutNumber), EqpMachineryDetail::getCheckoutNumber, checkoutNumber);
|
||||
lqw.like(StringUtils.isNotBlank(checkoutUnit), EqpMachineryDetail::getCheckoutUnit, checkoutUnit);
|
||||
lqw.like(StringUtils.isNotBlank(checkoutDate), EqpMachineryDetail::getCheckoutDate, checkoutDate);
|
||||
lqw.like(StringUtils.isNotBlank(remark), EqpMachineryDetail::getRemark, remark);
|
||||
// 精确查询
|
||||
lqw.eq(ObjectUtils.isNotEmpty(id), BusMachineryDetail::getId, id);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(status), BusMachineryDetail::getStatus, status);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(type), BusMachineryDetail::getType, type);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(entryTime), BusMachineryDetail::getEntryTime, entryTime);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(machineryId), BusMachineryDetail::getMachineryId, machineryId);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(id), EqpMachineryDetail::getId, id);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(status), EqpMachineryDetail::getStatus, status);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(type), EqpMachineryDetail::getType, type);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(entryTime), EqpMachineryDetail::getEntryTime, entryTime);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(machineryId), EqpMachineryDetail::getMachineryId, machineryId);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@ -250,16 +250,16 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
|
||||
* @return 机械详情分页对象视图
|
||||
*/
|
||||
@Override
|
||||
public Page<BusMachineryDetailVo> getVoPage(Page<BusMachineryDetail> machineryDetailPage) {
|
||||
List<BusMachineryDetail> machineryDetailList = machineryDetailPage.getRecords();
|
||||
Page<BusMachineryDetailVo> machineryDetailVoPage = new Page<>(
|
||||
public Page<EqpMachineryDetailVo> getVoPage(Page<EqpMachineryDetail> machineryDetailPage) {
|
||||
List<EqpMachineryDetail> machineryDetailList = machineryDetailPage.getRecords();
|
||||
Page<EqpMachineryDetailVo> machineryDetailVoPage = new Page<>(
|
||||
machineryDetailPage.getCurrent(),
|
||||
machineryDetailPage.getSize(),
|
||||
machineryDetailPage.getTotal());
|
||||
if (CollUtil.isEmpty(machineryDetailList)) {
|
||||
return machineryDetailVoPage;
|
||||
}
|
||||
List<BusMachineryDetailVo> machineryDetailVoList = machineryDetailList.stream().map(this::getVo).toList();
|
||||
List<EqpMachineryDetailVo> machineryDetailVoList = machineryDetailList.stream().map(this::getVo).toList();
|
||||
machineryDetailVoPage.setRecords(machineryDetailVoList);
|
||||
return machineryDetailVoPage;
|
||||
}
|
||||
@ -15,17 +15,17 @@ import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.satoken.utils.LoginHelper;
|
||||
import org.dromara.machinery.domain.BusMachinery;
|
||||
import org.dromara.machinery.domain.BusMachineryDetail;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryGisReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinery.MachineryUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.BusMachineryVo;
|
||||
import org.dromara.machinery.domain.vo.MachineryGisVo;
|
||||
import org.dromara.machinery.mapper.BusMachineryMapper;
|
||||
import org.dromara.machinery.service.IBusMachineryDetailService;
|
||||
import org.dromara.machinery.service.IBusMachineryService;
|
||||
import org.dromara.machinery.domain.EqpMachinery;
|
||||
import org.dromara.machinery.domain.EqpMachineryDetail;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryCreateReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryGisReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryQueryReq;
|
||||
import org.dromara.machinery.domain.req.machinery.EqpMachineryUpdateReq;
|
||||
import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
|
||||
import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
|
||||
import org.dromara.machinery.mapper.EqpMachineryMapper;
|
||||
import org.dromara.machinery.service.IEqpMachineryDetailService;
|
||||
import org.dromara.machinery.service.IEqpMachineryService;
|
||||
import org.dromara.project.domain.BusProject;
|
||||
import org.dromara.project.service.IBusProjectService;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
@ -43,15 +43,15 @@ import java.util.List;
|
||||
* @date 2025-03-07
|
||||
*/
|
||||
@Service
|
||||
public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, BusMachinery>
|
||||
implements IBusMachineryService {
|
||||
public class EqpMachineryServiceImpl extends ServiceImpl<EqpMachineryMapper, EqpMachinery>
|
||||
implements IEqpMachineryService {
|
||||
|
||||
@Resource
|
||||
private IBusProjectService projectService;
|
||||
|
||||
@Lazy
|
||||
@Resource
|
||||
private IBusMachineryDetailService machineryDetailService;
|
||||
private IEqpMachineryDetailService machineryDetailService;
|
||||
|
||||
/**
|
||||
* 查询机械
|
||||
@ -60,8 +60,8 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 机械
|
||||
*/
|
||||
@Override
|
||||
public BusMachineryVo queryById(Long id) {
|
||||
BusMachinery machinery = this.getById(id);
|
||||
public EqpMachineryVo queryById(Long id) {
|
||||
EqpMachinery machinery = this.getById(id);
|
||||
if (machinery == null) {
|
||||
throw new ServiceException("机械信息不存在", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
@ -76,9 +76,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 机械分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<BusMachineryVo> queryPageList(MachineryQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<EqpMachineryVo> queryPageList(EqpMachineryQueryReq req, PageQuery pageQuery) {
|
||||
// 查询数据库
|
||||
Page<BusMachinery> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
Page<EqpMachinery> result = this.page(pageQuery.build(), this.buildQueryWrapper(req));
|
||||
return TableDataInfo.build(this.getVoPage(result));
|
||||
}
|
||||
|
||||
@ -89,9 +89,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 机械列表
|
||||
*/
|
||||
@Override
|
||||
public List<BusMachineryVo> queryList(MachineryQueryReq req) {
|
||||
LambdaQueryWrapper<BusMachinery> lqw = this.buildQueryWrapper(req);
|
||||
List<BusMachinery> list = this.list(lqw);
|
||||
public List<EqpMachineryVo> queryList(EqpMachineryQueryReq req) {
|
||||
LambdaQueryWrapper<EqpMachinery> lqw = this.buildQueryWrapper(req);
|
||||
List<EqpMachinery> list = this.list(lqw);
|
||||
return list.stream().map(this::getVo).toList();
|
||||
}
|
||||
|
||||
@ -102,16 +102,16 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 大屏数据列表
|
||||
*/
|
||||
@Override
|
||||
public List<MachineryGisVo> queryGisList(MachineryGisReq req) {
|
||||
public List<EqpMachineryGisVo> queryGisList(EqpMachineryGisReq req) {
|
||||
Long projectId = req.getProjectId();
|
||||
BusProject project = projectService.getById(projectId);
|
||||
if (project == null) {
|
||||
throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
List<BusMachinery> list = this.lambdaQuery()
|
||||
.eq(BusMachinery::getProjectId, projectId).list();
|
||||
List<EqpMachinery> list = this.lambdaQuery()
|
||||
.eq(EqpMachinery::getProjectId, projectId).list();
|
||||
return list.stream().map(machinery -> {
|
||||
MachineryGisVo machineryGisVo = new MachineryGisVo();
|
||||
EqpMachineryGisVo machineryGisVo = new EqpMachineryGisVo();
|
||||
machineryGisVo.setMachineryName(machinery.getMachineryName());
|
||||
machineryGisVo.setMachineryCount(machinery.getNumber());
|
||||
return machineryGisVo;
|
||||
@ -125,9 +125,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Long insertByBo(MachineryCreateReq req) {
|
||||
public Long insertByBo(EqpMachineryCreateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
BusMachinery machinery = new BusMachinery();
|
||||
EqpMachinery machinery = new EqpMachinery();
|
||||
BeanUtils.copyProperties(req, machinery);
|
||||
// 数据校验
|
||||
validEntityBeforeSave(machinery, true);
|
||||
@ -146,14 +146,14 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(MachineryUpdateReq req) {
|
||||
public Boolean updateByBo(EqpMachineryUpdateReq req) {
|
||||
// 将实体类和 DTO 进行转换
|
||||
BusMachinery machinery = new BusMachinery();
|
||||
EqpMachinery machinery = new EqpMachinery();
|
||||
BeanUtils.copyProperties(req, machinery);
|
||||
// 数据校验
|
||||
validEntityBeforeSave(machinery, false);
|
||||
// 判断是否存在
|
||||
BusMachinery oldMachinery = this.getById(machinery.getId());
|
||||
EqpMachinery oldMachinery = this.getById(machinery.getId());
|
||||
if (oldMachinery == null) {
|
||||
throw new ServiceException("修改机械失败，数据不存在", HttpStatus.NOT_FOUND);
|
||||
}
|
||||
@ -164,7 +164,7 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(BusMachinery entity, Boolean create) {
|
||||
private void validEntityBeforeSave(EqpMachinery entity, Boolean create) {
|
||||
// 做一些数据校验,如唯一约束
|
||||
Long projectId = entity.getProjectId();
|
||||
String machineryName = entity.getMachineryName();
|
||||
@ -206,15 +206,15 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
Long userId = LoginHelper.getUserId();
|
||||
List<BusMachinery> machineryList = this.listByIds(ids);
|
||||
List<EqpMachinery> machineryList = this.listByIds(ids);
|
||||
if (isValid) {
|
||||
// 做一些业务上的校验,判断是否需要校验
|
||||
// 获取项目id列表
|
||||
List<Long> projectIdList = machineryList.stream().map(BusMachinery::getProjectId).toList();
|
||||
List<Long> projectIdList = machineryList.stream().map(EqpMachinery::getProjectId).toList();
|
||||
// 判断是否有权限操作对应项目下的内容
|
||||
projectService.validAuth(projectIdList, userId);
|
||||
// 判断是否还存在机械详情信息
|
||||
QueryWrapper<BusMachineryDetail> queryWrapper = new QueryWrapper<>();
|
||||
QueryWrapper<EqpMachineryDetail> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.in("machinery_id", ids);
|
||||
if (machineryDetailService.count(queryWrapper) > 0) {
|
||||
throw new ServiceException("删除机械失败，机械存在机械详情信息", HttpStatus.BAD_REQUEST);
|
||||
@ -233,9 +233,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 机械视图对象
|
||||
*/
|
||||
@Override
|
||||
public BusMachineryVo getVo(BusMachinery machinery) {
|
||||
public EqpMachineryVo getVo(EqpMachinery machinery) {
|
||||
// 对象转封装类
|
||||
BusMachineryVo machineryVo = new BusMachineryVo();
|
||||
EqpMachineryVo machineryVo = new EqpMachineryVo();
|
||||
if (machinery == null) {
|
||||
return machineryVo;
|
||||
}
|
||||
@ -250,8 +250,8 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 机械查询条件封装
|
||||
*/
|
||||
@Override
|
||||
public LambdaQueryWrapper<BusMachinery> buildQueryWrapper(MachineryQueryReq req) {
|
||||
LambdaQueryWrapper<BusMachinery> lqw = new LambdaQueryWrapper<>();
|
||||
public LambdaQueryWrapper<EqpMachinery> buildQueryWrapper(EqpMachineryQueryReq req) {
|
||||
LambdaQueryWrapper<EqpMachinery> lqw = new LambdaQueryWrapper<>();
|
||||
if (req == null) {
|
||||
return lqw;
|
||||
}
|
||||
@ -266,16 +266,16 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
String provider = req.getProvider();
|
||||
String remark = req.getRemark();
|
||||
// 模糊查询
|
||||
lqw.like(StringUtils.isNotBlank(machineryName), BusMachinery::getMachineryName, machineryName);
|
||||
lqw.like(StringUtils.isNotBlank(principal), BusMachinery::getPrincipal, principal);
|
||||
lqw.like(StringUtils.isNotBlank(principalPhone), BusMachinery::getPrincipalPhone, principalPhone);
|
||||
lqw.like(StringUtils.isNotBlank(provider), BusMachinery::getProvider, provider);
|
||||
lqw.like(StringUtils.isNotBlank(machineryNumber), BusMachinery::getMachineryNumber, machineryNumber);
|
||||
lqw.like(StringUtils.isNotBlank(remark), BusMachinery::getRemark, remark);
|
||||
lqw.like(StringUtils.isNotBlank(machineryName), EqpMachinery::getMachineryName, machineryName);
|
||||
lqw.like(StringUtils.isNotBlank(principal), EqpMachinery::getPrincipal, principal);
|
||||
lqw.like(StringUtils.isNotBlank(principalPhone), EqpMachinery::getPrincipalPhone, principalPhone);
|
||||
lqw.like(StringUtils.isNotBlank(provider), EqpMachinery::getProvider, provider);
|
||||
lqw.like(StringUtils.isNotBlank(machineryNumber), EqpMachinery::getMachineryNumber, machineryNumber);
|
||||
lqw.like(StringUtils.isNotBlank(remark), EqpMachinery::getRemark, remark);
|
||||
// 精确查询
|
||||
lqw.eq(ObjectUtils.isNotEmpty(id), BusMachinery::getId, id);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(projectId), BusMachinery::getProjectId, projectId);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(number), BusMachinery::getNumber, number);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(id), EqpMachinery::getId, id);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(projectId), EqpMachinery::getProjectId, projectId);
|
||||
lqw.eq(ObjectUtils.isNotEmpty(number), EqpMachinery::getNumber, number);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@ -286,16 +286,16 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
|
||||
* @return 机械分页对象视图
|
||||
*/
|
||||
@Override
|
||||
public Page<BusMachineryVo> getVoPage(Page<BusMachinery> machineryPage) {
|
||||
List<BusMachinery> machineryList = machineryPage.getRecords();
|
||||
Page<BusMachineryVo> machineryVoPage = new Page<>(
|
||||
public Page<EqpMachineryVo> getVoPage(Page<EqpMachinery> machineryPage) {
|
||||
List<EqpMachinery> machineryList = machineryPage.getRecords();
|
||||
Page<EqpMachineryVo> machineryVoPage = new Page<>(
|
||||
machineryPage.getCurrent(),
|
||||
machineryPage.getSize(),
|
||||
machineryPage.getTotal());
|
||||
if (CollUtil.isEmpty(machineryList)) {
|
||||
return machineryVoPage;
|
||||
}
|
||||
List<BusMachineryVo> machineryVoList = machineryList.stream().map(this::getVo).toList();
|
||||
List<EqpMachineryVo> machineryVoList = machineryList.stream().map(this::getVo).toList();
|
||||
machineryVoPage.setRecords(machineryVoList);
|
||||
return machineryVoPage;
|
||||
}
|
||||
@ -17,11 +17,11 @@ import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.materials.domain.req.company.CompanyCreateReq;
|
||||
import org.dromara.materials.domain.req.company.CompanyQueryReq;
|
||||
import org.dromara.materials.domain.req.company.CompanyUpdateReq;
|
||||
import org.dromara.materials.domain.vo.BusCompanyVo;
|
||||
import org.dromara.materials.service.IBusCompanyService;
|
||||
import org.dromara.materials.domain.req.company.MatCompanyCreateReq;
|
||||
import org.dromara.materials.domain.req.company.MatCompanyQueryReq;
|
||||
import org.dromara.materials.domain.req.company.MatCompanyUpdateReq;
|
||||
import org.dromara.materials.domain.vo.company.MatCompanyVo;
|
||||
import org.dromara.materials.service.IMatCompanyService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@ -37,16 +37,16 @@ import java.util.List;
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/materials/company")
|
||||
public class BusCompanyController extends BaseController {
|
||||
public class MatCompanyController extends BaseController {
|
||||
|
||||
private final IBusCompanyService busCompanyService;
|
||||
private final IMatCompanyService busCompanyService;
|
||||
|
||||
/**
|
||||
* 查询公司列表
|
||||
*/
|
||||
@SaCheckPermission("materials:company:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BusCompanyVo> list(CompanyQueryReq req, PageQuery pageQuery) {
|
||||
public TableDataInfo<MatCompanyVo> list(MatCompanyQueryReq req, PageQuery pageQuery) {
|
||||
return busCompanyService.queryPageList(req, pageQuery);
|
||||
}
|
||||
|
||||
@ -56,9 +56,9 @@ public class BusCompanyController extends BaseController {
|
||||
@SaCheckPermission("materials:company:export")
|
||||
@Log(title = "公司", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(CompanyQueryReq req, HttpServletResponse response) {
|
||||
List<BusCompanyVo> list = busCompanyService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "公司", BusCompanyVo.class, response);
|
||||
public void export(MatCompanyQueryReq req, HttpServletResponse response) {
|
||||
List<MatCompanyVo> list = busCompanyService.queryList(req);
|
||||
ExcelUtil.exportExcel(list, "公司", MatCompanyVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -68,7 +68,7 @@ public class BusCompanyController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("materials:company:query")
|
||||
@GetMapping("/{id}")
|
||||
public R<BusCompanyVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
public R<MatCompanyVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long id) {
|
||||
return R.ok(busCompanyService.queryById(id));
|
||||
}
|
||||
@ -80,7 +80,7 @@ public class BusCompanyController extends BaseController {
|
||||
@Log(title = "公司", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody CompanyCreateReq req) {
|
||||
public R<Long> add(@Validated(AddGroup.class) @RequestBody MatCompanyCreateReq req) {
|
||||
if (req == null) {
|
||||
throw new ServiceException("参数不能为空", HttpStatus.BAD_REQUEST);
|
||||
}
|
||||
@ -94,7 +94,7 @@ public class BusCompanyController extends BaseController {
|
||||
@Log(title = "公司", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CompanyUpdateReq req) {
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody MatCompanyUpdateReq req) {
|
||||
return toAjax(busCompanyService.updateByBo(req));
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user