From 93f0226c8e485fbeb2200ccf2f32278bbf86d4d0 Mon Sep 17 00:00:00 2001 From: zhulongchuan <1624729110@qq.com> Date: Mon, 15 Sep 2025 18:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../djhk/uav/airspace/domain/UavOperator.java | 2 +- .../airspace/service/impl/AirplaneImpl.java | 4 +- .../uav/controller/UavOperatorController.java | 20 +++---- .../service/impl/UavOperatorServiceImpl.java | 57 ++++--------------- .../mapper/uav/UavOperatorMapper.xml | 53 +++++++++-------- 5 files changed, 51 insertions(+), 85 deletions(-) diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavOperator.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavOperator.java index c465a2f..df82b5d 100644 --- a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavOperator.java +++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavOperator.java @@ -116,7 +116,7 @@ public class UavOperator extends BaseEntity private String appId; /** 组织id */ - private Long orgId; + private Long deptId; /** 圖片url */ private String picUrl; 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 01ace63..2e420bc 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 @@ -471,7 +471,7 @@ public class AirplaneImpl implements AirplaneService { // SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData(); // Long deptId = sysUser.getDeptId(); Long deptId = SecurityUtils.getDeptId(); - uavOperator.setOrgId(deptId); + uavOperator.setDeptId(deptId); uavOperator.setUserName(uavOperatorName); List list = uavOperatorService.selectUavOperatorList(uavOperator); AirplaneApplyOperator airplaneApplyOperator = new AirplaneApplyOperator(); @@ -560,7 +560,7 @@ public class AirplaneImpl implements AirplaneService { // SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData(); // Long deptId = sysUser.getDeptId(); Long deptId = SecurityUtils.getDeptId(); - uavOperator.setOrgId(deptId); + uavOperator.setDeptId(deptId); uavOperator.setUserName(uavOperatorName); List list = uavOperatorService.selectUavOperatorList(uavOperator); AirplaneApplyOperator airplaneApplyOperator = new AirplaneApplyOperator(); diff --git a/djhk-system/src/main/java/com/djhk/uav/uav/controller/UavOperatorController.java b/djhk-system/src/main/java/com/djhk/uav/uav/controller/UavOperatorController.java index 00be35c..d8ec517 100644 --- a/djhk-system/src/main/java/com/djhk/uav/uav/controller/UavOperatorController.java +++ b/djhk-system/src/main/java/com/djhk/uav/uav/controller/UavOperatorController.java @@ -42,8 +42,8 @@ public class UavOperatorController extends BaseController { SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId()); Long deptId = sysUser.getDeptId(); - if (uavOperator.getOrgId() == null){ - uavOperator.setOrgId(deptId); + if (uavOperator.getDeptId() == null){ + uavOperator.setDeptId(deptId); } startPage(); List list = uavOperatorService.selectUavOperatorList(uavOperator); @@ -78,13 +78,13 @@ public class UavOperatorController extends BaseController * 导出飞手管理列表 */ // @RequiresPermissions("uav:operator:export") - @Log(title = "飞手管理", businessType = BusinessType.EXPORT) +// @Log(title = "飞手管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UavOperator uavOperator) { SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId()); Long deptId = sysUser.getDeptId(); - uavOperator.setOrgId(deptId); + uavOperator.setDeptId(deptId); List list = uavOperatorService.selectUavOperatorList(uavOperator); ExcelUtil util = new ExcelUtil(UavOperator.class); util.exportExcel(response, list, "飞手数据"); @@ -104,14 +104,14 @@ public class UavOperatorController extends BaseController * 新增飞手管理 */ // @RequiresPermissions("uav:operator:add") - @Log(title = "飞手管理", businessType = BusinessType.INSERT) +// @Log(title = "飞手管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody UavOperator uavOperator) { - SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId()); + SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId()); Long deptId = sysUser.getDeptId(); - if(null == uavOperator.getOrgId()){ - uavOperator.setOrgId(deptId); + if(null == uavOperator.getDeptId()){ + uavOperator.setDeptId(deptId); } int result = uavOperatorService.insertUavOperator(uavOperator); if(result == 1){ @@ -125,7 +125,7 @@ public class UavOperatorController extends BaseController * 修改飞手管理 */ // @RequiresPermissions("uav:operator:edit") - @Log(title = "飞手管理", businessType = BusinessType.UPDATE) +// @Log(title = "飞手管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody UavOperator uavOperator) { @@ -141,7 +141,7 @@ public class UavOperatorController extends BaseController * 删除飞手管理 */ // @RequiresPermissions("uav:operator:remove") - @Log(title = "飞手管理", businessType = BusinessType.DELETE) +// @Log(title = "飞手管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { 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 ed8db99..53e0556 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 @@ -67,12 +67,12 @@ public class UavOperatorServiceImpl extends ServiceImpl operatorAbilityList = uavOperator.getOperatorAbilityList(); - List abilityNameList = new ArrayList<>(); - operatorAbilityList.forEach(x -> { - abilityNameList.add(x.getAbilityName()); - }); - uavOperator.setAbilityNameList(abilityNameList); +// List operatorAbilityList = uavOperator.getOperatorAbilityList(); +// List abilityNameList = new ArrayList<>(); +// operatorAbilityList.forEach(x -> { +// abilityNameList.add(x.getAbilityName()); +// }); +// uavOperator.setAbilityNameList(abilityNameList); List idList = new ArrayList<>(); if(StringUtils.isNotEmpty(uavOperator.getCertificateFileId())){ @@ -99,12 +99,12 @@ public class UavOperatorServiceImpl extends ServiceImpl operatorAbilityList = uavOperator.getOperatorAbilityList(); - List abilityNameList = new ArrayList<>(); - operatorAbilityList.forEach(x -> { - abilityNameList.add(x.getAbilityName()); - }); - uavOperator.setAbilityNameList(abilityNameList); +// List operatorAbilityList = uavOperator.getOperatorAbilityList(); +// List abilityNameList = new ArrayList<>(); +// operatorAbilityList.forEach(x -> { +// abilityNameList.add(x.getAbilityName()); +// }); +// uavOperator.setAbilityNameList(abilityNameList); // List idList = new ArrayList<>(); // if(StringUtils.isNotEmpty(uavOperator.getCertificateFileId())){ @@ -198,39 +198,6 @@ public class UavOperatorServiceImpl extends ServiceImpl operatorList = new ArrayList<>(); -// if(!operator.getUserId().equals(uavOperator.getUserId())){ -// QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.eq("user_id",uavOperator.getUserId()); -// wrapper.eq("del_flag","0"); -// operatorList = uavOperatorMapper.selectList(wrapper); -// } -// if(operatorList.size() > 0){ -// return -1; -// } - Long uavOperatorId = uavOperator.getId(); - UpdateWrapper abilityUpdateWrapper = new UpdateWrapper<>(); - UavOperatorAbility operatorAbility = new UavOperatorAbility(); - abilityUpdateWrapper.eq("uav_operator_id",uavOperatorId); - operatorAbility.setDelFlag("2"); - uavOperatorAbilityService.update(operatorAbility,abilityUpdateWrapper); - //新增飞手特长表 - String abilityName = uavOperator.getAbilityName(); - if(StringUtils.isNotEmpty(abilityName)){ - String[] abilityNameArray = abilityName.trim().split(","); - List abilityList = new ArrayList<>(); - for(int i = 0;i < abilityNameArray.length; i++){ - UavOperatorAbility ability = new UavOperatorAbility(); - ability.setUavOperatorId(uavOperatorId); - ability.setAbilityName(abilityNameArray[i]); - ability.setCreateBy(SecurityUtils.getUsername()); - ability.setCreateTime(DateUtils.getNowDate()); - ability.setDelFlag("0"); - abilityList.add(ability); - } - uavOperatorAbilityService.insertUavOperatorAbilityList(abilityList); - } uavOperator.setUpdateTime(DateUtils.getNowDate()); uavOperator.setUpdateBy(SecurityUtils.getUsername()); return uavOperatorMapper.updateUavOperator(uavOperator); diff --git a/djhk-system/src/main/resources/mapper/uav/UavOperatorMapper.xml b/djhk-system/src/main/resources/mapper/uav/UavOperatorMapper.xml index c051900..1b3d381 100644 --- a/djhk-system/src/main/resources/mapper/uav/UavOperatorMapper.xml +++ b/djhk-system/src/main/resources/mapper/uav/UavOperatorMapper.xml @@ -29,7 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + @@ -43,14 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, pic_url, celebrate_date, user_id, user_name, police_no, police_type, tel,status, email, del_flag,sex, operator_type, certificate_type, certificate_name, certificate_no, certificate_file_id, scene_type, scene_name , create_by, - create_time, update_by, update_time, remark, plan_time, app_id, org_id + create_time, update_by, update_time, remark, plan_time, app_id, dept_id from uav_operator - + @@ -68,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + @@ -78,8 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select o.id, o.pic_url, o.job_type, o.celebrate_date, o.user_id, o.user_name, o.police_no, o.police_type,o.tel,o.status, o.email,o.sex, o.operator_type, o.certificate_type, o.certificate_name, o.certificate_no, o.certificate_file_id, o.scene_type, o.scene_name , o.create_by, - o.create_time, o.update_by, o.update_time, o.remark, plan_time, o.app_id, o.org_id + o.create_time, o.update_by, o.update_time, o.remark, plan_time, o.app_id, o.dept_id from uav_operator o and o.del_flag = "0" @@ -127,9 +128,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select o.id, o.job_type, o.celebrate_date, user_id, user_name,tel,o.status, email,sex, operator_type, certificate_type, certificate_name, certificate_no, certificate_file_id, scene_type, scene_name , o.create_by, - o.create_time, o.update_by, o.update_time, o.remark, plan_time, o.app_id, o.org_id + o.create_time, o.update_by, o.update_time, o.remark, plan_time, o.app_id, o.dept_id from uav_operator o and o.del_flag = "0" @@ -159,9 +160,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND o.user_name like concat('%',#{userName},'%') - - and org_id in - + + and dept_id in + #{item} @@ -199,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" scene_type, scene_name, app_id, - org_id, + dept_id, pic_url, celebrate_date, job_type, @@ -228,7 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sceneType}, #{sceneName}, #{appId}, - #{orgId}, + #{deptId}, #{picUrl}, #{celebrateDate}, #{jobType}, @@ -248,8 +249,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, - delete_by = #{deleteBy}, - delete_time = #{deleteTime}, remark = #{remark}, plan_time = #{planTime}, status = #{status}, @@ -263,20 +262,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" scene_type = #{sceneType}, scene_name = #{sceneName}, app_id = #{appId}, - org_id = #{orgId}, + dept_id = #{deptId}, pic_url = #{picUrl}, celebrate_date = #{celebrateDate}, job_type = #{jobType}, - where id = #{id} + where user_id = #{userId} - delete from uav_operator where id = #{id} + delete from uav_operator where user_id = #{id} - delete from uav_operator where id in + delete from uav_operator where user_id in #{id}