|
@@ -53,42 +53,6 @@ public class TLabelController {
|
|
|
if(StringUtils.isNotEmpty(label.getName())&&StringUtils.isNotEmpty(label.getType())&&label.getAdminId()!=null){
|
|
|
label.setCreateDate(new Date());
|
|
|
label.setModifyDate(new Date());
|
|
|
- List<String> ids = new ArrayList<>();
|
|
|
- if(label.getType().equals("0")){
|
|
|
- String adminNames = label.getAdminNames();
|
|
|
- if(StringUtils.isNotEmpty(adminNames)){
|
|
|
- List<String> adminNamelist = JSON.parseArray(adminNames, String.class);
|
|
|
- for(String username:adminNamelist){
|
|
|
- LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
|
|
|
- query.like(TAdmin::getUsername,username);
|
|
|
- List<TAdmin> list = adminService.list(query);
|
|
|
- TAdmin tAdmin = list.get(0);
|
|
|
- ids.add(String.valueOf(tAdmin.getId()));
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- if(label.getType().equals("1")){
|
|
|
- String equipmentNames = label.getEquipmentNames();
|
|
|
- if(StringUtils.isNotEmpty(equipmentNames)){
|
|
|
- List<String> equipmentNamelist = JSON.parseArray(equipmentNames, String.class);
|
|
|
- for(String name:equipmentNamelist){
|
|
|
- LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
|
|
|
- query.like(TEquipment::getName,name);
|
|
|
- List<TEquipment> list = equipmentService.list(query);
|
|
|
- TEquipment equipment = list.get(0);
|
|
|
- ids.add(String.valueOf(equipment.getId()));
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- if(ids.size()>0){
|
|
|
- if(label.getType().equals("0")){
|
|
|
- label.setAdminIds(ids.toString());
|
|
|
- }
|
|
|
- if(label.getType().equals("1")){
|
|
|
- label.setEquipmentIds(ids.toString());
|
|
|
- }
|
|
|
- }
|
|
|
labelService.save(label);
|
|
|
return R.ok();
|
|
|
}else {
|