From 89bcd9857036f240e8629ef45e875afc9959d936 Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Sun, 25 Feb 2024 19:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BF=9D=E5=85=BB=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=92=8C=E5=8E=82=E5=86=85=E7=BB=B4=E4=BF=AE=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TowerSecurityController.java | 10 +- .../TowerSecurityPlantController.java | 136 ++++++++++++++++++ .../gxwebsoft/tower/entity/TowerSecurity.java | 13 ++ .../tower/entity/TowerSecurityPlant.java | 125 ++++++++++++++++ .../tower/entity/TowerSecurityRecord.java | 20 +++ .../mapper/TowerSecurityPlantMapper.java | 37 +++++ .../tower/mapper/xml/TowerSecurityMapper.xml | 3 +- .../mapper/xml/TowerSecurityPlantMapper.xml | 82 +++++++++++ .../mapper/xml/TowerSecurityRecordMapper.xml | 3 +- .../tower/param/TowerSecurityPlantParam.java | 79 ++++++++++ .../service/TowerSecurityPlantService.java | 42 ++++++ .../impl/TowerSecurityPlantServiceImpl.java | 47 ++++++ .../impl/TowerSecurityRecordServiceImpl.java | 2 +- .../impl/TowerSecurityServiceImpl.java | 2 +- .../gxwebsoft/generator/TowerGenerator.java | 3 +- 15 files changed, 595 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/tower/controller/TowerSecurityPlantController.java create mode 100644 src/main/java/com/gxwebsoft/tower/entity/TowerSecurityPlant.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityPlantMapper.java create mode 100644 src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityPlantMapper.xml create mode 100644 src/main/java/com/gxwebsoft/tower/param/TowerSecurityPlantParam.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/TowerSecurityPlantService.java create mode 100644 src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityPlantServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityController.java index 41485c9..db80ee4 100644 --- a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityController.java +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityController.java @@ -60,11 +60,8 @@ public class TowerSecurityController extends BaseController { @ApiOperation("查询全部安全检查") @GetMapping() public ApiResult> list(TowerSecurityParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - return success(towerSecurityService.list(page.getOrderWrapper())); // 使用关联查询 - //return success(towerSecurityService.listRel(param)); + return success(towerSecurityService.listRel(param)); } @PreAuthorize("hasAuthority('tower:towerSecurity:list')") @@ -102,6 +99,11 @@ public class TowerSecurityController extends BaseController { @ApiOperation("修改安全检查") @PutMapping() public ApiResult update(@RequestBody TowerSecurity towerSecurity) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerSecurity.setUserId(loginUser.getUserId()); + } if (towerSecurityService.updateById(towerSecurity)) { return success("修改成功"); } diff --git a/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityPlantController.java b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityPlantController.java new file mode 100644 index 0000000..9c52136 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/controller/TowerSecurityPlantController.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.TowerSecurityPlantService; +import com.gxwebsoft.tower.entity.TowerSecurityPlant; +import com.gxwebsoft.tower.param.TowerSecurityPlantParam; +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-25 19:03:48 + */ +@Api(tags = "保养记录管理") +@RestController +@RequestMapping("/api/tower/tower-security-plant") +public class TowerSecurityPlantController extends BaseController { + @Resource + private TowerSecurityPlantService towerSecurityPlantService; + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:list')") + @OperationLog + @ApiOperation("分页查询保养记录") + @GetMapping("/page") + public ApiResult> page(TowerSecurityPlantParam param) { + // 使用关联查询 + return success(towerSecurityPlantService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:list')") + @OperationLog + @ApiOperation("查询全部保养记录") + @GetMapping() + public ApiResult> list(TowerSecurityPlantParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(towerSecurityPlantService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(towerSecurityPlantService.listRel(param)); + } + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:list')") + @OperationLog + @ApiOperation("根据id查询保养记录") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(towerSecurityPlantService.getById(id)); + // 使用关联查询 + //return success(towerSecurityPlantService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:save')") + @OperationLog + @ApiOperation("添加保养记录") + @PostMapping() + public ApiResult save(@RequestBody TowerSecurityPlant towerSecurityPlant) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + towerSecurityPlant.setUserId(loginUser.getUserId()); + } + if (towerSecurityPlantService.save(towerSecurityPlant)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:update')") + @OperationLog + @ApiOperation("修改保养记录") + @PutMapping() + public ApiResult update(@RequestBody TowerSecurityPlant towerSecurityPlant) { + if (towerSecurityPlantService.updateById(towerSecurityPlant)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:remove')") + @OperationLog + @ApiOperation("删除保养记录") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (towerSecurityPlantService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:save')") + @OperationLog + @ApiOperation("批量添加保养记录") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (towerSecurityPlantService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:update')") + @OperationLog + @ApiOperation("批量修改保养记录") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(towerSecurityPlantService, "security_record_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('tower:towerSecurityPlant:remove')") + @OperationLog + @ApiOperation("批量删除保养记录") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (towerSecurityPlantService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurity.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurity.java index 2215449..dff1c56 100644 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurity.java +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurity.java @@ -1,6 +1,7 @@ package com.gxwebsoft.tower.entity; 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; @@ -101,4 +102,16 @@ public class TowerSecurity implements Serializable { @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/TowerSecurityPlant.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityPlant.java new file mode 100644 index 0000000..f56d4c6 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityPlant.java @@ -0,0 +1,125 @@ +package com.gxwebsoft.tower.entity; + +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-25 19:03:48 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "TowerSecurityPlant对象", description = "保养记录") +public class TowerSecurityPlant implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "security_record_id", type = IdType.AUTO) + private Integer securityRecordId; + + @ApiModelProperty(value = "保养计划ID") + private Integer securityId; + + @ApiModelProperty(value = "保养编号") + private String securityCode; + + @ApiModelProperty(value = "现场图片") + private String images; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "所在国家") + private String country; + + @ApiModelProperty(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在辖区") + private String region; + + @ApiModelProperty(value = "区域名称") + private String regionName; + + @ApiModelProperty(value = "状态, 0待确认, 1已确认") + private Integer status; + + @ApiModelProperty(value = "确认状态, 0待确认, 1已确认") + private Integer confirmStatus; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "排序号") + private Integer sortNumber; + + @ApiModelProperty(value = "所有人") + private Integer userId; + + @ApiModelProperty(value = "所有人") + private Integer confirmId; + + @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 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/entity/TowerSecurityRecord.java b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java index 0d4715a..8d80a3a 100644 --- a/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java +++ b/src/main/java/com/gxwebsoft/tower/entity/TowerSecurityRecord.java @@ -96,4 +96,24 @@ 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/TowerSecurityPlantMapper.java b/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityPlantMapper.java new file mode 100644 index 0000000..08c3568 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/TowerSecurityPlantMapper.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.TowerSecurityPlant; +import com.gxwebsoft.tower.param.TowerSecurityPlantParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 保养记录Mapper + * + * @author 科技小王子 + * @since 2024-02-25 19:03:48 + */ +public interface TowerSecurityPlantMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") TowerSecurityPlantParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") TowerSecurityPlantParam param); + +} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityMapper.xml index 2b94d24..6f1dfe8 100644 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityMapper.xml +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityMapper.xml @@ -4,8 +4,9 @@ - SELECT a.* + SELECT a.*,b.nickname,b.phone,b.avatar FROM tower_security a + LEFT JOIN sys_user b ON a.user_id = b.user_id AND a.security_id = #{param.securityId} diff --git a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityPlantMapper.xml b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityPlantMapper.xml new file mode 100644 index 0000000..e831333 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityPlantMapper.xml @@ -0,0 +1,82 @@ + + + + + + + SELECT a.*,b.nickname,b.phone,b.avatar,c.accessory_no,c.accessory_category,c.accessory_name,c.accessory_model,c.accessory_specs + FROM tower_security_plant a + 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} + + + AND a.security_code LIKE CONCAT('%', #{param.securityCode}, '%') + + + AND a.images LIKE CONCAT('%', #{param.images}, '%') + + + AND a.longitude LIKE CONCAT('%', #{param.longitude}, '%') + + + AND a.latitude LIKE CONCAT('%', #{param.latitude}, '%') + + + AND a.country LIKE CONCAT('%', #{param.country}, '%') + + + AND a.province LIKE CONCAT('%', #{param.province}, '%') + + + AND a.city LIKE CONCAT('%', #{param.city}, '%') + + + AND a.region LIKE CONCAT('%', #{param.region}, '%') + + + AND a.region_name LIKE CONCAT('%', #{param.regionName}, '%') + + + 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 f14a4b8..d64b797 100644 --- a/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml +++ b/src/main/java/com/gxwebsoft/tower/mapper/xml/TowerSecurityRecordMapper.xml @@ -4,9 +4,10 @@ - SELECT a.*,b.nickname,b.phone,b.avatar + SELECT a.*,b.nickname,b.phone,b.avatar,c.accessory_no,c.accessory_category,c.accessory_name,c.accessory_model,c.accessory_specs FROM tower_security_record a 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_id = #{param.securityId} diff --git a/src/main/java/com/gxwebsoft/tower/param/TowerSecurityPlantParam.java b/src/main/java/com/gxwebsoft/tower/param/TowerSecurityPlantParam.java new file mode 100644 index 0000000..bae304e --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/param/TowerSecurityPlantParam.java @@ -0,0 +1,79 @@ +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; + +/** + * 保养记录查询参数 + * + * @author 科技小王子 + * @since 2024-02-25 19:03:48 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "TowerSecurityPlantParam对象", description = "保养记录查询参数") +public class TowerSecurityPlantParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer securityRecordId; + + @ApiModelProperty(value = "保养计划ID") + @QueryField(type = QueryType.EQ) + private Integer securityId; + + @ApiModelProperty(value = "保养编号") + private String securityCode; + + @ApiModelProperty(value = "现场图片") + private String images; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + + @ApiModelProperty(value = "所在国家") + private String country; + + @ApiModelProperty(value = "所在省份") + private String province; + + @ApiModelProperty(value = "所在城市") + private String city; + + @ApiModelProperty(value = "所在辖区") + private String region; + + @ApiModelProperty(value = "区域名称") + private String regionName; + + @ApiModelProperty(value = "确认状态, 0待确认, 1已确认") + @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/service/TowerSecurityPlantService.java b/src/main/java/com/gxwebsoft/tower/service/TowerSecurityPlantService.java new file mode 100644 index 0000000..c625b05 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/TowerSecurityPlantService.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.TowerSecurityPlant; +import com.gxwebsoft.tower.param.TowerSecurityPlantParam; + +import java.util.List; + +/** + * 保养记录Service + * + * @author 科技小王子 + * @since 2024-02-25 19:03:48 + */ +public interface TowerSecurityPlantService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(TowerSecurityPlantParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(TowerSecurityPlantParam param); + + /** + * 根据id查询 + * + * @param securityRecordId 自增ID + * @return TowerSecurityPlant + */ + TowerSecurityPlant getByIdRel(Integer securityRecordId); + +} diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityPlantServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityPlantServiceImpl.java new file mode 100644 index 0000000..430bae3 --- /dev/null +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityPlantServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.tower.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.tower.mapper.TowerSecurityPlantMapper; +import com.gxwebsoft.tower.service.TowerSecurityPlantService; +import com.gxwebsoft.tower.entity.TowerSecurityPlant; +import com.gxwebsoft.tower.param.TowerSecurityPlantParam; +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-25 19:03:48 + */ +@Service +public class TowerSecurityPlantServiceImpl extends ServiceImpl implements TowerSecurityPlantService { + + @Override + public PageResult pageRel(TowerSecurityPlantParam 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(TowerSecurityPlantParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public TowerSecurityPlant getByIdRel(Integer securityRecordId) { + TowerSecurityPlantParam param = new TowerSecurityPlantParam(); + param.setSecurityRecordId(securityRecordId); + 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 56192fd..4cda727 100644 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityRecordServiceImpl.java @@ -23,7 +23,7 @@ public class TowerSecurityRecordServiceImpl extends ServiceImpl pageRel(TowerSecurityRecordParam param) { PageParam page = new PageParam<>(param); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } diff --git a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityServiceImpl.java b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityServiceImpl.java index 94acd11..cd374e7 100644 --- a/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityServiceImpl.java +++ b/src/main/java/com/gxwebsoft/tower/service/impl/TowerSecurityServiceImpl.java @@ -33,7 +33,7 @@ public class TowerSecurityServiceImpl extends ServiceImpl list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - //page.setDefaultOrder("create_time desc"); + page.setDefaultOrder("create_time desc"); return page.sortRecords(list); } diff --git a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java index 1d74a5f..6bf863b 100644 --- a/src/test/java/com/gxwebsoft/generator/TowerGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/TowerGenerator.java @@ -70,7 +70,8 @@ public class TowerGenerator { // "tower_rent", // "tower_purchase", // "tower_security", -// "tower_security_record" +// "tower_security_record", + "tower_security_plant" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{