return response.success(lsAdminService.getBaseData()); | return response.success(lsAdminService.getBaseData()); | ||||
} | } | ||||
/** | |||||
* 获取河长列表 | |||||
* | |||||
* @return | |||||
*/ | |||||
@PostMapping("/getDriverManagerList") | |||||
public Response getDriverManagerList() { | |||||
return lsAdminService.getDriverManagerList(); | |||||
} | |||||
} | } |
package com.taauav.admin.controller; | package com.taauav.admin.controller; | ||||
import com.taauav.admin.entity.SysLevel; | |||||
import com.taauav.admin.query.EquipmentQuery; | import com.taauav.admin.query.EquipmentQuery; | ||||
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.common.constant.PermissionConstants; | import com.taauav.common.constant.PermissionConstants; | ||||
return iTauvEquipmentService.add(tauvEquipment); | return iTauvEquipmentService.add(tauvEquipment); | ||||
} | } | ||||
/** | |||||
* 删除设备 | |||||
* | |||||
* @param id 设备ID | |||||
* @return | |||||
*/ | |||||
@PostMapping("/drop") | |||||
@RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION) | |||||
public Response drop(Integer id) { | |||||
return iTauvEquipmentService.drop(id); | |||||
} | |||||
/** | /** | ||||
* 设置状态 | * 设置状态 | ||||
* | * |
import com.taauav.admin.dto.TauvInspectDriverAssignTaskDTO; | import com.taauav.admin.dto.TauvInspectDriverAssignTaskDTO; | ||||
import com.taauav.admin.entity.TauvEquipment; | |||||
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.common.constant.PermissionConstants; | import com.taauav.common.constant.PermissionConstants; | ||||
import com.taauav.admin.entity.TauvInspect; | import com.taauav.admin.entity.TauvInspect; | ||||
result.put("typeList", tauvInspect.getTypeList()); | result.put("typeList", tauvInspect.getTypeList()); | ||||
//区域数组 | //区域数组 | ||||
//result.put("areaList",cityService.getCityListByPidAndAdmin(320100)); | //result.put("areaList",cityService.getCityListByPidAndAdmin(320100)); | ||||
result.put("areaList", cityService.getCityList(BigInteger.valueOf(Long.valueOf("320117")), true)); | |||||
//飞行小组 | |||||
result.put("areaList", cityService.getCityList(BigInteger.valueOf(Long.valueOf("320117")))); | |||||
// 飞手 | |||||
result.put("adminList", adminService.getAdminListByGroupId(6)); | result.put("adminList", adminService.getAdminListByGroupId(6)); | ||||
// 无人机设备类型 | |||||
result.put("equipmentTypeList", new TauvEquipment().getTypeList()); | |||||
return response.success("操作成功", result); | return response.success("操作成功", result); | ||||
} | } | ||||
*/ | */ | ||||
@PostMapping("/drop") | @PostMapping("/drop") | ||||
@RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION) | @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION) | ||||
public Response delete(Integer id) { | |||||
return tauvMountEquipmentService.delete(id); | |||||
public Response drop(Integer id) { | |||||
return tauvMountEquipmentService.drop(id); | |||||
} | } | ||||
/** | /** |
SysAdmin admin = ShiroUtils.getAdminInfo(); | SysAdmin admin = ShiroUtils.getAdminInfo(); | ||||
//区域数组 | //区域数组 | ||||
// result.put("areaList",cityService.getCityListByPidAndAdmin(320100)); | // result.put("areaList",cityService.getCityListByPidAndAdmin(320100)); | ||||
result.put("areaList", cityService.getCityList(BigInteger.valueOf(320117), true)); | |||||
result.put("areaList", cityService.getCityList(BigInteger.valueOf(320117))); | |||||
//状态数组 | //状态数组 | ||||
TauvReport report = new TauvReport(); | TauvReport report = new TauvReport(); | ||||
result.put("statusList", report.getStatusList()); | result.put("statusList", report.getStatusList()); |
*/ | */ | ||||
@NotEmpty(message = "河长不能为空") | @NotEmpty(message = "河长不能为空") | ||||
@Length(min = 2, max = 30, message = "河长长度为2-30个字") | @Length(min = 2, max = 30, message = "河长长度为2-30个字") | ||||
private String driverManager; | |||||
private Integer driverManager; | |||||
/** | /** | ||||
* 河道长度(单位:km) | * 河道长度(单位:km) |
/** | /** | ||||
* 任务类型:1可见光 2多光谱 | * 任务类型:1可见光 2多光谱 | ||||
*/ | */ | ||||
private Integer taskType; | |||||
private String taskType; | |||||
/** | /** | ||||
* 注册时间 | * 注册时间 | ||||
Map<Integer, String> map = new HashMap<>(); | Map<Integer, String> map = new HashMap<>(); | ||||
map.put(1, "多旋翼"); | map.put(1, "多旋翼"); | ||||
map.put(2, "固定翼"); | map.put(2, "固定翼"); | ||||
map.put(3, "垂直起降"); | |||||
return map; | return map; | ||||
} | } | ||||
*/ | */ | ||||
List<Integer> getAdminAuthData(Integer userId); | List<Integer> getAdminAuthData(Integer userId); | ||||
/** | |||||
* 获取河长列表 | |||||
* | |||||
* @return | |||||
*/ | |||||
Response getDriverManagerList(); | |||||
} | } |
* 获取城市列表 | * 获取城市列表 | ||||
* | * | ||||
* @param pid | * @param pid | ||||
* @param isTree 是否树结构 | |||||
* @return | * @return | ||||
*/ | */ | ||||
List<SysCity> getCityList(BigInteger pid, boolean isTree); | |||||
List<SysCity> getCityList(BigInteger pid); | |||||
/** | /** | ||||
* 根据父级编号和用户信息获取城市列表 | * 根据父级编号和用户信息获取城市列表 |
*/ | */ | ||||
Response getChildCityList(BigInteger pid); | Response getChildCityList(BigInteger pid); | ||||
// /** | |||||
// * 获取机构列表 | |||||
// * | |||||
// * @param pid 上级ID | |||||
// * @return | |||||
// */ | |||||
// List<TauvAgencyListVo> getAgencyList(BigInteger pid); | |||||
} | } |
*/ | */ | ||||
Response add(TauvEquipment equipment); | Response add(TauvEquipment equipment); | ||||
/** | |||||
* 根据id删除设备 | |||||
* | |||||
* @param id 设备ID | |||||
* @return | |||||
*/ | |||||
Response drop(Integer id); | |||||
/** | /** | ||||
* 修改设备状态 | * 修改设备状态 | ||||
* | * |
* @param id 设备ID | * @param id 设备ID | ||||
* @return | * @return | ||||
*/ | */ | ||||
Response delete(Integer id); | |||||
Response drop(Integer id); | |||||
/** | /** | ||||
* 设置状态 | * 设置状态 |
import com.taauav.admin.service.ILsAuthGroupService; | import com.taauav.admin.service.ILsAuthGroupService; | ||||
import com.taauav.admin.service.ISysCityService; | import com.taauav.admin.service.ISysCityService; | ||||
import com.taauav.admin.vo.LsAdminListVo; | import com.taauav.admin.vo.LsAdminListVo; | ||||
import com.taauav.admin.vo.LsDriverManagerListVo; | |||||
import com.taauav.common.bean.Response; | import com.taauav.common.bean.Response; | ||||
import com.taauav.common.service.impl.BaseServiceImpl; | import com.taauav.common.service.impl.BaseServiceImpl; | ||||
import com.taauav.common.util.FunctionUtils; | import com.taauav.common.util.FunctionUtils; | ||||
@Autowired | @Autowired | ||||
private LsAuthGroupMapper authGroupMapper; | private LsAuthGroupMapper authGroupMapper; | ||||
private QueryWrapper<LsAdmin> queryWrapper; | |||||
/** | /** | ||||
* 获取数据列表 | * 获取数据列表 | ||||
public Map<String, Object> getBaseData() { | public Map<String, Object> getBaseData() { | ||||
Map<String, Object> map = new HashMap<>(2); | Map<String, Object> map = new HashMap<>(2); | ||||
map.put("level_list", CommonConstant.LSADMIN_LEVEL_LIST); | map.put("level_list", CommonConstant.LSADMIN_LEVEL_LIST); | ||||
map.put("area_list", cityService.getCityList(BigInteger.valueOf(Long.valueOf("320117")), true)); | |||||
map.put("area_list", cityService.getCityList(BigInteger.valueOf(Long.valueOf("320117")))); | |||||
return map; | return map; | ||||
} | } | ||||
} | } | ||||
return authDataList; | return authDataList; | ||||
} | } | ||||
/** | |||||
* 获取河长列表 | |||||
* | |||||
* @return | |||||
*/ | |||||
@Override | |||||
public Response getDriverManagerList() { | |||||
// 查询条件 | |||||
QueryWrapper<LsAdmin> queryWrapper = new QueryWrapper<>(); | |||||
queryWrapper.eq("status", 1); | |||||
queryWrapper.eq("mark", 1); | |||||
queryWrapper.orderByAsc("sort"); | |||||
queryWrapper.select("id", "realname"); | |||||
// 查询数据 | |||||
List<LsAdmin> lsAdminList = lsAdminMapper.selectList(queryWrapper); | |||||
List<LsDriverManagerListVo> driverManagerListVoList = new ArrayList<>(); | |||||
if (!lsAdminList.isEmpty()) { | |||||
lsAdminList.forEach(item -> { | |||||
LsDriverManagerListVo driverManagerListVo = new LsDriverManagerListVo(); | |||||
// 拷贝属性 | |||||
BeanUtils.copyProperties(item, driverManagerListVo); | |||||
driverManagerListVoList.add(driverManagerListVo); | |||||
}); | |||||
} | |||||
return response.success(driverManagerListVoList); | |||||
} | |||||
} | } |
/** | /** | ||||
* 获取城市列表 | * 获取城市列表 | ||||
* | * | ||||
* @param pid 上级ID | |||||
* @param isTree 是否树结构 | |||||
* @param pid 上级ID | |||||
* @return | * @return | ||||
*/ | */ | ||||
@Override | @Override | ||||
public List<SysCity> getCityList(BigInteger pid, boolean isTree) { | |||||
public List<SysCity> getCityList(BigInteger pid) { | |||||
List<SysCity> cityList = new ArrayList<>(); | List<SysCity> cityList = new ArrayList<>(); | ||||
if (pid.toString().equals("320117")) { | if (pid.toString().equals("320117")) { | ||||
QueryWrapper<SysCity> queryWrapper2 = new QueryWrapper<>(); | QueryWrapper<SysCity> queryWrapper2 = new QueryWrapper<>(); | ||||
if (!list.isEmpty()) { | if (!list.isEmpty()) { | ||||
// 获取子级 | // 获取子级 | ||||
list.forEach(item -> { | list.forEach(item -> { | ||||
// 城市名称加层级修饰符 | |||||
if (isTree) { | |||||
item.setName("|--" + item.getName()); | |||||
} | |||||
cityList.add(item); | cityList.add(item); | ||||
List<SysCity> children = this.getCityList(BigInteger.valueOf(Long.valueOf(item.getId().toString())), isTree); | |||||
List<SysCity> children = this.getCityList(BigInteger.valueOf(Long.valueOf(item.getId().toString()))); | |||||
if (!children.isEmpty()) { | if (!children.isEmpty()) { | ||||
for (SysCity child : children) { | for (SysCity child : children) { | ||||
// 城市名称加层级修饰符 | |||||
if (isTree) { | |||||
child.setName("|--" + child.getName()); | |||||
} | |||||
cityList.add(child); | cityList.add(child); | ||||
} | } | ||||
} | } |
return response.success("设置成功"); | return response.success("设置成功"); | ||||
} | } | ||||
// /** | |||||
// * 获取机构列表 | |||||
// * | |||||
// * @param pid 上级ID | |||||
// * @return | |||||
// */ | |||||
// @Override | |||||
// public List<TauvAgencyListVo> getAgencyList(BigInteger pid) { | |||||
// // 查询条件 | |||||
// QueryWrapper<SysCity> queryWrapper = new QueryWrapper<>(); | |||||
// queryWrapper.eq("pid", pid); | |||||
// queryWrapper.eq("status", 1); | |||||
// queryWrapper.eq("mark", 1); | |||||
// queryWrapper.orderByAsc("sort"); | |||||
// | |||||
// // 查询数据 | |||||
// List<SysCity> tauvAgencyList = sysCityMapper.selectList(queryWrapper); | |||||
// List<TauvAgencyListVo> tauvAgencyListVoList = new ArrayList<>(); | |||||
// if (!tauvAgencyList.isEmpty()) { | |||||
// tauvAgencyList.forEach(item -> { | |||||
// TauvAgencyListVo tauvAgencyListVo = new TauvAgencyListVo(); | |||||
// // 拷贝属性 | |||||
// BeanUtils.copyProperties(item, tauvAgencyListVo); | |||||
// tauvAgencyListVoList.add(tauvAgencyListVo); | |||||
// // 获取子级机构 | |||||
// List<TauvAgencyListVo> children = getAgencyList(item.getId()); | |||||
// if (!children.isEmpty()) { | |||||
// children.forEach(subItem -> { | |||||
// subItem.setName("|--" + subItem.getName()); | |||||
// tauvAgencyListVoList.add(subItem); | |||||
// }); | |||||
// } | |||||
// }); | |||||
// } | |||||
// return tauvAgencyListVoList; | |||||
// } | |||||
} | } |
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ||||
import com.baomidou.mybatisplus.core.metadata.IPage; | import com.baomidou.mybatisplus.core.metadata.IPage; | ||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||||
import com.taauav.admin.entity.LsAdmin; | |||||
import com.taauav.admin.mapper.LsAdminMapper; | |||||
import com.taauav.admin.query.TauvDriverQuery; | import com.taauav.admin.query.TauvDriverQuery; | ||||
import com.taauav.admin.service.ISysCityService; | import com.taauav.admin.service.ISysCityService; | ||||
import com.taauav.admin.vo.TauvDriverListVo; | import com.taauav.admin.vo.TauvDriverListVo; | ||||
private TauvDriverMapper driverMapper; | private TauvDriverMapper driverMapper; | ||||
@Autowired | @Autowired | ||||
private ISysCityService cityService; | private ISysCityService cityService; | ||||
@Autowired | |||||
private LsAdminMapper lsAdminMapper; | |||||
/** | /** | ||||
* 获取河道列表 | * 获取河道列表 | ||||
// 区划名称 | // 区划名称 | ||||
String cityName = cityService.getCityName(item.getDriverArea()); | String cityName = cityService.getCityName(item.getDriverArea()); | ||||
driverListVo.setDriverAreaName(cityName); | driverListVo.setDriverAreaName(cityName); | ||||
// 河长名称 | |||||
LsAdmin lsAdmin = lsAdminMapper.selectById(item.getDriverManager()); | |||||
driverListVo.setDriverManagerName(lsAdmin.getRealname()); | |||||
driverListVoList.add(driverListVo); | driverListVoList.add(driverListVo); | ||||
}); | }); | ||||
} | } | ||||
TauvDriver driver = new TauvDriver(); | TauvDriver driver = new TauvDriver(); | ||||
Map<String, Object> map = new HashMap<>(3); | Map<String, Object> map = new HashMap<>(3); | ||||
map.put("type_list", driver.getTypeList()); | map.put("type_list", driver.getTypeList()); | ||||
map.put("area_list", cityService.getCityList(BigInteger.valueOf(Long.valueOf("320117")), true)); | |||||
map.put("area_list", cityService.getCityList(BigInteger.valueOf(Long.valueOf("320117")))); | |||||
map.put("level_list", driver.getLevelList()); | map.put("level_list", driver.getLevelList()); | ||||
return map; | return map; | ||||
} | } | ||||
// 区划描述 | // 区划描述 | ||||
String cityName = cityService.getCityName(item.getDriverArea()); | String cityName = cityService.getCityName(item.getDriverArea()); | ||||
driverListVo.setDriverAreaName(cityName); | driverListVo.setDriverAreaName(cityName); | ||||
// 河长名称 | |||||
LsAdmin lsAdmin = lsAdminMapper.selectById(item.getDriverManager()); | |||||
driverListVo.setDriverManagerName(lsAdmin.getRealname()); | |||||
driverListVoList.add(driverListVo); | driverListVoList.add(driverListVo); | ||||
}); | }); | ||||
} | } |
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ||||
import com.baomidou.mybatisplus.core.metadata.IPage; | import com.baomidou.mybatisplus.core.metadata.IPage; | ||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | ||||
import com.taauav.admin.entity.LsAuthGroup; | |||||
import com.taauav.admin.entity.SysAdmin; | import com.taauav.admin.entity.SysAdmin; | ||||
import com.taauav.admin.query.EquipmentQuery; | import com.taauav.admin.query.EquipmentQuery; | ||||
import com.taauav.admin.vo.TauvEquipmentListVo; | import com.taauav.admin.vo.TauvEquipmentListVo; | ||||
return response.success("操作成功"); | return response.success("操作成功"); | ||||
} | } | ||||
/** | |||||
* 删除设备 | |||||
* | |||||
* @param id 设备ID | |||||
* @return | |||||
*/ | |||||
@Override | |||||
public Response drop(Integer id) { | |||||
if (id == null || id <= 0) { | |||||
return response.failure("设备ID不存在"); | |||||
} | |||||
TauvEquipment entity = equipmentMapper.selectById(id); | |||||
if (entity == null) { | |||||
return response.failure("设备信息不存在"); | |||||
} | |||||
boolean result = this.deleteById(id, entity); | |||||
if (!result) { | |||||
return response.failure("删除失败"); | |||||
} | |||||
return response.success("删除成功"); | |||||
} | |||||
/** | /** | ||||
* 修改状态 | * 修改状态 | ||||
* | * | ||||
// 设备类型 | // 设备类型 | ||||
equipmentListVo.setTypeName(item.getTypeList().get(item.getType())); | equipmentListVo.setTypeName(item.getTypeList().get(item.getType())); | ||||
// 任务类型 | // 任务类型 | ||||
equipmentListVo.setTaskTypeName(item.getTaskTypeList().get(item.getTaskType())); | |||||
equipmentListVo.setTaskTypeName(this.getTaskTypeName(item.getTaskType())); | |||||
// 状态名称 | // 状态名称 | ||||
equipmentListVo.setStatusName(item.getStatusList().get(item.getStatus())); | equipmentListVo.setStatusName(item.getStatusList().get(item.getStatus())); | ||||
equipmentListVoList.add(equipmentListVo); | equipmentListVoList.add(equipmentListVo); | ||||
} | } | ||||
return stringList; | return stringList; | ||||
} | } | ||||
/** | |||||
* 根据任务类型ID获取任务名称 | |||||
* | |||||
* @param taskType 任务类型 | |||||
* @return | |||||
*/ | |||||
public String getTaskTypeName(String taskType) { | |||||
List<String> stringList = new ArrayList<>(); | |||||
String[] itemArr = taskType.split(","); | |||||
TauvEquipment equipment = new TauvEquipment(); | |||||
for (String s : itemArr) { | |||||
String typeStr = equipment.getTaskTypeList().get(Integer.valueOf(s)); | |||||
stringList.add(typeStr); | |||||
} | |||||
return org.apache.commons.lang3.StringUtils.join(stringList.toArray(), ","); | |||||
} | |||||
} | } |
* @return | * @return | ||||
*/ | */ | ||||
@Override | @Override | ||||
public Response delete(Integer id) { | |||||
public Response drop(Integer id) { | |||||
if (id == null || id <= 0) { | if (id == null || id <= 0) { | ||||
return response.failure("设备ID不存在"); | return response.failure("设备ID不存在"); | ||||
} | } |
package com.taauav.admin.vo; | |||||
import lombok.Data; | |||||
/** | |||||
* 河长列表Vo | |||||
*/ | |||||
@Data | |||||
public class LsDriverManagerListVo { | |||||
/** | |||||
* 河长ID | |||||
*/ | |||||
private Integer id; | |||||
/** | |||||
* 河长姓名 | |||||
*/ | |||||
private String realname; | |||||
} |
private Integer level; | private Integer level; | ||||
/** | /** | ||||
* 河长 | |||||
* 河长ID | |||||
*/ | */ | ||||
private String driverManager; | |||||
private Integer driverManager; | |||||
/** | |||||
* 河长名称 | |||||
*/ | |||||
private String driverManagerName; | |||||
/** | /** | ||||
* 河道长度(单位:km) | * 河道长度(单位:km) |
/** | /** | ||||
* 任务类型:1可见光 2多光谱 | * 任务类型:1可见光 2多光谱 | ||||
*/ | */ | ||||
private Integer taskType; | |||||
private String taskType; | |||||
/** | /** | ||||
* 任务类型描述 | * 任务类型描述 |
queryWrapper.eq("mark", 1); | queryWrapper.eq("mark", 1); | ||||
// 数据权限 | // 数据权限 | ||||
// List<Integer> authDataList = adminService.getAdminAuthData() | |||||
List<Integer> authDataList = adminService.getAdminAuthData(userId); | |||||
if (authDataList.contains(1)) { | |||||
// | |||||
} | |||||
// 查询数据 | // 查询数据 |