diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirplaneController.java b/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirplaneController.java index 101f05c..555527f 100644 --- a/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirplaneController.java +++ b/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirplaneController.java @@ -100,7 +100,7 @@ public class AirplaneController extends BaseController { LoginUser securityUser = SecurityUtils.getLoginUser(); airplaneApply.setCreateBy(SecurityUtils.getUsername()); airplaneApply.setDeptId(securityUser.getDeptId()); - if (airplaneApply.getSts().isEmpty()){ + if (airplaneApply.getSts()==null){ airplaneApply.setSts("0"); } airplaneService.insertAirplaneApply(airplaneApply); diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApply.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApply.java index f41acce..75e9bb4 100644 --- a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApply.java +++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApply.java @@ -23,6 +23,7 @@ public class AirplaneApply extends BaseEntity { */ @Excel(name = "飞行申报名称") private String name; + private String deptName; /** * 申请状态码 diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirplaneImpl.java b/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirplaneImpl.java index 2e420bc..7192f32 100644 --- a/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirplaneImpl.java +++ b/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirplaneImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONObject; import com.djhk.common.core.domain.entity.SysDept; import com.djhk.common.core.domain.entity.SysDictData; import com.djhk.common.core.domain.entity.SysUser; +import com.djhk.common.exception.UtilException; import com.djhk.common.utils.DictUtils; import com.djhk.common.utils.SecurityUtils; import com.djhk.common.utils.StringUtils; @@ -127,7 +128,9 @@ public class AirplaneImpl implements AirplaneService { List airplaneApplyOperators = airplaneOperatorMapper.selectAirplaneOperatorApplyList(id); for (int i = 0; i < airplaneApplyOperators.size(); i++) { UavOperator uavOperator = uavOperatorService.selectUavOperatorById(airplaneApplyOperators.get(i).getOperatorId()); - uavOperators.add(uavOperator.getUserName()); + if (uavOperator!=null && uavOperator.getUserName()!=null){ + uavOperators.add(uavOperator.getUserName()); + } } airplaneApply.setUavOperatorName(uavOperators); // 根据飞行申请查询该飞行申请的关联空域 @@ -135,7 +138,9 @@ public class AirplaneImpl implements AirplaneService { List airplaneApplyAirspaces = airspaceMapper.selectAirplaneAirspaceApplyList(id); for (int i = 0; i < airplaneApplyAirspaces.size(); i++) { AirspaceApply airspaceApply = airspaceService.selectAirspaceApplyById(airplaneApplyAirspaces.get(i).getAirspaceId()); - airspaces.add(airspaceApply.getName()); + if (airspaceApply!=null && airspaceApply.getName()!=null){ + airspaces.add(airspaceApply.getName()); + } } airplaneApply.setAirspaceName(airspaces); return airplaneApply; @@ -311,14 +316,15 @@ public class AirplaneImpl implements AirplaneService { } } - } - dataMap.put("airspace",rad); + dataMap.put("airspace",rad); + + // 计划时间 + // 计划起飞时间 + apply.getFlyTime(); + dataMap.put("time","开始时间:"+planBeg.get(0).toString()+",结束时间:"+planEnd.get(0).toString()); + dataMap.put("height","0~~~"+heightMax.get(0)+"米"); + } - // 计划时间 - // 计划起飞时间 - apply.getFlyTime(); - dataMap.put("time","开始时间:"+planBeg.get(0).toString()+",结束时间:"+planEnd.get(0).toString()); - dataMap.put("height","0~~~"+heightMax.get(0)+"米"); new ExportWord("UTF-8").exportDoc(response, "申请空域", "airspaceApply.ftl", dataMap, freeMarkerConfigurer); @@ -470,13 +476,13 @@ public class AirplaneImpl implements AirplaneService { UavOperator uavOperator = new UavOperator(); // SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData(); // Long deptId = sysUser.getDeptId(); - Long deptId = SecurityUtils.getDeptId(); - uavOperator.setDeptId(deptId); +// Long deptId = SecurityUtils.getDeptId(); +// uavOperator.setDeptId(deptId); uavOperator.setUserName(uavOperatorName); List list = uavOperatorService.selectUavOperatorList(uavOperator); AirplaneApplyOperator airplaneApplyOperator = new AirplaneApplyOperator(); airplaneApplyOperator.setAirplaneApplyId(maxId); - airplaneApplyOperator.setOperatorId(list.get(0).getId()); + airplaneApplyOperator.setOperatorId(list.get(0).getUserId()); airplaneOperatorMapper.insertAirplaneOperatorApply(airplaneApplyOperator); } // 根据飞行申请新增该飞行申请的关联空域主键 @@ -530,6 +536,9 @@ public class AirplaneImpl implements AirplaneService { // airplaneApplyAirplane.setAirplaneApplyId(airplaneApply.getId()); // airplaneApplyAirplane.setAirplaneId(euqId); // airplaneFlyMapper.insertAirplaneFlyApply(airplaneApplyAirplane); +// } +// if (airplaneApply.getAirUAV()==null || airplaneApply.getUavOperatorName()==null || airplaneApply.getAirspaceName()==null){ +// throw new UtilException("重要参数缺失，请检查参数"); // } for (String equCode : airplaneApply.getAirUAV()) { EquInfoEntity equInfoEntity = new EquInfoEntity(); @@ -565,7 +574,7 @@ public class AirplaneImpl implements AirplaneService { List list = uavOperatorService.selectUavOperatorList(uavOperator); AirplaneApplyOperator airplaneApplyOperator = new AirplaneApplyOperator(); airplaneApplyOperator.setAirplaneApplyId(airplaneApply.getId()); - airplaneApplyOperator.setOperatorId(list.get(0).getId()); + airplaneApplyOperator.setOperatorId(list.get(0).getUserId()); airplaneOperatorMapper.insertAirplaneOperatorApply(airplaneApplyOperator); } // 根据飞行申请新增该飞行申请的关联空域主键 diff --git a/djhk-system/src/main/java/com/djhk/uav/uav/service/impl/UavOperatorServiceImpl.java b/djhk-system/src/main/java/com/djhk/uav/uav/service/impl/UavOperatorServiceImpl.java index 53e0556..b273be1 100644 --- a/djhk-system/src/main/java/com/djhk/uav/uav/service/impl/UavOperatorServiceImpl.java +++ b/djhk-system/src/main/java/com/djhk/uav/uav/service/impl/UavOperatorServiceImpl.java @@ -75,7 +75,7 @@ public class UavOperatorServiceImpl extends ServiceImpl idList = new ArrayList<>(); - if(StringUtils.isNotEmpty(uavOperator.getCertificateFileId())){ + if(uavOperator != null && StringUtils.isNotEmpty(uavOperator.getCertificateFileId())){ idList.add(Long.parseLong(uavOperator.getCertificateFileId())); } // if(CollUtil.isNotEmpty(idList)){ diff --git a/djhk-system/src/main/resources/templete/airspaceApply.ftl b/djhk-system/src/main/resources/templete/airspaceApply.ftl new file mode 100644 index 0000000..a4ec8a8 --- /dev/null +++ b/djhk-system/src/main/resources/templete/airspaceApply.ftl @@ -0,0 +1,227 @@ + + + + + 彭勇 + 赤心木 + 2025-02-25T08:06:00Z + 2025-02-28T03:14:42Z + + + 431AE1BB5BC44555977CB683C38B7804_13 + 2052-12.1.0.20305 + + + 28800 + 14080 + False + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 编号〔2025〕XX号 + + + + + 警用无人机飞行活动申请表 + + + 单位名称 + ${(deptName)!} + 任务性质 + ${(taskProp)!} + + + 起止时间 + ${(time)!} + + + 飞行高度/ 间隔标准 + ${(height)!} + 飞行模式 + ${(model)!} + + + 是否安装雷达 二次应答机 + ${(leida)!} + 是否具备空域保持和被监视能力 + ${(protect)!} + + + + 操控员（姓名及联系方式） + ${(operator)!} + + + + 警用无人机(型号及序列号) + ${(uav)!} + + + + 空域范围 + ${(airspace)!} + + + + + + + + +
+ + +
+