admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-08-10 10:50:29 +08:00
parent 3e047407ab
commit 2b82b773a1
9 changed files with 255 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -26,7 +26,7 @@
<druid.version>1.1.10</druid.version>
<jwt.version>0.9.1</jwt.version>
<commons.version>2.6</commons.version>
<swagger.ui.version>1.8.7</swagger.ui.version>
<swagger.ui.version>1.9.6</swagger.ui.version>
<tomcat.version>9.0.12</tomcat.version>
</properties>

59
src/main/java/com/zhgd/config/SwaggerConfig.java
View File

@ -10,10 +10,17 @@ import springfox.documentation.RequestHandler;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.service.AuthorizationScope;
import springfox.documentation.service.SecurityReference;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.ArrayList;
import java.util.List;
/**
* @program: Iot
@ -30,38 +37,28 @@ public class SwaggerConfig {
@Bean
public Docket createZwRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.groupName("政务接口")
.apiInfo(apiInfo("政务管理API", "政务前后端联调api文档", "1.0"))
.select()
return new Docket(DocumentationType.SWAGGER_2).groupName("2政务接口").apiInfo(apiInfo("政务管理API", "政务前后端联调api文档", "1.0")).select()
//.apis(RequestHandlerSelectors.basePackage("com.zhgd.xmgl"))
.apis(basePackage("com.zhwl.zw"))
.paths(PathSelectors.any())
.apis(basePackage("com.zhwl.zw")).paths(PathSelectors.any())
//.paths(PathSelectors.regex("/zw.*"))
.build();
}
@Bean
public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2)
.groupName("项目接口")
.apiInfo(apiInfo("项目管理API", "项目前后端联调api文档", "1.0"))
.select()
return new Docket(DocumentationType.SWAGGER_2).groupName("1项目接口").apiInfo(apiInfo("项目管理API", "项目前后端联调api文档", "1.0")).select()
//.apis(RequestHandlerSelectors.basePackage("com.zhgd.xmgl"))
.apis(basePackage("com.zhgd.xmgl"))
//.apis(basePackage("com.zhgd.xmgl"+splitor+"com.zhgd.xmgl.device"))
.paths(PathSelectors.any())
//.paths(PathSelectors.regex("/xmgl.*"))
.build();
.build()
/* 设置安全模式，swagger可以设置访问token */.securitySchemes(securitySchemes()).securityContexts(securityContexts());
}
private ApiInfo apiInfo(String titleName, String description, String version) {
return new ApiInfoBuilder()
.title(titleName)
.description(description)
.version(version)
.build();
return new ApiInfoBuilder().title(titleName).description(description).version(version).build();
}
public static Predicate<RequestHandler> basePackage(final String basePackage) {
@ -84,4 +81,34 @@ public class SwaggerConfig {
private static Optional<? extends Class<?>> declaringClass(RequestHandler input) {
return Optional.fromNullable(input.declaringClass());
}
/**
* 安全模式，这里指定token通过Authorization头请求头传递
*/
private List<ApiKey> securitySchemes() {
List<ApiKey> apiKeyList = new ArrayList<ApiKey>();
apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
return apiKeyList;
}
/**
* 安全上下文
*/
private List<SecurityContext> securityContexts() {
List<SecurityContext> securityContexts = new ArrayList<>();
securityContexts.add(SecurityContext.builder().securityReferences(defaultAuth()).forPaths(PathSelectors.regex("^(?!auth).*$")).build());
return securityContexts;
}
/**
* 默认的安全上引用
*/
private List<SecurityReference> defaultAuth() {
AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
List<SecurityReference> securityReferences = new ArrayList<>();
securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
return securityReferences;
}
}

12
src/main/java/com/zhgd/xmgl/entity/RequestPage.java Normal file
View File

@ -0,0 +1,12 @@
package com.zhgd.xmgl.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class RequestPage {
@ApiModelProperty(value = "第几页", example = "1")
private Integer current = 1;
@ApiModelProperty(value = "每页显示条数", example = "10")
private Integer size = 10;
}

19
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java
View File

@ -1,6 +1,8 @@
package com.zhgd.xmgl.modules.basicdata.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.basicdata.controller.dto.ModuleListPageDto;
import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService;
import com.zhgd.xmgl.util.MessageUtil;
@ -36,7 +38,8 @@ public class BaseModuleController {
private IBaseModuleService baseModuleService;
/**
* 分页列表查询
* 列表查询
*
* @return
*/
@ApiOperation(value = "列表查询所有模块信息", notes = "列表查询所有模块信息", httpMethod = "POST")
@ -50,6 +53,13 @@ public class BaseModuleController {
return Result.success(pageList);
}
@ApiOperation(value = "分页列表查询所有模块信息", notes = "列表查询所有模块信息", httpMethod = "POST")
@PostMapping(value = "/page")
public Result<Page<BaseModule>> getModuleListByPage(@RequestBody ModuleListPageDto dto) {
Page<BaseModule> pageList = baseModuleService.getModuleListByPage(dto);
return Result.success(pageList);
}
@ApiOperation(value = "查询总企业默认的模块列表", notes = "查询总企业默认的模块列表", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "headquartersSn", value = "总公司sn", paramType = "query", required = true, dataType = "String"),
@ -77,8 +87,10 @@ public class BaseModuleController {
public Result<List<BaseModule>> getUserModuleList(@RequestBody Map<String, Object> map) {
return Result.success(baseModuleService.getUserModuleList(map));
}
/**
* 添加
*
* @param baseModule
* @return
*/
@ -99,6 +111,7 @@ public class BaseModuleController {
/**
* 编辑
*
* @param baseModule
* @return
*/
@ -111,7 +124,6 @@ public class BaseModuleController {
result.error500(MessageUtil.get("notFindErr"));
} else {
boolean ok = baseModuleService.updateById(baseModule);
//TODO 返回false说明什么？
if (ok) {
result.successMsg(MessageUtil.get("editSucess"));
}
@ -121,6 +133,7 @@ public class BaseModuleController {
/**
* 通过id删除
*
* @param
* @return
*/
@ -143,9 +156,9 @@ public class BaseModuleController {
}
/**
* 通过id查询
*
* @param
* @return
*/

13
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/dto/ModuleListPageDto.java Normal file
View File

@ -0,0 +1,13 @@
package com.zhgd.xmgl.modules.basicdata.controller.dto;
import com.zhgd.xmgl.entity.RequestPage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ModuleListPageDto extends RequestPage {
@ApiModelProperty("模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板")
private String moduleType;
@ApiModelProperty("样式类型，默认查1样式")
private String styleType;
}

5
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/BaseModuleMapper.java
View File

@ -3,9 +3,12 @@ package com.zhgd.xmgl.modules.basicdata.mapper;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.basicdata.controller.dto.ModuleListPageDto;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 模块
@ -25,4 +28,6 @@ public interface BaseModuleMapper extends BaseMapper<BaseModule> {
List<BaseModule> getProjectUserModuleList(Map<String, Object> param);
List<BaseModule> getModuleList(Map<String, Object> map);
Page<BaseModule> getModuleListByPage(Page<BaseModule> page, @Param("dto") ModuleListPageDto dto);
}

14
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
View File

@ -54,4 +54,18 @@
</where>
ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id
</select>
<select id="getModuleListByPage" resultType="com.zhgd.xmgl.modules.basicdata.entity.BaseModule">
SELECT a.*
from base_module a
<where>
<if test="dto.moduleType != null and dto.moduleType != ''">
and a.module_type=#{dto.moduleType}
</if>
<if test="dto.styleType != null and dto.styleType != ''">
and a.style_type=#{dto.styleType}
</if>
</where>
ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IBaseModuleService.java
View File

@ -1,5 +1,7 @@
package com.zhgd.xmgl.modules.basicdata.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.basicdata.controller.dto.ModuleListPageDto;
import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
import com.baomidou.mybatisplus.extension.service.IService;
@ -21,4 +23,6 @@ public interface IBaseModuleService extends IService<BaseModule> {
List<BaseModule> getUserModuleList(Map<String, Object> map);
List<BaseModule> getModuleList(Map<String, Object> map);
Page<BaseModule> getModuleListByPage(ModuleListPageDto dto);
}

14
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseModuleServiceImpl.java
View File

@ -1,6 +1,9 @@
package com.zhgd.xmgl.modules.basicdata.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.zhgd.xmgl.modules.basicdata.controller.dto.ModuleListPageDto;
import com.zhgd.xmgl.modules.basicdata.entity.BaseModule;
import com.zhgd.xmgl.modules.basicdata.entity.CompanyConfig;
import com.zhgd.xmgl.modules.basicdata.mapper.BaseModuleMapper;
@ -9,8 +12,6 @@ import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@ -65,4 +66,13 @@ public class BaseModuleServiceImpl extends ServiceImpl<BaseModuleMapper, BaseMod
map.put("styleType", styleType);
return baseModuleMapper.getModuleList(map);
}
@Override
public Page<BaseModule> getModuleListByPage(ModuleListPageDto dto) {
Page<BaseModule> page = new Page<>(dto.getCurrent(), dto.getSize());
if (dto.getStyleType() == null) {
dto.setStyleType("1");
}
return baseModuleMapper.getModuleListByPage(page, dto);
}
}