系统消息设置模块

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -16,7 +16,6 @@ import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.enums.AuthorizeType;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.enums.MenuType;
-import com.xjrsoft.common.enums.RoleEnum;
 import com.xjrsoft.common.enums.SystemTypeEnum;
 import com.xjrsoft.common.enums.YesOrNoEnum;
 import com.xjrsoft.common.model.result.R;

src/main/java/com/xjrsoft/module/system/controller/XjrTipsMessageController.java

@@ -0,0 +1,145 @@
+package com.xjrsoft.module.system.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.system.dto.AddXjrTipsMessageDto;
+import com.xjrsoft.module.system.dto.UpdateXjrTipsMessageDto;
+import com.xjrsoft.module.system.dto.XjrTipsMessagePageDto;
+import com.xjrsoft.module.system.entity.XjrTipsMessage;
+import com.xjrsoft.module.system.service.IXjrTipsMessageService;
+import com.xjrsoft.module.system.vo.XjrTipsMessagePageVo;
+import com.xjrsoft.module.system.vo.XjrTipsMessageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 系统提示信息设置
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/system" + "/xjrTipsMessage")
+@Api(value = "/system"  + "/xjrTipsMessage",tags = "系统提示信息设置代码")
+@AllArgsConstructor
+public class XjrTipsMessageController {
+
+
+    private final IXjrTipsMessageService xjrTipsMessageService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="系统提示信息设置列表(分页)")
+    @SaCheckPermission("xjrtipsmessage:detail")
+    public RT<PageOutput<XjrTipsMessagePageVo>> page(@Valid XjrTipsMessagePageDto dto){
+
+        LambdaQueryWrapper<XjrTipsMessage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .orderByDesc(XjrTipsMessage::getId)
+                .eq(ObjectUtil.isNotNull(dto), XjrTipsMessage::getGroupName, dto.getGroupName())
+                .select(XjrTipsMessage.class,x -> VoToColumnUtil.fieldsToColumns(XjrTipsMessagePageVo.class).contains(x.getProperty()));
+        IPage<XjrTipsMessage> page = xjrTipsMessageService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<XjrTipsMessagePageVo> pageOutput = ConventPage.getPageOutput(page, XjrTipsMessagePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="系统提示信息设置列表")
+    @SaCheckPermission("xjrtipsmessage:detail")
+    public RT<List<XjrTipsMessagePageVo>> list(@Valid XjrTipsMessagePageDto dto){
+
+        LambdaQueryWrapper<XjrTipsMessage> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                .eq(ObjectUtil.isNotNull(dto), XjrTipsMessage::getGroupName, dto.getGroupName())
+                .orderByDesc(XjrTipsMessage::getId)
+                .select(XjrTipsMessage.class,x -> VoToColumnUtil.fieldsToColumns(XjrTipsMessagePageVo.class).contains(x.getProperty()));
+        List<XjrTipsMessage> list = xjrTipsMessageService.list(queryWrapper);
+        return RT.ok(BeanUtil.copyToList(list, XjrTipsMessagePageVo.class));
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询系统提示信息设置信息")
+    @SaCheckPermission("xjrtipsmessage:detail")
+    public RT<XjrTipsMessageVo> info(@RequestParam Long id){
+        XjrTipsMessage xjrTipsMessage = xjrTipsMessageService.getById(id);
+        if (xjrTipsMessage == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(xjrTipsMessage, XjrTipsMessageVo.class));
+    }
+
+    @GetMapping(value = "/infoByCode")
+    @ApiOperation(value="根据code查询系统提示信息设置信息")
+    @SaCheckPermission("xjrtipsmessage:detail")
+    public RT<XjrTipsMessageVo> infoByCode(@RequestParam String code){
+        XjrTipsMessage xjrTipsMessage = xjrTipsMessageService.getOne(
+                new QueryWrapper<XjrTipsMessage>().lambda().eq(XjrTipsMessage::getCode, code)
+        );
+        if (xjrTipsMessage == null) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(xjrTipsMessage, XjrTipsMessageVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增系统提示信息设置")
+    @SaCheckPermission("xjrtipsmessage:add")
+    public RT<Boolean> add(@Valid @RequestBody AddXjrTipsMessageDto dto){
+        long count = xjrTipsMessageService.count(
+                new QueryWrapper<XjrTipsMessage>().lambda()
+                        .eq(XjrTipsMessage::getCode, dto.getCode())
+        );
+        if(count > 0){
+            return RT.error("code已存在！请保证code唯一！");
+        }
+        XjrTipsMessage xjrTipsMessage = BeanUtil.toBean(dto, XjrTipsMessage.class);
+        boolean isSuccess = xjrTipsMessageService.save(xjrTipsMessage);
+        return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改系统提示信息设置")
+    @SaCheckPermission("xjrtipsmessage:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateXjrTipsMessageDto dto){
+        long count = xjrTipsMessageService.count(
+                new QueryWrapper<XjrTipsMessage>().lambda()
+                        .eq(XjrTipsMessage::getCode, dto.getCode())
+                        .ne(XjrTipsMessage::getId, dto.getId())
+        );
+        if(count > 0){
+            return RT.error("code已存在！请保证code唯一！");
+        }
+        XjrTipsMessage xjrTipsMessage = BeanUtil.toBean(dto, XjrTipsMessage.class);
+        return RT.ok(xjrTipsMessageService.updateById(xjrTipsMessage));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除系统提示信息设置")
+    @SaCheckPermission("xjrtipsmessage:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(xjrTipsMessageService.removeBatchByIds(ids));
+
+    }
+
+}

src/main/java/com/xjrsoft/module/system/dto/AddXjrTipsMessageDto.java

@@ -0,0 +1,37 @@
+package com.xjrsoft.module.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+
+/**
+* @title: 系统提示信息设置
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@Data
+public class AddXjrTipsMessageDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 消息分组
+    */
+    @ApiModelProperty("消息分组")
+    private String groupName;
+    /**
+    * 唯一code
+    */
+    @ApiModelProperty("唯一code")
+    private String code;
+    /**
+    * 消息内容
+    */
+    @ApiModelProperty("消息内容")
+    private String content;
+
+}

src/main/java/com/xjrsoft/module/system/dto/UpdateXjrTipsMessageDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 系统提示信息设置
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@Data
+public class UpdateXjrTipsMessageDto extends AddXjrTipsMessageDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/system/dto/XjrTipsMessagePageDto.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.system.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 系统提示信息设置分页查询入参
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class XjrTipsMessagePageDto extends PageInput {
+
+    @ApiModelProperty("分组名称（精准查询）")
+    private String groupName;
+}

src/main/java/com/xjrsoft/module/system/entity/XjrTipsMessage.java

@@ -0,0 +1,89 @@
+package com.xjrsoft.module.system.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 系统提示信息设置
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@Data
+@TableName("xjr_tips_message")
+@ApiModel(value = "xjr_tips_message", description = "系统提示信息设置")
+public class XjrTipsMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 消息分组
+    */
+    @ApiModelProperty("消息分组")
+    private String groupName;
+    /**
+    * 唯一code
+    */
+    @ApiModelProperty("唯一code")
+    private String code;
+    /**
+    * 消息内容
+    */
+    @ApiModelProperty("消息内容")
+    private String content;
+
+
+}

src/main/java/com/xjrsoft/module/system/mapper/XjrTipsMessageMapper.java

@@ -0,0 +1,16 @@
+package com.xjrsoft.module.system.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.system.entity.XjrTipsMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 系统提示信息设置
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@Mapper
+public interface XjrTipsMessageMapper extends MPJBaseMapper<XjrTipsMessage> {
+
+}

src/main/java/com/xjrsoft/module/system/service/IXjrTipsMessageService.java

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.system.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.system.entity.XjrTipsMessage;
+
+/**
+* @title: 系统提示信息设置
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+
+public interface IXjrTipsMessageService extends MPJBaseService<XjrTipsMessage> {
+}

src/main/java/com/xjrsoft/module/system/service/impl/XjrTipsMessageServiceImpl.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.system.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.system.entity.XjrTipsMessage;
+import com.xjrsoft.module.system.mapper.XjrTipsMessageMapper;
+import com.xjrsoft.module.system.service.IXjrTipsMessageService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 系统提示信息设置
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class XjrTipsMessageServiceImpl extends MPJBaseServiceImpl<XjrTipsMessageMapper, XjrTipsMessage> implements IXjrTipsMessageService {
+}

src/main/java/com/xjrsoft/module/system/vo/XjrTipsMessagePageVo.java

@@ -0,0 +1,68 @@
+package com.xjrsoft.module.system.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 系统提示信息设置分页列表出参
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@Data
+public class XjrTipsMessagePageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改日期
+    */
+    @ApiModelProperty("修改日期")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标记
+    */
+    @ApiModelProperty("有效标记")
+    private Integer enabledMark;
+    /**
+    * 消息分组
+    */
+    @ApiModelProperty("消息分组")
+    private String groupName;
+    /**
+    * 唯一code
+    */
+    @ApiModelProperty("唯一code")
+    private String code;
+    /**
+    * 消息内容
+    */
+    @ApiModelProperty("消息内容")
+    private String content;
+
+}

src/main/java/com/xjrsoft/module/system/vo/XjrTipsMessageVo.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.system.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 系统提示信息设置表单出参
+* @Author dzx
+* @Date: 2024-08-12
+* @Version 1.0
+*/
+@Data
+public class XjrTipsMessageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 消息分组
+    */
+    @ApiModelProperty("消息分组")
+    private String groupName;
+    /**
+    * 唯一code
+    */
+    @ApiModelProperty("唯一code")
+    private String code;
+    /**
+    * 消息内容
+    */
+    @ApiModelProperty("消息内容")
+    private String content;
+
+
+
+}

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -3666,4 +3666,30 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+
+    @Test
+    public void gcXjrTipsMessage() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("xjr_tips_message");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("system");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }