CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

commit for pull

Browse Source
This commit is contained in:
caixiang 2023-04-04 10:49:05 +08:00
parent cabed052a1
commit d366d7d922
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java
View File

@ -75,7 +75,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/test/**", "/test/**",
"/**/expert", "/**/expert",
"/captcha", "/captcha",
"druid/**").anonymous() "druid/**",
"/packing/woPackagingBox/page",
"/packing/printModel/page"
).anonymous()
// .antMatchers("/testCors").hasAuthority("system:dept:list222") // .antMatchers("/testCors").hasAuthority("system:dept:list222")
// 除上面外的所有请求全部需要鉴权认证 // 除上面外的所有请求全部需要鉴权认证
.anyRequest() .anyRequest()

3
ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java
View File

@ -52,10 +52,9 @@ public class PrintModelController {
@ApiImplicitParam(name = "lineBody", value = "线体，1=F ; 2=S", paramType = "query", dataTypeClass = Integer.class), @ApiImplicitParam(name = "lineBody", value = "线体，1=F ; 2=S", paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "isEnable", value = "启用状态:0 、停用，1、启用", paramType = "query", dataTypeClass = Integer.class) @ApiImplicitParam(name = "isEnable", value = "启用状态:0 、停用，1、启用", paramType = "query", dataTypeClass = Integer.class)
}) })
@PreAuthorize("@ex.hasAuthority('packing:printModel:page')") //@PreAuthorize("@ex.hasAuthority('packing:printModel:page')")
public Result<PageData<PrintModelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){ public Result<PageData<PrintModelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<PrintModelDTO> page = printModelService.page(params); PageData<PrintModelDTO> page = printModelService.page(params);
return new Result<PageData<PrintModelDTO>>().ok(page); return new Result<PageData<PrintModelDTO>>().ok(page);
} }

4
ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java
View File

@ -159,8 +159,8 @@ public class TestController {
return R.ok(); return R.ok();
} }
// @PostMapping("/forImport") // @PostMapping("/forImportTest")
// public R forImport(@RequestBody WoCompensationPowerDTO dto) throws UnsupportedEncodingException, ParseException { // public R forImportTest(@RequestBody WoCompensationPowerDTO dto){
// System.out.println(dto.getRemark()); // System.out.println(dto.getRemark());
// //
// List<CamlineSubIdForImportDTO> alllCamlineSubForImp = service.getAlllCamlineSubForImp(dto.getRemark().split(",")); // List<CamlineSubIdForImportDTO> alllCamlineSubForImp = service.getAlllCamlineSubForImp(dto.getRemark().split(","));

1
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java
View File

@ -63,7 +63,6 @@ public class WoPackagingBoxController {
// @ApiImplicitParam(name = "printStatus", value = "打印状态：0、未打印，1、已打印", paramType = "query", dataTypeClass = Integer.class), // @ApiImplicitParam(name = "printStatus", value = "打印状态：0、未打印，1、已打印", paramType = "query", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "model", value = "模式，1-手动模式；2-自动模式", paramType = "query", dataTypeClass = Integer.class) @ApiImplicitParam(name = "model", value = "模式，1-手动模式；2-自动模式", paramType = "query", dataTypeClass = Integer.class)
}) })
@PreAuthorize("@ex.hasAuthority('packing:woPackagingBox:page')")
public Result<PageData<WoPackagingBoxDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){ public Result<PageData<WoPackagingBoxDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<WoPackagingBoxDTO> page = woPackagingBoxService.page(params); PageData<WoPackagingBoxDTO> page = woPackagingBoxService.page(params);