提交 4900822c authored 作者: zhoushaopan's avatar zhoushaopan

fix(维修模块,系统版本): 更新维修

更新了送修的500以及版本的控制
上级 543b6b14
...@@ -1658,6 +1658,10 @@ public class RepairController { ...@@ -1658,6 +1658,10 @@ public class RepairController {
// List<String> sendUnits = deviceRepairBillService.findByIds(sendRepairIds).stream().map(RepairBill::getSendUnit).distinct().collect(Collectors.toList()); // List<String> sendUnits = deviceRepairBillService.findByIds(sendRepairIds).stream().map(RepairBill::getSendUnit).distinct().collect(Collectors.toList());
//key为发起单位 //key为发起单位
Map<String, List<RepairBill>> listMap = deviceRepairBillService.findByIds(sendRepairIds).stream().collect(Collectors.groupingBy(RepairBill::getSendUnit)); Map<String, List<RepairBill>> listMap = deviceRepairBillService.findByIds(sendRepairIds).stream().collect(Collectors.groupingBy(RepairBill::getSendUnit));
if (!listMap.containsKey(unitName)){
List<WaitingRepairEquipmentVo> waitingRepairEquipments = new ArrayList<>();
return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), waitingRepairEquipments, repairTaskSelectVo.getPageable()));
}
List<RepairBill> repairBills = listMap.get(unitName); List<RepairBill> repairBills = listMap.get(unitName);
//拿到当前发起单位是自己的 维修id //拿到当前发起单位是自己的 维修id
List<Integer> ids = repairBills.stream().map(RepairBill::getId).collect(Collectors.toList()); List<Integer> ids = repairBills.stream().map(RepairBill::getId).collect(Collectors.toList());
......
...@@ -107,7 +107,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -107,7 +107,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.and() .and()
.authorizeRequests() .authorizeRequests()
.antMatchers("/file/llq/**").permitAll() .antMatchers("/file/llq/**").permitAll()
.antMatchers("/packageVersion/getVersion").permitAll()// .antMatchers("/packageVersion/getVersion","/equip/packageVersion/getVersion").permitAll()//
.antMatchers("/equip/file/llq/**").permitAll() .antMatchers("/equip/file/llq/**").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
// .withObjectPostProcessor(new ObjectPostProcessor<FilterSecurityInterceptor>() { // .withObjectPostProcessor(new ObjectPostProcessor<FilterSecurityInterceptor>() {
...@@ -125,7 +125,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -125,7 +125,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.permitAll() .permitAll()
.and() .and()
.logout() .logout()
.logoutUrl("/userLogout") .logoutUrl("/user/userLogout")
.logoutSuccessHandler(myLogoutHandler) .logoutSuccessHandler(myLogoutHandler)
.deleteCookies("JESSIONID") .deleteCookies("JESSIONID")
.and() .and()
......
package com.tykj.dev.device.zxing.controller; package com.tykj.dev.device.zxing.controller;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.zxing.entity.PackageVersion; import com.tykj.dev.device.zxing.entity.PackageVersion;
import com.tykj.dev.device.zxing.service.PackageVersionService; import com.tykj.dev.device.zxing.service.PackageVersionService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@Api(tags = "系统版本管理模块", description = "系统版本管理模块接口") @Api(tags = "系统版本管理模块", description = "系统版本管理模块接口")
@RequestMapping("/packageVersion") @RequestMapping("/packageVersion")
@AutoDocument
public class PackageVersionController { public class PackageVersionController {
@Autowired @Autowired
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论