mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'develop', 'develop' and 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

This commit is contained in:
Jason 2022-08-16 18:59:43 +08:00
parent 3ab33b550e c3c869002e
commit c77bc5b679
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java
View File

@ -18,6 +18,7 @@ public class AdminConfig {
public static String[] notLoginUri = new String[]{
"system:login", // 登录接口
"common:index:config", // 配置接口
"gen:downloadCode", // 配置接口
};
// 免权限验证

20
server/like-generator/src/main/resources/java/controller.java.vm
View File

@ -1,13 +1,20 @@
package ${packageName}.admin.controller.${moduleName};
#if(!$table.genTpl.equals("crud"))
import com.alibaba.fastjson.JSONArray;
#end
import ${packageName}.admin.config.aop.Log;
import ${packageName}.admin.service.${moduleName}.I${EntityName}Service;
import ${packageName}.admin.validate.common.PageParam;
import ${packageName}.admin.validate.${moduleName}.${EntityName}Param;
#if($table.genTpl.equals("crud"))
import ${packageName}.admin.validate.common.PageParam;
import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo;
#end
import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo;
import ${packageName}.common.core.AjaxResult;
#if($table.genTpl.equals("crud"))
import ${packageName}.common.core.PageResult;
#end
import ${packageName}.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -31,17 +38,26 @@ public class ${EntityName}Controller {
#if(!$authorName.equals(""))
* @author ${authorName}
#end
#if($table.genTpl.equals("crud"))
* @param pageParam 分页参数
#end
* @param params 搜索参数
* @return Object
*/
#if($table.genTpl.equals("crud"))
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<${EntityName}ListVo> list = i${EntityName}Service.list(pageParam, params);
return AjaxResult.success(list);
}
#else
@GetMapping("/list")
public Object list(@RequestParam Map<String, String> params) {
JSONArray list = i${EntityName}Service.list(params);
return AjaxResult.success(list);
}
#end
/**
* ${functionName}详情
*

3
server/like-generator/src/main/resources/java/service.java.vm
View File

@ -1,5 +1,8 @@
package ${packageName}.admin.service.${moduleName};
#if(!$table.genTpl.equals("crud"))
import com.alibaba.fastjson.JSONArray;
#end
import ${packageName}.admin.validate.common.PageParam;
import ${packageName}.admin.validate.${moduleName}.${EntityName}Param;
import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo;

8
server/like-generator/src/main/resources/java/serviceImpl.java.vm
View File

@ -1,5 +1,8 @@
package ${packageName}.admin.service.${moduleName}.impl;
#if(!$table.genTpl.equals("crud"))
import com.alibaba.fastjson.JSONArray;
#end
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -12,9 +15,10 @@ import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo;
import ${packageName}.common.core.PageResult;
import ${packageName}.common.entity.${moduleName}.${EntityName};
import ${packageName}.common.mapper.${moduleName}.${EntityName}Mapper;
import ${packageName}.common.utils.ArrayUtil;
import ${packageName}.common.utils.TimeUtil;
import ${packageName}.common.utils.UrlUtil;
import com.hxkj.common.config.GlobalConfig;
import ${packageName}.common.config.GlobalConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
@ -61,7 +65,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
#if($isAuthor)
* @author ${authorName}
#end
#if($table.genTpl.equals("crud"))
* ${pageParam}
#end
#if($isSearchParam)
* ${searchparams}
#end