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 new file mode 100644 index 0000000..ab17f6f --- /dev/null +++ b/src/main/java/com/dd/admin/business/dev/controller/DevController.java @@ -0,0 +1,88 @@ +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 new file mode 100644 index 0000000..7ad4678 --- /dev/null +++ b/src/main/java/com/dd/admin/business/dev/domain/DevDto.java @@ -0,0 +1,41 @@ +package com.dd.admin.business.dev.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.Version; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; +import com.dd.admin.common.model.UpdateGroup; + + +/** + *

+ * 返回对象 + *

+ * + * @author 727869402@qq.com + * @since 2025-02-08 + */ +@Data +@ApiModel(value="接收对象") +public class DevDto { + + + @NotBlank(message = "id不能为空",groups = UpdateGroup.class) + private String devId; + + private String serverName; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + +} 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 new file mode 100644 index 0000000..c6050eb --- /dev/null +++ b/src/main/java/com/dd/admin/business/dev/domain/DevVo.java @@ -0,0 +1,37 @@ +package com.dd.admin.business.dev.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.Version; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 返回对象 + *

+ * + * @author 727869402@qq.com + * @since 2025-02-08 + */ +@Data +@ApiModel(value="返回对象") +public class DevVo { + + + private String devId; + + private String serverName; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + +} 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 new file mode 100644 index 0000000..dd054b8 --- /dev/null +++ b/src/main/java/com/dd/admin/business/dev/entity/Dev.java @@ -0,0 +1,43 @@ +package com.dd.admin.business.dev.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.Version; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * + *

+ * + * @author 727869402@qq.com + * @since 2025-02-08 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("business_dev") +@ApiModel(value="Dev对象", description="") +public class Dev implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "DEV_ID", type = IdType.ASSIGN_UUID) + private String devId; + + @TableField("SERVER_NAME") + private String serverName; + + @ApiModelProperty(value = "创建时间") + @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT) + private Date createTime; + + +} 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 new file mode 100644 index 0000000..41e4eb3 --- /dev/null +++ b/src/main/java/com/dd/admin/business/dev/mapper/DevMapper.java @@ -0,0 +1,28 @@ +package com.dd.admin.business.dev.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dd.admin.business.dev.entity.Dev; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dd.admin.business.dev.domain.DevVo; +import com.dd.admin.business.dev.domain.DevDto; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 727869402@qq.com + * @since 2025-02-08 + */ +@Mapper +public interface DevMapper extends BaseMapper { + + IPage selectDevPage(Page page, @Param("devDto") DevDto devDto); + + List selectDevList(@Param("devDto") DevDto devDto); +} 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 new file mode 100644 index 0000000..beb53f8 --- /dev/null +++ b/src/main/java/com/dd/admin/business/dev/mapper/xml/DevMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + DEV_ID, SERVER_NAME, CREATE_TIME + + + + + + diff --git a/src/main/java/com/dd/admin/business/dev/service/DevService.java b/src/main/java/com/dd/admin/business/dev/service/DevService.java new file mode 100644 index 0000000..468297b --- /dev/null +++ b/src/main/java/com/dd/admin/business/dev/service/DevService.java @@ -0,0 +1,26 @@ +package com.dd.admin.business.dev.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.dd.admin.business.dev.entity.Dev; +import com.baomidou.mybatisplus.extension.service.IService; +import com.dd.admin.business.dev.domain.DevVo; +import com.dd.admin.business.dev.domain.DevDto; +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author 727869402@qq.com + * @since 2025-02-08 + */ +public interface DevService extends IService { + + //-分页列表 + IPage selectDevPage(DevDto devDto); + + //-列表 + List selectDevList(DevDto devDto); + +} diff --git a/src/main/java/com/dd/admin/business/dev/service/impl/DevServiceImpl.java b/src/main/java/com/dd/admin/business/dev/service/impl/DevServiceImpl.java new file mode 100644 index 0000000..169630d --- /dev/null +++ b/src/main/java/com/dd/admin/business/dev/service/impl/DevServiceImpl.java @@ -0,0 +1,36 @@ +package com.dd.admin.business.dev.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dd.admin.common.model.PageFactory; +import com.dd.admin.business.dev.entity.Dev; +import com.dd.admin.business.dev.mapper.DevMapper; +import com.dd.admin.business.dev.service.DevService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import com.dd.admin.business.dev.domain.DevVo; +import com.dd.admin.business.dev.domain.DevDto; +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author 727869402@qq.com + * @since 2025-02-08 + */ +@Service +public class DevServiceImpl extends ServiceImpl implements DevService { + + @Override + public IPage selectDevPage(DevDto devDto) { + Page page = PageFactory.defaultPage(); + return baseMapper.selectDevPage(page,devDto); + } + + @Override + public List selectDevList(DevDto devDto) { + return baseMapper.selectDevList(devDto); + } +} diff --git a/src/main/java/com/dd/admin/business/receive/domain/ReceiveVo.java b/src/main/java/com/dd/admin/business/receive/domain/ReceiveVo.java index 344e774..fd8dbc7 100644 --- a/src/main/java/com/dd/admin/business/receive/domain/ReceiveVo.java +++ b/src/main/java/com/dd/admin/business/receive/domain/ReceiveVo.java @@ -58,5 +58,6 @@ public class ReceiveVo { @ApiModelProperty(value = "0 发送 1已读") private Integer receiveStatus; - + @ApiModelProperty(value = "跳转url") + private String redirectUrl; } diff --git a/src/main/java/com/dd/admin/business/receive/mapper/xml/ReceiveMapper.xml b/src/main/java/com/dd/admin/business/receive/mapper/xml/ReceiveMapper.xml index cf42559..6661443 100644 --- a/src/main/java/com/dd/admin/business/receive/mapper/xml/ReceiveMapper.xml +++ b/src/main/java/com/dd/admin/business/receive/mapper/xml/ReceiveMapper.xml @@ -22,7 +22,7 @@