From 349ef16c2099242d8c93a99c8d831105d903ecc6 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Tue, 27 Feb 2024 20:29:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tower/controller/TowerPartController.java | 136 ++++++++++++++++++ .../controller/TowerPartGoodsController.java | 136 ++++++++++++++++++ .../controller/TowerPartStockController.java | 136 ++++++++++++++++++ .../TowerSecurityRecordController.java | 31 ++-- .../com/gxwebsoft/tower/entity/TowerPart.java | 84 +++++++++++ .../tower/entity/TowerPartGoods.java | 107 ++++++++++++++ .../tower/entity/TowerPartStock.java | 99 +++++++++++++ .../tower/entity/TowerSecurityRecord.java | 100 ++++++++++--- .../tower/mapper/TowerPartGoodsMapper.java | 37 +++++ .../tower/mapper/TowerPartMapper.java | 37 +++++ .../tower/mapper/TowerPartStockMapper.java | 37 +++++ .../mapper/TowerSecurityRecordMapper.java | 2 +- .../tower/mapper/xml/TowerPartGoodsMapper.xml | 76 ++++++++++ .../tower/mapper/xml/TowerPartMapper.xml | 77 ++++++++++ .../tower/mapper/xml/TowerPartStockMapper.xml | 81 +++++++++++ .../mapper/xml/TowerSecurityRecordMapper.xml | 81 +++++++++++ .../tower/param/TowerPartGoodsParam.java | 70 +++++++++ .../gxwebsoft/tower/param/TowerPartParam.java | 82 +++++++++++ .../tower/param/TowerPartStockParam.java | 86 +++++++++++ .../tower/param/TowerSecurityRecordParam.java | 84 ++++++++++- .../tower/service/TowerPartGoodsService.java | 42 ++++++ .../tower/service/TowerPartService.java | 42 ++++++ .../tower/service/TowerPartStockService.java | 42 ++++++ .../service/TowerSecurityRecordService.java | 6 +- .../impl/TowerPartGoodsServiceImpl.java | 47 ++++++ .../service/impl/TowerPartServiceImpl.java | 47 ++++++ .../impl/TowerPartStockServiceImpl.java | 47 ++++++ .../impl/TowerSecurityRecordServiceImpl.java | 6 +- .../gxwebsoft/generator/TowerGenerator.java | 4 +- 29 files changed, 1818 insertions(+), 44 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPartController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPartGoodsController.java create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerPartStockController.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPart.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPartGoods.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerPartStock.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPartGoodsMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPartMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerPartStockMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartGoodsMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartStockMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPartGoodsParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPartParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerPartStockParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPartGoodsService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPartService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerPartStockService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPartGoodsServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPartServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerPartStockServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPartController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPartController.java new file mode 100644 index 0000000..f7e6233 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerPartController.java @@ -0,0 +1,136 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.service.TowerPartService; +import com.gxwebsoft.tower.entity.TowerPart; +import com.gxwebsoft.tower.param.TowerPartParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 安全检查控制器 + * + * @author 科技小王子 + * @since 2024-02-27 18:40:31 + */ +@Api(tags = "安全检查管理") +@RestController +@RequestMapping("/api/tower/tower-part") +public class TowerPartController extends BaseController { + @Resource + private TowerPartService towerPartService; + + @PreAuthorize("hasAuthority('tower:towerPart:list')") + @OperationLog + @ApiOperation("分页查询安全检查") + @GetMapping("/page") + public ApiResult> page(TowerPartParam param) { + // 使用关联查询 + return success(towerPartService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPart:list')") + @OperationLog + @ApiOperation("查询全部安全检查") + @GetMapping() + public ApiResult> list(TowerPartParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPartService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerPartService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPart:list')") + @OperationLog + @ApiOperation("根据id查询安全检查") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerPartService.getById(id)); + // 使用关联查询 + //return success(towerPartService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerPart:save')") + @OperationLog + @ApiOperation("添加安全检查") + @PostMapping() + public ApiResult save(@RequestBody TowerPart towerPart) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerPart.setUserId(loginUser.getUserId()); + } + if (towerPartService.save(towerPart)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPart:update')") + @OperationLog + @ApiOperation("修改安全检查") + @PutMapping() + public ApiResult update(@RequestBody TowerPart towerPart) { + if (towerPartService.updateById(towerPart)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPart:remove')") + @OperationLog + @ApiOperation("删除安全检查") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerPartService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPart:save')") + @OperationLog + @ApiOperation("批量添加安全检查") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerPartService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPart:update')") + @OperationLog + @ApiOperation("批量修改安全检查") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerPartService, "part_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPart:remove')") + @OperationLog + @ApiOperation("批量删除安全检查") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerPartService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPartGoodsController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPartGoodsController.java new file mode 100644 index 0000000..6c9527e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerPartGoodsController.java @@ -0,0 +1,136 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.service.TowerPartGoodsService; +import com.gxwebsoft.tower.entity.TowerPartGoods; +import com.gxwebsoft.tower.param.TowerPartGoodsParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 安全检查控制器 + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +@Api(tags = "安全检查管理") +@RestController +@RequestMapping("/api/tower/tower-part-goods") +public class TowerPartGoodsController extends BaseController { + @Resource + private TowerPartGoodsService towerPartGoodsService; + + @PreAuthorize("hasAuthority('tower:towerPartGoods:list')") + @OperationLog + @ApiOperation("分页查询安全检查") + @GetMapping("/page") + public ApiResult> page(TowerPartGoodsParam param) { + // 使用关联查询 + return success(towerPartGoodsService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPartGoods:list')") + @OperationLog + @ApiOperation("查询全部安全检查") + @GetMapping() + public ApiResult> list(TowerPartGoodsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPartGoodsService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerPartGoodsService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPartGoods:list')") + @OperationLog + @ApiOperation("根据id查询安全检查") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerPartGoodsService.getById(id)); + // 使用关联查询 + //return success(towerPartGoodsService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerPartGoods:save')") + @OperationLog + @ApiOperation("添加安全检查") + @PostMapping() + public ApiResult save(@RequestBody TowerPartGoods towerPartGoods) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerPartGoods.setUserId(loginUser.getUserId()); + } + if (towerPartGoodsService.save(towerPartGoods)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartGoods:update')") + @OperationLog + @ApiOperation("修改安全检查") + @PutMapping() + public ApiResult update(@RequestBody TowerPartGoods towerPartGoods) { + if (towerPartGoodsService.updateById(towerPartGoods)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartGoods:remove')") + @OperationLog + @ApiOperation("删除安全检查") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerPartGoodsService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartGoods:save')") + @OperationLog + @ApiOperation("批量添加安全检查") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerPartGoodsService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartGoods:update')") + @OperationLog + @ApiOperation("批量修改安全检查") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerPartGoodsService, "goods_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartGoods:remove')") + @OperationLog + @ApiOperation("批量删除安全检查") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerPartGoodsService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerPartStockController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerPartStockController.java new file mode 100644 index 0000000..39f50e6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerPartStockController.java @@ -0,0 +1,136 @@ +package com.gxwebsoft.tower.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.tower.service.TowerPartStockService; +import com.gxwebsoft.tower.entity.TowerPartStock; +import com.gxwebsoft.tower.param.TowerPartStockParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 产品库存控制器 + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +@Api(tags = "产品库存管理") +@RestController +@RequestMapping("/api/tower/tower-part-stock") +public class TowerPartStockController extends BaseController { + @Resource + private TowerPartStockService towerPartStockService; + + @PreAuthorize("hasAuthority('tower:towerPartStock:list')") + @OperationLog + @ApiOperation("分页查询产品库存") + @GetMapping("/page") + public ApiResult> page(TowerPartStockParam param) { + // 使用关联查询 + return success(towerPartStockService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPartStock:list')") + @OperationLog + @ApiOperation("查询全部产品库存") + @GetMapping() + public ApiResult> list(TowerPartStockParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerPartStockService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerPartStockService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerPartStock:list')") + @OperationLog + @ApiOperation("根据id查询产品库存") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerPartStockService.getById(id)); + // 使用关联查询 + //return success(towerPartStockService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerPartStock:save')") + @OperationLog + @ApiOperation("添加产品库存") + @PostMapping() + public ApiResult save(@RequestBody TowerPartStock towerPartStock) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerPartStock.setUserId(loginUser.getUserId()); + } + if (towerPartStockService.save(towerPartStock)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartStock:update')") + @OperationLog + @ApiOperation("修改产品库存") + @PutMapping() + public ApiResult update(@RequestBody TowerPartStock towerPartStock) { + if (towerPartStockService.updateById(towerPartStock)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartStock:remove')") + @OperationLog + @ApiOperation("删除产品库存") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerPartStockService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartStock:save')") + @OperationLog + @ApiOperation("批量添加产品库存") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerPartStockService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartStock:update')") + @OperationLog + @ApiOperation("批量修改产品库存") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerPartStockService, "part_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerPartStock:remove')") + @OperationLog + @ApiOperation("批量删除产品库存") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerPartStockService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityRecordController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityRecordController.java index 487431c..7e9d360 100644 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityRecordController.java +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityRecordController.java @@ -1,5 +1,7 @@ package com.gxwebsoft.tower.controller; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.tower.service.TowerSecurityRecordService; @@ -22,7 +24,7 @@ import java.util.List; * 保养记录控制器 * * @author 科技小王子 - * @since 2024-02-22 13:44:23 + * @since 2024-02-27 15:00:15 */ @Api(tags = "保养记录管理") @RestController @@ -31,19 +33,16 @@ public class TowerSecurityRecordController extends BaseController { @Resource private TowerSecurityRecordService towerSecurityRecordService; - @PreAuthorize("hasAuthority('tower:towerSecurity:list')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:list')") @OperationLog @ApiOperation("分页查询保养记录") @GetMapping("/page") public ApiResult> page(TowerSecurityRecordParam param) { -// PageParam page = new PageParam<>(param); -// page.setDefaultOrder("create_time desc"); -// return success(towerSecurityRecordService.page(page, page.getWrapper())); // 使用关联查询 return success(towerSecurityRecordService.pageRel(param)); } - @PreAuthorize("hasAuthority('tower:towerSecurity:list')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:list')") @OperationLog @ApiOperation("查询全部保养记录") @GetMapping() @@ -55,7 +54,7 @@ public class TowerSecurityRecordController extends BaseController { //return success(towerSecurityRecordService.listRel(param)); } - @PreAuthorize("hasAuthority('tower:towerSecurity:list')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:list')") @OperationLog @ApiOperation("根据id查询保养记录") @GetMapping("/{id}") @@ -65,7 +64,7 @@ public class TowerSecurityRecordController extends BaseController { //return success(towerSecurityRecordService.getByIdRel(id)); } - @PreAuthorize("hasAuthority('tower:towerSecurity:save')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:save')") @OperationLog @ApiOperation("添加保养记录") @PostMapping() @@ -75,13 +74,17 @@ public class TowerSecurityRecordController extends BaseController { if (loginUser != null) { towerSecurityRecord.setUserId(loginUser.getUserId()); } + // 生成编号 + DateTime date = DateUtil.date(); + final String code = DateUtil.format(date, "yyyyMMddHHmm"); + towerSecurityRecord.setSecurityCode(code); if (towerSecurityRecordService.save(towerSecurityRecord)) { return success("添加成功"); } return fail("添加失败"); } - @PreAuthorize("hasAuthority('tower:towerSecurity:update')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:update')") @OperationLog @ApiOperation("修改保养记录") @PutMapping() @@ -92,7 +95,7 @@ public class TowerSecurityRecordController extends BaseController { return fail("修改失败"); } - @PreAuthorize("hasAuthority('tower:towerSecurity:remove')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:remove')") @OperationLog @ApiOperation("删除保养记录") @DeleteMapping("/{id}") @@ -103,7 +106,7 @@ public class TowerSecurityRecordController extends BaseController { return fail("删除失败"); } - @PreAuthorize("hasAuthority('tower:towerSecurity:save')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:save')") @OperationLog @ApiOperation("批量添加保养记录") @PostMapping("/batch") @@ -114,18 +117,18 @@ public class TowerSecurityRecordController extends BaseController { return fail("添加失败"); } - @PreAuthorize("hasAuthority('tower:towerSecurity:update')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:update')") @OperationLog @ApiOperation("批量修改保养记录") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { - if (batchParam.update(towerSecurityRecordService, "security_id")) { + if (batchParam.update(towerSecurityRecordService, "security_record_id")) { return success("修改成功"); } return fail("修改失败"); } - @PreAuthorize("hasAuthority('tower:towerSecurity:remove')") + @PreAuthorize("hasAuthority('tower:towerSecurityRecord:remove')") @OperationLog @ApiOperation("批量删除保养记录") @DeleteMapping("/batch") diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPart.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPart.java new file mode 100644 index 0000000..29e09b8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerPart.java @@ -0,0 +1,84 @@ +package com.gxwebsoft.tower.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 安全检查 + * + * @author 科技小王子 + * @since 2024-02-27 18:40:31 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerPart对象", description = "安全检查") +public class TowerPart implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "part_id", type = IdType.AUTO) + private Integer partId; + + @ApiModelProperty(value = "配件编码") + private String partCode; + + @ApiModelProperty(value = "类别") + private String category; + + @ApiModelProperty(value = "规格") + private String specs; + + @ApiModelProperty(value = "位置") + private String position; + + @ApiModelProperty(value = "库存数量") + private Integer stock; + + @ApiModelProperty(value = "库存金额") + private BigDecimal stockMoney; + + @ApiModelProperty(value = "进货价格") + private BigDecimal price; + + @ApiModelProperty(value = "最低库存") + private Integer stockMin; + + @ApiModelProperty(value = "是否低于最低库存") + private Integer stockLower; + + @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPartGoods.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPartGoods.java new file mode 100644 index 0000000..062c7fc --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerPartGoods.java @@ -0,0 +1,107 @@ +package com.gxwebsoft.tower.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 安全检查 + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerPartGoods对象", description = "安全检查") +public class TowerPartGoods implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "goods_id", type = IdType.AUTO) + private Integer goodsId; + + @ApiModelProperty(value = "配件编码") + private String goodsCode; + + @ApiModelProperty(value = "类别") + private String category; + + @ApiModelProperty(value = "产品名称") + private String goodsName; + + @ApiModelProperty(value = "规格") + private String specs; + + @ApiModelProperty(value = "货架") + private String position; + + @ApiModelProperty(value = "进货价格") + private BigDecimal price; + + @ApiModelProperty(value = "销售价格") + private BigDecimal salePrice; + + @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + @ApiModelProperty(value = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "手机号码") + @TableField(exist = false) + private String phone; + + @ApiModelProperty(value = "头像") + @TableField(exist = false) + private String avatar; + + @ApiModelProperty(value = "库存数量") + @TableField(exist = false) + private String stock; + + @ApiModelProperty(value = "库存金额") + @TableField(exist = false) + private BigDecimal stockMoney; + + @ApiModelProperty(value = "最低库存") + @TableField(exist = false) + private Integer stockMin; + + @ApiModelProperty(value = "是否低于最低库存") + @TableField(exist = false) + private Integer stockLower; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerPartStock.java b/src/main/java/com/gxwebsoft/tower/entity/TowerPartStock.java new file mode 100644 index 0000000..27db3ca --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerPartStock.java @@ -0,0 +1,99 @@ +package com.gxwebsoft.tower.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 产品库存 + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerPartStock对象", description = "产品库存") +public class TowerPartStock implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "part_id", type = IdType.AUTO) + private Integer partId; + + @ApiModelProperty(value = "产品ID") + private Integer goodsId; + + @ApiModelProperty(value = "配件编码") + private String partCode; + + @ApiModelProperty(value = "类别") + private String category; + + @ApiModelProperty(value = "规格") + private String specs; + + @ApiModelProperty(value = "位置") + private String position; + + @ApiModelProperty(value = "库存数量") + private Integer stock; + + @ApiModelProperty(value = "库存金额") + private BigDecimal stockMoney; + + @ApiModelProperty(value = "进货价格") + private BigDecimal price; + + @ApiModelProperty(value = "最低库存") + private Integer stockMin; + + @ApiModelProperty(value = "是否低于最低库存") + private Integer stockLower; + + @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + @ApiModelProperty(value = "昵称") + @TableField(exist = false) + private String nickname; + + @ApiModelProperty(value = "手机号码") + @TableField(exist = false) + private String phone; + + @ApiModelProperty(value = "头像") + @TableField(exist = false) + private String avatar; + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java index 8d80a3a..743c68b 100644 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java @@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; * 保养记录 * * @author 科技小王子 - * @since 2024-02-22 13:44:23 + * @since 2024-02-27 15:00:15 */ @Data @EqualsAndHashCode(callSuper = false) @@ -38,6 +38,84 @@ public class TowerSecurityRecord implements Serializable { @ApiModelProperty(value = "现场图片") private String images; + @ApiModelProperty(value = "基础节(保养前)") + private String before1; + + @ApiModelProperty(value = "第一节架(保养前)") + private String before2; + + @ApiModelProperty(value = "顶升内套架(保养前)") + private String before3; + + @ApiModelProperty(value = "顶升外套架(保养前)") + private String before4; + + @ApiModelProperty(value = "过渡节(保养前)") + private String before5; + + @ApiModelProperty(value = "回转(保养前)") + private String before6; + + @ApiModelProperty(value = "塔帽(保养前)") + private String before7; + + @ApiModelProperty(value = "平衡臂(保养前)") + private String before8; + + @ApiModelProperty(value = "起重臂(保养前)") + private String before9; + + @ApiModelProperty(value = "变幅小车(保养前)") + private String before10; + + @ApiModelProperty(value = "大钩(保养前)") + private String before11; + + @ApiModelProperty(value = "顶升引进小车(保养前)") + private String before12; + + @ApiModelProperty(value = "驾驶室(保养前)") + private String before13; + + @ApiModelProperty(value = "基础节(保养后)") + private String after1; + + @ApiModelProperty(value = "第一节架(保养后)") + private String after2; + + @ApiModelProperty(value = "顶升内套架(保养后)") + private String after3; + + @ApiModelProperty(value = "顶升外套架(保养后)") + private String after4; + + @ApiModelProperty(value = "过渡节(保养后)") + private String after5; + + @ApiModelProperty(value = "回转(保养后)") + private String after6; + + @ApiModelProperty(value = "塔帽(保养后)") + private String after7; + + @ApiModelProperty(value = "平衡臂(保养后)") + private String after8; + + @ApiModelProperty(value = "起重臂(保养后)") + private String after9; + + @ApiModelProperty(value = "变幅小车(保养后)") + private String after10; + + @ApiModelProperty(value = "大钩(保养后)") + private String after11; + + @ApiModelProperty(value = "顶升引进小车(保养后)") + private String after12; + + @ApiModelProperty(value = "驾驶室(保养后)") + private String after13; + @ApiModelProperty(value = "经度") private String longitude; @@ -96,24 +174,4 @@ public class TowerSecurityRecord implements Serializable { @TableField(exist = false) private String avatar; - @ApiModelProperty(value = "配件名称") - @TableField(exist = false) - private String accessoryName; - - @ApiModelProperty(value = "配件编号") - @TableField(exist = false) - private String accessoryNo; - - @ApiModelProperty(value = "配件分类") - @TableField(exist = false) - private String accessoryCategory; - - @ApiModelProperty(value = "配件规格") - @TableField(exist = false) - private String accessorySpecs; - - @ApiModelProperty(value = "适用设备型号") - @TableField(exist = false) - private String accessoryModel; - } diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartGoodsMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartGoodsMapper.java new file mode 100644 index 0000000..2880849 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartGoodsMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerPartGoods; +import com.gxwebsoft.tower.param.TowerPartGoodsParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 安全检查Mapper + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +public interface TowerPartGoodsMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerPartGoodsParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerPartGoodsParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartMapper.java new file mode 100644 index 0000000..e560c09 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerPart; +import com.gxwebsoft.tower.param.TowerPartParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 安全检查Mapper + * + * @author 科技小王子 + * @since 2024-02-27 18:40:31 + */ +public interface TowerPartMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerPartParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerPartParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerPartStockMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartStockMapper.java new file mode 100644 index 0000000..03c0327 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerPartStockMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.tower.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.tower.entity.TowerPartStock; +import com.gxwebsoft.tower.param.TowerPartStockParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 产品库存Mapper + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +public interface TowerPartStockMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerPartStockParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerPartStockParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityRecordMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityRecordMapper.java index 405d0cd..46e14e2 100644 --- a/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityRecordMapper.java +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityRecordMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 保养记录Mapper * * @author 科技小王子 - * @since 2024-02-22 13:44:23 + * @since 2024-02-27 15:00:15 */ public interface TowerSecurityRecordMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartGoodsMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartGoodsMapper.xml new file mode 100644 index 0000000..32e3245 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartGoodsMapper.xml @@ -0,0 +1,76 @@ + + + + + + + SELECT a.*,b.nickname,b.phone,b.avatar,c.stock,c.stock_money,c.stock_min,c.stock_lower + FROM tower_part_goods a + LEFT JOIN sys_user b ON a.user_id = b.user_id + LEFT JOIN tower_part_stock c ON a.goods_id = c.goods_id + + + AND a.goods_id = #{param.goodsId} + + + AND a.goods_code LIKE CONCAT('%', #{param.goodsCode}, '%') + + + AND a.category LIKE CONCAT('%', #{param.category}, '%') + + + AND a.specs LIKE CONCAT('%', #{param.specs}, '%') + + + AND a.position LIKE CONCAT('%', #{param.position}, '%') + + + AND a.price = #{param.price} + + + AND a.sale_price = #{param.salePrice} + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + AND (a.goods_name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.goods_id = #{param.keywords} + OR a.goods_code = #{param.keywords} + ) + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartMapper.xml new file mode 100644 index 0000000..a44ab5a --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartMapper.xml @@ -0,0 +1,77 @@ + + + + + + + SELECT a.* + FROM tower_part a + + + AND a.part_id = #{param.partId} + + + AND a.part_code LIKE CONCAT('%', #{param.partCode}, '%') + + + AND a.category LIKE CONCAT('%', #{param.category}, '%') + + + AND a.specs LIKE CONCAT('%', #{param.specs}, '%') + + + AND a.position LIKE CONCAT('%', #{param.position}, '%') + + + AND a.stock = #{param.stock} + + + AND a.stock_money = #{param.stockMoney} + + + AND a.price = #{param.price} + + + AND a.stock_min = #{param.stockMin} + + + AND a.stock_lower = #{param.stockLower} + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartStockMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartStockMapper.xml new file mode 100644 index 0000000..6b80e46 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerPartStockMapper.xml @@ -0,0 +1,81 @@ + + + + + + + SELECT a.*,b.nickname,b.phone,b.avatar + FROM tower_part_stock a + LEFT JOIN sys_user b ON a.user_id = b.user_id + + + AND a.part_id = #{param.partId} + + + AND a.goods_id = #{param.goodsId} + + + AND a.part_code LIKE CONCAT('%', #{param.partCode}, '%') + + + AND a.category LIKE CONCAT('%', #{param.category}, '%') + + + AND a.specs LIKE CONCAT('%', #{param.specs}, '%') + + + AND a.position LIKE CONCAT('%', #{param.position}, '%') + + + AND a.stock = #{param.stock} + + + AND a.stock_money = #{param.stockMoney} + + + AND a.price = #{param.price} + + + AND a.stock_min = #{param.stockMin} + + + AND a.stock_lower = #{param.stockLower} + + + AND a.status = #{param.status} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.user_id = #{param.userId} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml index d64b797..4fe403a 100644 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml @@ -9,6 +9,9 @@ LEFT JOIN sys_user b ON a.user_id = b.user_id LEFT JOIN tower_accessory c ON c.accessory_id = a.security_id + + AND a.security_record_id = #{param.securityRecordId} + AND a.security_id = #{param.securityId} @@ -18,6 +21,84 @@ AND a.images LIKE CONCAT('%', #{param.images}, '%') + + AND a.before1 LIKE CONCAT('%', #{param.before1}, '%') + + + AND a.before2 LIKE CONCAT('%', #{param.before2}, '%') + + + AND a.before3 LIKE CONCAT('%', #{param.before3}, '%') + + + AND a.before4 LIKE CONCAT('%', #{param.before4}, '%') + + + AND a.before5 LIKE CONCAT('%', #{param.before5}, '%') + + + AND a.before6 LIKE CONCAT('%', #{param.before6}, '%') + + + AND a.before7 LIKE CONCAT('%', #{param.before7}, '%') + + + AND a.before8 LIKE CONCAT('%', #{param.before8}, '%') + + + AND a.before9 LIKE CONCAT('%', #{param.before9}, '%') + + + AND a.before10 LIKE CONCAT('%', #{param.before10}, '%') + + + AND a.before11 LIKE CONCAT('%', #{param.before11}, '%') + + + AND a.before12 LIKE CONCAT('%', #{param.before12}, '%') + + + AND a.before13 LIKE CONCAT('%', #{param.before13}, '%') + + + AND a.after1 LIKE CONCAT('%', #{param.after1}, '%') + + + AND a.after2 LIKE CONCAT('%', #{param.after2}, '%') + + + AND a.after3 LIKE CONCAT('%', #{param.after3}, '%') + + + AND a.after4 LIKE CONCAT('%', #{param.after4}, '%') + + + AND a.after5 LIKE CONCAT('%', #{param.after5}, '%') + + + AND a.after6 LIKE CONCAT('%', #{param.after6}, '%') + + + AND a.after7 LIKE CONCAT('%', #{param.after7}, '%') + + + AND a.after8 LIKE CONCAT('%', #{param.after8}, '%') + + + AND a.after9 LIKE CONCAT('%', #{param.after9}, '%') + + + AND a.after10 LIKE CONCAT('%', #{param.after10}, '%') + + + AND a.after11 LIKE CONCAT('%', #{param.after11}, '%') + + + AND a.after12 LIKE CONCAT('%', #{param.after12}, '%') + + + AND a.after13 LIKE CONCAT('%', #{param.after13}, '%') + AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%') diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPartGoodsParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPartGoodsParam.java new file mode 100644 index 0000000..e53b800 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerPartGoodsParam.java @@ -0,0 +1,70 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 安全检查查询参数 + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerPartGoodsParam对象", description = "安全检查查询参数") +public class TowerPartGoodsParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "配件编码") + private String goodsCode; + + @ApiModelProperty(value = "类别") + private String category; + + @ApiModelProperty(value = "规格") + private String specs; + + @ApiModelProperty(value = "货架") + private String position; + + @ApiModelProperty(value = "进货价格") + @QueryField(type = QueryType.EQ) + private BigDecimal price; + + @ApiModelProperty(value = "销售价格") + @QueryField(type = QueryType.EQ) + private BigDecimal salePrice; + + @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPartParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPartParam.java new file mode 100644 index 0000000..c2bb9aa --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerPartParam.java @@ -0,0 +1,82 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 安全检查查询参数 + * + * @author 科技小王子 + * @since 2024-02-27 18:40:31 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerPartParam对象", description = "安全检查查询参数") +public class TowerPartParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer partId; + + @ApiModelProperty(value = "配件编码") + private String partCode; + + @ApiModelProperty(value = "类别") + private String category; + + @ApiModelProperty(value = "规格") + private String specs; + + @ApiModelProperty(value = "位置") + private String position; + + @ApiModelProperty(value = "库存数量") + @QueryField(type = QueryType.EQ) + private Integer stock; + + @ApiModelProperty(value = "库存金额") + @QueryField(type = QueryType.EQ) + private BigDecimal stockMoney; + + @ApiModelProperty(value = "进货价格") + @QueryField(type = QueryType.EQ) + private BigDecimal price; + + @ApiModelProperty(value = "最低库存") + @QueryField(type = QueryType.EQ) + private Integer stockMin; + + @ApiModelProperty(value = "是否低于最低库存") + @QueryField(type = QueryType.EQ) + private Integer stockLower; + + @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerPartStockParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerPartStockParam.java new file mode 100644 index 0000000..a1af870 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerPartStockParam.java @@ -0,0 +1,86 @@ +package com.gxwebsoft.tower.param; + +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 产品库存查询参数 + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerPartStockParam对象", description = "产品库存查询参数") +public class TowerPartStockParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer partId; + + @ApiModelProperty(value = "产品ID") + @QueryField(type = QueryType.EQ) + private Integer goodsId; + + @ApiModelProperty(value = "配件编码") + private String partCode; + + @ApiModelProperty(value = "类别") + private String category; + + @ApiModelProperty(value = "规格") + private String specs; + + @ApiModelProperty(value = "位置") + private String position; + + @ApiModelProperty(value = "库存数量") + @QueryField(type = QueryType.EQ) + private Integer stock; + + @ApiModelProperty(value = "库存金额") + @QueryField(type = QueryType.EQ) + private BigDecimal stockMoney; + + @ApiModelProperty(value = "进货价格") + @QueryField(type = QueryType.EQ) + private BigDecimal price; + + @ApiModelProperty(value = "最低库存") + @QueryField(type = QueryType.EQ) + private Integer stockMin; + + @ApiModelProperty(value = "是否低于最低库存") + @QueryField(type = QueryType.EQ) + private Integer stockLower; + + @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerSecurityRecordParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSecurityRecordParam.java index 33f58e9..a2c8a5f 100644 --- a/src/main/java/com/gxwebsoft/tower/param/TowerSecurityRecordParam.java +++ b/src/main/java/com/gxwebsoft/tower/param/TowerSecurityRecordParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 保养记录查询参数 * * @author 科技小王子 - * @since 2024-02-22 13:44:23 + * @since 2024-02-27 15:00:15 */ @Data @EqualsAndHashCode(callSuper = false) @@ -24,6 +24,10 @@ public class TowerSecurityRecordParam extends BaseParam { @ApiModelProperty(value = "自增ID") @QueryField(type = QueryType.EQ) + private Integer securityRecordId; + + @ApiModelProperty(value = "保养计划ID") + @QueryField(type = QueryType.EQ) private Integer securityId; @ApiModelProperty(value = "保养编号") @@ -32,6 +36,84 @@ public class TowerSecurityRecordParam extends BaseParam { @ApiModelProperty(value = "现场图片") private String images; + @ApiModelProperty(value = "基础节(保养前)") + private String before1; + + @ApiModelProperty(value = "第一节架(保养前)") + private String before2; + + @ApiModelProperty(value = "顶升内套架(保养前)") + private String before3; + + @ApiModelProperty(value = "顶升外套架(保养前)") + private String before4; + + @ApiModelProperty(value = "过渡节(保养前)") + private String before5; + + @ApiModelProperty(value = "回转(保养前)") + private String before6; + + @ApiModelProperty(value = "塔帽(保养前)") + private String before7; + + @ApiModelProperty(value = "平衡臂(保养前)") + private String before8; + + @ApiModelProperty(value = "起重臂(保养前)") + private String before9; + + @ApiModelProperty(value = "变幅小车(保养前)") + private String before10; + + @ApiModelProperty(value = "大钩(保养前)") + private String before11; + + @ApiModelProperty(value = "顶升引进小车(保养前)") + private String before12; + + @ApiModelProperty(value = "驾驶室(保养前)") + private String before13; + + @ApiModelProperty(value = "基础节(保养后)") + private String after1; + + @ApiModelProperty(value = "第一节架(保养后)") + private String after2; + + @ApiModelProperty(value = "顶升内套架(保养后)") + private String after3; + + @ApiModelProperty(value = "顶升外套架(保养后)") + private String after4; + + @ApiModelProperty(value = "过渡节(保养后)") + private String after5; + + @ApiModelProperty(value = "回转(保养后)") + private String after6; + + @ApiModelProperty(value = "塔帽(保养后)") + private String after7; + + @ApiModelProperty(value = "平衡臂(保养后)") + private String after8; + + @ApiModelProperty(value = "起重臂(保养后)") + private String after9; + + @ApiModelProperty(value = "变幅小车(保养后)") + private String after10; + + @ApiModelProperty(value = "大钩(保养后)") + private String after11; + + @ApiModelProperty(value = "顶升引进小车(保养后)") + private String after12; + + @ApiModelProperty(value = "驾驶室(保养后)") + private String after13; + @ApiModelProperty(value = "经度") private String longitude; diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPartGoodsService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPartGoodsService.java new file mode 100644 index 0000000..d1c7690 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerPartGoodsService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerPartGoods; +import com.gxwebsoft.tower.param.TowerPartGoodsParam; + +import java.util.List; + +/** + * 安全检查Service + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +public interface TowerPartGoodsService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerPartGoodsParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerPartGoodsParam param); + + /** + * 根据id查询 + * + * @param goodsId 自增ID + * @return TowerPartGoods + */ + TowerPartGoods getByIdRel(Integer goodsId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPartService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPartService.java new file mode 100644 index 0000000..eea32d8 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerPartService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerPart; +import com.gxwebsoft.tower.param.TowerPartParam; + +import java.util.List; + +/** + * 安全检查Service + * + * @author 科技小王子 + * @since 2024-02-27 18:40:31 + */ +public interface TowerPartService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerPartParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerPartParam param); + + /** + * 根据id查询 + * + * @param partId 自增ID + * @return TowerPart + */ + TowerPart getByIdRel(Integer partId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerPartStockService.java b/src/main/java/com/gxwebsoft/tower/service/TowerPartStockService.java new file mode 100644 index 0000000..65f5041 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerPartStockService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.tower.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.tower.entity.TowerPartStock; +import com.gxwebsoft.tower.param.TowerPartStockParam; + +import java.util.List; + +/** + * 产品库存Service + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +public interface TowerPartStockService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerPartStockParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerPartStockParam param); + + /** + * 根据id查询 + * + * @param partId 自增ID + * @return TowerPartStock + */ + TowerPartStock getByIdRel(Integer partId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/TowerSecurityRecordService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSecurityRecordService.java index 7d168e8..ca0c78e 100644 --- a/src/main/java/com/gxwebsoft/tower/service/TowerSecurityRecordService.java +++ b/src/main/java/com/gxwebsoft/tower/service/TowerSecurityRecordService.java @@ -11,7 +11,7 @@ import java.util.List; * 保养记录Service * * @author 科技小王子 - * @since 2024-02-22 13:44:23 + * @since 2024-02-27 15:00:15 */ public interface TowerSecurityRecordService extends IService { @@ -34,9 +34,9 @@ public interface TowerSecurityRecordService extends IService implements TowerPartGoodsService { + + @Override + public PageResult pageRel(TowerPartGoodsParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerPartGoodsParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerPartGoods getByIdRel(Integer goodsId) { + TowerPartGoodsParam param = new TowerPartGoodsParam(); + param.setGoodsId(goodsId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartServiceImpl.java new file mode 100644 index 0000000..64dcdab --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerPartMapper; +import com.gxwebsoft.tower.service.TowerPartService; +import com.gxwebsoft.tower.entity.TowerPart; +import com.gxwebsoft.tower.param.TowerPartParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 安全检查Service实现 + * + * @author 科技小王子 + * @since 2024-02-27 18:40:31 + */ +@Service +public class TowerPartServiceImpl extends ServiceImpl implements TowerPartService { + + @Override + public PageResult pageRel(TowerPartParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerPartParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerPart getByIdRel(Integer partId) { + TowerPartParam param = new TowerPartParam(); + param.setPartId(partId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartStockServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartStockServiceImpl.java new file mode 100644 index 0000000..abb67a4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerPartStockServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerPartStockMapper; +import com.gxwebsoft.tower.service.TowerPartStockService; +import com.gxwebsoft.tower.entity.TowerPartStock; +import com.gxwebsoft.tower.param.TowerPartStockParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 产品库存Service实现 + * + * @author 科技小王子 + * @since 2024-02-27 19:41:23 + */ +@Service +public class TowerPartStockServiceImpl extends ServiceImpl implements TowerPartStockService { + + @Override + public PageResult pageRel(TowerPartStockParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(TowerPartStockParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerPartStock getByIdRel(Integer partId) { + TowerPartStockParam param = new TowerPartStockParam(); + param.setPartId(partId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java index 4cda727..46e07a2 100644 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 保养记录Service实现 * * @author 科技小王子 - * @since 2024-02-22 13:44:23 + * @since 2024-02-27 15:00:15 */ @Service public class TowerSecurityRecordServiceImpl extends ServiceImpl implements TowerSecurityRecordService { @@ -38,9 +38,9 @@ public class TowerSecurityRecordServiceImpl extends ServiceImpl