调整生成文件头

soc-auth/src/main/java/com/xunmei/auth/controller/TokenController.java

@@ -37,8 +37,9 @@ public class TokenController
     {
         // 用户登录
         LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+        userInfo.setToken(tokenService.createToken(userInfo).get("access_token").toString());
         // 获取登录token
-        return R.ok(tokenService.createToken(userInfo));
+        return R.ok(userInfo);
     }
 
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/MenuController.java

@@ -1,11 +1,112 @@
 package com.xunmei.system.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.system.api.model.LoginUser;
+import com.xunmei.system.domain.vo.AppType;
+import com.xunmei.system.service.IMenuService;
+import org.springframework.web.bind.annotation.*;
+import com.xunmei.system.domain.SysMenu;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import static com.xunmei.common.core.web.domain.AjaxResult.error;
+import javax.annotation.Resource;
+import com.xunmei.common.security.annotation.RequiresPermissions;
 
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * <p>
+ * SysMenuController 前端控制器
+ * </p>
+ *
+ * @author luojun
+ * @since 2023-08-04
+ */
+@Api(tags = {"SysMenuController"})
 @RestController
-@RequestMapping("/menu")
+@RequestMapping("/SysMenu")
 public class MenuController {
 
+    private Logger log = LoggerFactory.getLogger(getClass());
+    @Resource
+    private IMenuService sysMenuService;
+
+
+    @ApiOperation(value = "按组列表")
+    @GetMapping(value = {"/group/list/{appType}", "/group/list"})
+    AjaxResult groupList(@PathVariable(required = false) AppType appType) {
+
+        List<Object> result = null;
+        return success(result);
+        //}
+    }
+
+
+    @ApiOperation(value = "新增菜单权限表")
+    @RequiresPermissions("system:SysMenu:add")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody SysMenu sysMenu){
+        try {
+            return sysMenuService.add(sysMenu);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "删除菜单权限表")
+    @RequiresPermissions("system:SysMenu:delete")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable("id") Long id){
+        try {
+            return sysMenuService.delete(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "更新菜单权限表")
+    @RequiresPermissions("system:SysMenu:update")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody SysMenu sysMenu){
+        try {
+            return sysMenuService.updateData(sysMenu);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "查询菜单权限表分页数据")
+    @RequiresPermissions("system:SysMenu:findByPage")
+    @GetMapping("/findByPage")
+    public AjaxResult findListByPage(Page<SysMenu> page, SysMenu sysMenu){
+        try {
+            return sysMenuService.findListByPage(page, sysMenu);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "id查询菜单权限表")
+    @RequiresPermissions("system:SysMenu:findById")
+    @GetMapping("/{id}")
+    public AjaxResult findById(@PathVariable Long id){
+        try {
+            return sysMenuService.findById(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysJob.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/Job.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -21,8 +22,9 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="SysJob对象", description="定时任务调度表")
-public class SysJob implements Serializable {
+@TableName("sys_job")
+@ApiModel(value="Job对象", description="定时任务调度表")
+public class Job implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/vo/AppType.java

@@ -0,0 +1,24 @@
+package com.xunmei.system.domain.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.EnumSerializer;
+import lombok.Getter;
+
+/**
+ * 应用类型
+ */
+@JsonSerialize(using = EnumSerializer.class)
+public enum AppType {
+    APP("安卓"),
+    PC("PC"),
+    HANG_WALL("挂墙终端"),
+    IOS("IOS"),
+    ;
+
+    @Getter
+    private final String text;
+
+    AppType(final String text) {
+        this.text = text;
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysJobMapper.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/JobMapper.java

@@ -1,6 +1,6 @@
 package com.xunmei.system.mapper;
 
-import com.xunmei.system.domain.SysJob;
+import com.xunmei.system.domain.Job;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author luojun
  * @since 2023-08-04
  */
-public interface SysJobMapper extends BaseMapper<SysJob> {
+public interface JobMapper extends BaseMapper<Job> {
 
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysJobService.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IJobService.java

@@ -1,6 +1,6 @@
 package com.xunmei.system.service;
 
-import com.xunmei.system.domain.SysJob;
+import com.xunmei.system.domain.Job;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -13,24 +13,24 @@ import com.xunmei.common.core.web.domain.AjaxResult;
  * @author luojun
  * @since 2023-08-04
  */
-public interface ISysJobService extends IService<SysJob> {
+public interface IJobService extends IService<Job> {
 
     /**
      * 查询定时任务调度表分页数据
      *
      * @param page      页码
-     * @param sysJob 每页条数
+     * @param job 每页条数
      * @return AjaxResult
      */
-    AjaxResult findListByPage(Page<SysJob> page,SysJob sysJob);
+    AjaxResult findListByPage(Page<Job> page,Job job);
 
     /**
      * 添加定时任务调度表
      *
-     * @param sysJob 定时任务调度表
+     * @param job 定时任务调度表
      * @return JsonBean
      */
-    AjaxResult add(SysJob sysJob);
+    AjaxResult add(Job job);
 
     /**
      * 删除定时任务调度表
@@ -43,10 +43,10 @@ public interface ISysJobService extends IService<SysJob> {
     /**
      * 修改定时任务调度表
      *
-     * @param sysJob 定时任务调度表
+     * @param job 定时任务调度表
      * @return AjaxResult
      */
-    AjaxResult updateData(SysJob sysJob);
+    AjaxResult updateData(Job job);
 
     /**
      * id查询数据

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IMenuService.java

@@ -1,10 +1,15 @@
 package com.xunmei.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.domain.SysMenu;
 
 import java.util.Set;
 
+/**
+ * @author luojun
+ */
 public interface IMenuService extends IService<SysMenu> {
 
     /**
@@ -20,4 +25,45 @@ public interface IMenuService extends IService<SysMenu> {
      * @return 权限列表
      */
     Set<String> selectMenuPermsByUserId(Long userId);
+
+    /**
+     * 查询定时任务调度表分页数据
+     *
+     * @param page      页码
+     * @param sysMenu 每页条数
+     * @return AjaxResult
+     */
+    AjaxResult findListByPage(Page<SysMenu> page, SysMenu sysMenu);
+
+    /**
+     * 添加定时任务调度表
+     *
+     * @param sysMenu 定时任务调度表
+     * @return JsonBean
+     */
+    AjaxResult add(SysMenu sysMenu);
+
+    /**
+     * 删除定时任务调度表
+     *
+     * @param id 主键
+     * @return AjaxResult
+     */
+    AjaxResult delete(Long id);
+
+    /**
+     * 修改定时任务调度表
+     *
+     * @param sysMenu 定时任务调度表
+     * @return AjaxResult
+     */
+    AjaxResult updateData(SysMenu sysMenu);
+
+    /**
+     * id查询数据
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    AjaxResult findById(Long id);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysJobServiceImpl.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/JobServiceImpl.java

@@ -1,8 +1,8 @@
 package com.xunmei.system.service.impl;
 
-import com.xunmei.system.domain.SysJob;
-import com.xunmei.system.mapper.SysJobMapper;
-import com.xunmei.system.service.ISysJobService;
+import com.xunmei.system.domain.Job;
+import com.xunmei.system.mapper.JobMapper;
+import com.xunmei.system.service.IJobService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -19,17 +19,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  * @since 2023-08-04
  */
 @Service
-public class SysJobServiceImpl extends ServiceImpl<SysJobMapper, SysJob> implements ISysJobService {
+public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements IJobService {
 
     @Override
-    public AjaxResult findListByPage(Page<SysJob> page,SysJob sysJob){
-    QueryWrapper<SysJob> where = new QueryWrapper<>(sysJob);
+    public AjaxResult findListByPage(Page<Job> page,Job job){
+    QueryWrapper<Job> where = new QueryWrapper<>(job);
         return success(baseMapper.selectPage(page,where));
     }
 
     @Override
-    public AjaxResult add(SysJob sysJob){
-        return success(baseMapper.insert(sysJob));
+    public AjaxResult add(Job job){
+        return success(baseMapper.insert(job));
     }
 
     @Override
@@ -38,8 +38,8 @@ public class SysJobServiceImpl extends ServiceImpl<SysJobMapper, SysJob> impleme
     }
 
     @Override
-    public AjaxResult updateData(SysJob sysJob){
-        return success(baseMapper.updateById(sysJob));
+    public AjaxResult updateData(Job job){
+        return success(baseMapper.updateById(job));
     }
 
     @Override

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/MenuServiceImpl.java

@@ -1,7 +1,10 @@
 package com.xunmei.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.domain.SysMenu;
 import com.xunmei.system.mapper.MenuMapper;
 import com.xunmei.system.service.IMenuService;
@@ -12,15 +15,46 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+
+/**
+ * @author luojun
+ */
 @Service
 public class MenuServiceImpl extends ServiceImpl<MenuMapper, SysMenu> implements IMenuService {
 
     @Override
+    public AjaxResult findListByPage(Page<SysMenu> page, SysMenu sysMenu) {
+        QueryWrapper<SysMenu> where = new QueryWrapper<>(sysMenu);
+        return success(baseMapper.selectPage(page, where));
+    }
+
+    @Override
+    public AjaxResult add(SysMenu sysMenu) {
+        return success(baseMapper.insert(sysMenu));
+    }
+
+    @Override
+    public AjaxResult delete(Long id) {
+        return success(baseMapper.deleteById(id));
+    }
+
+    @Override
+    public AjaxResult updateData(SysMenu sysMenu) {
+        return success(baseMapper.updateById(sysMenu));
+    }
+
+    @Override
+    public AjaxResult findById(Long id) {
+        return success(baseMapper.selectById(id));
+    }
+
+    @Override
     public Set<String> selectMenuPermsByRoleId(Long roleId) {
         List<String> perms = baseMapper.selectMenuPermsByRoleId(roleId);
         Set<String> permsSet = new HashSet<>();
         for (String perm : perms) {
-            if(StringUtils.isNotEmpty(perm)){
+            if (StringUtils.isNotEmpty(perm)) {
                 permsSet.addAll(Arrays.asList(perm.trim().split(",")));
             }
         }
@@ -31,10 +65,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, SysMenu> implements
     public Set<String> selectMenuPermsByUserId(Long userId) {
         List<String> perms = baseMapper.selectMenuPermsByUserId(userId);
         Set<String> permsSet = new HashSet<>();
-        for (String perm : perms)
-        {
-            if (StringUtils.isNotEmpty(perm))
-            {
+        for (String perm : perms) {
+            if (StringUtils.isNotEmpty(perm)) {
                 permsSet.addAll(Arrays.asList(perm.trim().split(",")));
             }
         }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/Generator.java

@@ -52,7 +52,7 @@ public class Generator {
         gc.setAuthor("luojun");
         gc.setOpen(false);
         //是否覆盖文件
-        gc.setFileOverride(true);
+        gc.setFileOverride(false);
         // xml resultmap
         gc.setBaseResultMap(true);
         // xml columlist
@@ -139,7 +139,7 @@ public class Generator {
         // 写于父类中的公共字段
         strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
         strategy.setControllerMappingHyphenStyle(true);
-        strategy.setTablePrefix("t_");
+        strategy.setTablePrefix("t_","sys_");
         mpg.setStrategy(strategy);
         mpg.setTemplateEngine(new FreemarkerTemplateEngine());
         mpg.execute();

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysJobMapper.xml → soc-modules/soc-modules-system/src/main/resources/mapper/system/JobMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.system.mapper.SysJobMapper">
+<mapper namespace="com.xunmei.system.mapper.JobMapper">
 
         <!-- 通用查询映射结果 -->
-        <resultMap id="BaseResultMap" type="com.xunmei.system.domain.SysJob">
+        <resultMap id="BaseResultMap" type="com.xunmei.system.domain.Job">
                     <id column="job_id" property="jobId"/>
                     <result column="job_name" property="jobName"/>
                     <result column="job_group" property="jobGroup"/>