diff --git a/src/main/java/com/dd/admin/business/dev/controller/DevController.java b/src/main/java/com/dd/admin/business/dev/controller/DevController.java deleted file mode 100644 index ab17f6f..0000000 --- a/src/main/java/com/dd/admin/business/dev/controller/DevController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.dd.admin.business.dev.controller; - -import cn.hutool.core.bean.BeanUtil; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.dd.admin.common.model.UpdateGroup; -import com.dd.admin.common.model.result.ResultBean; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import javax.validation.constraints.NotBlank; -import com.dd.admin.business.dev.entity.Dev; -import com.dd.admin.business.dev.domain.DevVo; -import com.dd.admin.business.dev.domain.DevDto; -import com.dd.admin.business.dev.service.DevService; - -import java.util.List; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author 727869402@qq.com - * @since 2025-02-08 - */ -@Api(tags = "") -@RestController -public class DevController { - - @Autowired - DevService devService; - - @ApiOperation(value = "-分页列表") - @ApiOperationSupport(order = 1) - @GetMapping("/admin/dev/page") - public ResultBean> page(DevDto devDto) { - IPage pageInfo = devService.selectDevPage(devDto); - return ResultBean.success(pageInfo); - } - - @ApiOperation(value = "-列表") - @ApiOperationSupport(order = 2) - @GetMapping("/admin/dev/list") - public ResultBean> list(DevDto devDto) { - List list = devService.selectDevList(devDto); - return ResultBean.success(list); - } - - @ApiOperation(value = "-添加") - @ApiOperationSupport(order = 3) - @PostMapping("/admin/dev/add") - public ResultBean add(@RequestBody @Validated DevDto devDto) { - Dev dev = BeanUtil.copyProperties(devDto, Dev.class); - devService.save(dev); - return ResultBean.success(dev); - } - - @ApiOperation(value = "-查询") - @ApiOperationSupport(order = 4) - @GetMapping("/admin/dev/{devId}") - public ResultBean get(@PathVariable @NotBlank String devId) { - Dev dev = devService.getById(devId); - DevVo devVo = BeanUtil.copyProperties(dev,DevVo.class); - return ResultBean.success(devVo); - } - - @ApiOperation(value = "-修改") - @ApiOperationSupport(order = 5) - @PostMapping("/admin/dev/update") - public ResultBean update(@RequestBody @Validated(UpdateGroup.class) DevDto devDto) { - Dev dev = BeanUtil.copyProperties(devDto, Dev.class); - devService.updateById(dev); - return ResultBean.success(dev); - } - - @ApiOperation(value = "-删除") - @ApiOperationSupport(order = 6) - @GetMapping("/admin/dev/delete/{devId}") - public ResultBean delete(@PathVariable @NotBlank String devId) { - Boolean b = devService.removeById(devId); - return ResultBean.success(b); - } -} diff --git a/src/main/java/com/dd/admin/business/dev/domain/DevDto.java b/src/main/java/com/dd/admin/business/dev/domain/DevDto.java index 7ad4678..e43938d 100644 --- a/src/main/java/com/dd/admin/business/dev/domain/DevDto.java +++ b/src/main/java/com/dd/admin/business/dev/domain/DevDto.java @@ -22,7 +22,7 @@ import com.dd.admin.common.model.UpdateGroup; *

* * @author 727869402@qq.com - * @since 2025-02-08 + * @since 2025-02-11 */ @Data @ApiModel(value="接收对象") @@ -37,5 +37,9 @@ public class DevDto { @ApiModelProperty(value = "创建时间") private Date createTime; + private String ipAddress; + + private String ipRealAddress; + } diff --git a/src/main/java/com/dd/admin/business/dev/domain/DevVo.java b/src/main/java/com/dd/admin/business/dev/domain/DevVo.java index c6050eb..4325b6f 100644 --- a/src/main/java/com/dd/admin/business/dev/domain/DevVo.java +++ b/src/main/java/com/dd/admin/business/dev/domain/DevVo.java @@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode; *

* * @author 727869402@qq.com - * @since 2025-02-08 + * @since 2025-02-11 */ @Data @ApiModel(value="返回对象") @@ -33,5 +33,9 @@ public class DevVo { @ApiModelProperty(value = "创建时间") private Date createTime; + private String ipAddress; + + private String ipRealAddress; + } diff --git a/src/main/java/com/dd/admin/business/dev/entity/Dev.java b/src/main/java/com/dd/admin/business/dev/entity/Dev.java index dd054b8..c538871 100644 --- a/src/main/java/com/dd/admin/business/dev/entity/Dev.java +++ b/src/main/java/com/dd/admin/business/dev/entity/Dev.java @@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode; *

* * @author 727869402@qq.com - * @since 2025-02-08 + * @since 2025-02-11 */ @Data @EqualsAndHashCode(callSuper = false) @@ -39,5 +39,11 @@ public class Dev implements Serializable { @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT) private Date createTime; + @TableField("IP_ADDRESS") + private String ipAddress; + + @TableField("IP_REAL_ADDRESS") + private String ipRealAddress; + } diff --git a/src/main/java/com/dd/admin/business/dev/mapper/DevMapper.java b/src/main/java/com/dd/admin/business/dev/mapper/DevMapper.java index 41e4eb3..36eefda 100644 --- a/src/main/java/com/dd/admin/business/dev/mapper/DevMapper.java +++ b/src/main/java/com/dd/admin/business/dev/mapper/DevMapper.java @@ -17,7 +17,7 @@ import java.util.List; *

* * @author 727869402@qq.com - * @since 2025-02-08 + * @since 2025-02-11 */ @Mapper public interface DevMapper extends BaseMapper { diff --git a/src/main/java/com/dd/admin/business/dev/mapper/xml/DevMapper.xml b/src/main/java/com/dd/admin/business/dev/mapper/xml/DevMapper.xml index beb53f8..58386e7 100644 --- a/src/main/java/com/dd/admin/business/dev/mapper/xml/DevMapper.xml +++ b/src/main/java/com/dd/admin/business/dev/mapper/xml/DevMapper.xml @@ -7,11 +7,13 @@ + + - DEV_ID, SERVER_NAME, CREATE_TIME + DEV_ID, SERVER_NAME, CREATE_TIME, IP_ADDRESS, IP_REAL_ADDRESS