drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -38,7 +38,7 @@ and id = #{param2.id} </if> <if test="param2.areaName != null and param2.areaName != ''"> and area_name = #{param2.areaName} and area_name like concat('%', #{param2.areaName}, '%') </if> <if test="param2.longitude != null and param2.longitude != ''"> and longitude = #{param2.longitude} @@ -68,16 +68,16 @@ and police_station_id = #{param2.policeStationId} </if> <if test="param2.flyTimeStart != null and param2.flyTimeStart != ''"> and fly_time_start = #{param2.flyTimeStart} and fly_time_start >= #{param2.flyTimeStart} </if> <if test="param2.flyTimeEnd != null and param2.flyTimeEnd != ''"> and fly_time_end = #{param2.flyTimeEnd} and fly_time_end <= #{param2.flyTimeEnd} </if> <if test="param2.flyDateStart != null and param2.flyDateStart != ''"> and fly_date_start = #{param2.flyDateStart} and fly_date_start >= #{param2.flyDateStart} </if> <if test="param2.flyDateEnd != null and param2.flyDateEnd != ''"> and fly_date_end = #{param2.flyDateEnd} and fly_date_end <= #{param2.flyDateEnd} </if> <if test="param2.areaCode != null and param2.areaCode != ''"> and area_code = #{param2.areaCode} @@ -99,9 +99,6 @@ </if> <if test="param2.status != null and param2.status != ''"> and status = #{param2.status} </if> <if test="param2.isDeleted != null and param2.isDeleted != ''"> and is_deleted = #{param2.isDeleted} </if> </where> </select> drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -34,7 +34,7 @@ and id = #{param2.id} </if> <if test="param2.sceneName != null and param2.sceneName != ''"> and scene_name = #{param2.sceneName} and scene_name like concat('%', #{param2.sceneName}, '%') </if> <if test="param2.sceneType != null and param2.sceneType != ''"> and scene_type = #{param2.sceneType} @@ -46,7 +46,7 @@ and latitude = #{param2.latitude} </if> <if test="param2.defenseLeader != null and param2.defenseLeader != ''"> and defense_leader = #{param2.defenseLeader} and defense_leader like concat('%', #{param2.defenseLeader}, '%') </if> <if test="param2.leaderPhone != null and param2.leaderPhone != ''"> and leader_phone = #{param2.leaderPhone} @@ -83,9 +83,6 @@ </if> <if test="param2.status != null and param2.status != ''"> and status = #{param2.status} </if> <if test="param2.isDeleted != null and param2.isDeleted != ''"> and is_deleted = #{param2.isDeleted} </if> </where> </select> drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
@@ -30,7 +30,7 @@ and id = #{param2.id} </if> <if test="param2.zoneName != null and param2.zoneName != ''"> and zone_name = #{param2.zoneName} and zone_name like concat('%', #{param2.zoneName}, '%') </if> <if test="param2.zoneArea != null and param2.zoneArea != ''"> and zone_area = #{param2.zoneArea} @@ -67,9 +67,6 @@ </if> <if test="param2.status != null and param2.status != ''"> and status = #{param2.status} </if> <if test="param2.isDeleted != null and param2.isDeleted != ''"> and is_deleted = #{param2.isDeleted} </if> </where> </select> drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwPoliceStationMapper.xml
@@ -30,10 +30,10 @@ and id = #{param2.id} </if> <if test="param2.stationName != null and param2.stationName != ''"> and station_name = #{param2.stationName} and station_name like concat('%', #{param2.stationName}, '%') </if> <if test="param2.address != null and param2.address != ''"> and address = #{param2.address} and address like concat('%', #{param2.address}, '%') </if> <if test="param2.longitude != null and param2.longitude != ''"> and longitude = #{param2.longitude} @@ -42,7 +42,7 @@ and latitude = #{param2.latitude} </if> <if test="param2.contactPerson != null and param2.contactPerson != ''"> and contact_person = #{param2.contactPerson} and contact_person like concat('%', #{param2.contactPerson}, '%') </if> <if test="param2.contactPhone != null and param2.contactPhone != ''"> and contact_phone = #{param2.contactPhone} @@ -67,9 +67,6 @@ </if> <if test="param2.status != null and param2.status != ''"> and status = #{param2.status} </if> <if test="param2.isDeleted != null and param2.isDeleted != ''"> and is_deleted = #{param2.isDeleted} </if> </where> </select> drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
@@ -16,6 +16,8 @@ */ package org.sxkj.fw.area.service.impl; import org.springblade.core.secure.utils.AuthUtil; import org.sxkj.common.utils.HeaderUtils; import org.sxkj.fw.area.entity.FwAreaDivideEntity; import org.sxkj.fw.area.vo.FwAreaDivideVO; import org.sxkj.fw.area.excel.FwAreaDivideExcel; @@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; import java.util.Date; /** * 区域划分表 服务实现类 @@ -51,4 +54,44 @@ return fwAreaDivideList; } @Override public boolean save(FwAreaDivideEntity fwAreaDivide) { fillCreateFields(fwAreaDivide); return super.save(fwAreaDivide); } @Override public boolean updateById(FwAreaDivideEntity fwAreaDivide) { fillUpdateFields(fwAreaDivide); return super.updateById(fwAreaDivide); } @Override public boolean saveOrUpdate(FwAreaDivideEntity fwAreaDivide) { if (fwAreaDivide.getId() == null) { fillCreateFields(fwAreaDivide); } else { fillUpdateFields(fwAreaDivide); } return super.saveOrUpdate(fwAreaDivide); } private void fillCreateFields(FwAreaDivideEntity fwAreaDivide) { Long userId = AuthUtil.getUserId(); Long deptId = Long.valueOf(AuthUtil.getDeptId()); String areaCode = HeaderUtils.getAreaCode(); Date now = new Date(); fwAreaDivide.setCreateUser(userId); fwAreaDivide.setUpdateUser(userId); fwAreaDivide.setCreateDept(deptId); fwAreaDivide.setAreaCode(areaCode); fwAreaDivide.setCreateTime(now); fwAreaDivide.setUpdateTime(now); } private void fillUpdateFields(FwAreaDivideEntity fwAreaDivide) { fwAreaDivide.setUpdateUser(AuthUtil.getUserId()); fwAreaDivide.setUpdateTime(new Date()); } } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
@@ -16,6 +16,8 @@ */ package org.sxkj.fw.area.service.impl; import org.springblade.core.secure.utils.AuthUtil; import org.sxkj.common.utils.HeaderUtils; import org.sxkj.fw.area.entity.FwDefenseSceneEntity; import org.sxkj.fw.area.vo.FwDefenseSceneVO; import org.sxkj.fw.area.excel.FwDefenseSceneExcel; @@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; import java.util.Date; /** * 防控场景表 服务实现类 @@ -51,4 +54,44 @@ return fwDefenseSceneList; } @Override public boolean save(FwDefenseSceneEntity fwDefenseScene) { fillCreateFields(fwDefenseScene); return super.save(fwDefenseScene); } @Override public boolean updateById(FwDefenseSceneEntity fwDefenseScene) { fillUpdateFields(fwDefenseScene); return super.updateById(fwDefenseScene); } @Override public boolean saveOrUpdate(FwDefenseSceneEntity fwDefenseScene) { if (fwDefenseScene.getId() == null) { fillCreateFields(fwDefenseScene); } else { fillUpdateFields(fwDefenseScene); } return super.saveOrUpdate(fwDefenseScene); } private void fillCreateFields(FwDefenseSceneEntity fwDefenseScene) { Long userId = AuthUtil.getUserId(); Long deptId = Long.valueOf(AuthUtil.getDeptId()); String areaCode = HeaderUtils.getAreaCode(); Date now = new Date(); fwDefenseScene.setCreateUser(userId); fwDefenseScene.setUpdateUser(userId); fwDefenseScene.setCreateDept(deptId); fwDefenseScene.setAreaCode(areaCode); fwDefenseScene.setCreateTime(now); fwDefenseScene.setUpdateTime(now); } private void fillUpdateFields(FwDefenseSceneEntity fwDefenseScene) { fwDefenseScene.setUpdateUser(AuthUtil.getUserId()); fwDefenseScene.setUpdateTime(new Date()); } } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseZoneServiceImpl.java
@@ -16,6 +16,8 @@ */ package org.sxkj.fw.area.service.impl; import org.springblade.core.secure.utils.AuthUtil; import org.sxkj.common.utils.HeaderUtils; import org.sxkj.fw.area.entity.FwDefenseZoneEntity; import org.sxkj.fw.area.vo.FwDefenseZoneVO; import org.sxkj.fw.area.excel.FwDefenseZoneExcel; @@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; import java.util.Date; /** * 防区管理表 服务实现类 @@ -51,4 +54,44 @@ return fwDefenseZoneList; } @Override public boolean save(FwDefenseZoneEntity fwDefenseZone) { fillCreateFields(fwDefenseZone); return super.save(fwDefenseZone); } @Override public boolean updateById(FwDefenseZoneEntity fwDefenseZone) { fillUpdateFields(fwDefenseZone); return super.updateById(fwDefenseZone); } @Override public boolean saveOrUpdate(FwDefenseZoneEntity fwDefenseZone) { if (fwDefenseZone.getId() == null) { fillCreateFields(fwDefenseZone); } else { fillUpdateFields(fwDefenseZone); } return super.saveOrUpdate(fwDefenseZone); } private void fillCreateFields(FwDefenseZoneEntity fwDefenseZone) { Long userId = AuthUtil.getUserId(); Long deptId = Long.valueOf(AuthUtil.getDeptId()); String areaCode = HeaderUtils.getAreaCode(); Date now = new Date(); fwDefenseZone.setCreateUser(userId); fwDefenseZone.setUpdateUser(userId); fwDefenseZone.setCreateDept(deptId); fwDefenseZone.setAreaCode(areaCode); fwDefenseZone.setCreateTime(now); fwDefenseZone.setUpdateTime(now); } private void fillUpdateFields(FwDefenseZoneEntity fwDefenseZone) { fwDefenseZone.setUpdateUser(AuthUtil.getUserId()); fwDefenseZone.setUpdateTime(new Date()); } } drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java
@@ -16,6 +16,8 @@ */ package org.sxkj.fw.area.service.impl; import org.springblade.core.secure.utils.AuthUtil; import org.sxkj.common.utils.HeaderUtils; import org.sxkj.fw.area.entity.FwPoliceStationEntity; import org.sxkj.fw.area.vo.FwPoliceStationVO; import org.sxkj.fw.area.excel.FwPoliceStationExcel; @@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; import java.util.Date; /** * 派出所信息表 服务实现类 @@ -51,4 +54,44 @@ return fwPoliceStationList; } @Override public boolean save(FwPoliceStationEntity fwPoliceStation) { fillCreateFields(fwPoliceStation); return super.save(fwPoliceStation); } @Override public boolean updateById(FwPoliceStationEntity fwPoliceStation) { fillUpdateFields(fwPoliceStation); return super.updateById(fwPoliceStation); } @Override public boolean saveOrUpdate(FwPoliceStationEntity fwPoliceStation) { if (fwPoliceStation.getId() == null) { fillCreateFields(fwPoliceStation); } else { fillUpdateFields(fwPoliceStation); } return super.saveOrUpdate(fwPoliceStation); } private void fillCreateFields(FwPoliceStationEntity fwPoliceStation) { Long userId = AuthUtil.getUserId(); Long deptId = Long.valueOf(AuthUtil.getDeptId()); String areaCode = HeaderUtils.getAreaCode(); Date now = new Date(); fwPoliceStation.setCreateUser(userId); fwPoliceStation.setUpdateUser(userId); fwPoliceStation.setCreateDept(deptId); fwPoliceStation.setAreaCode(areaCode); fwPoliceStation.setCreateTime(now); fwPoliceStation.setUpdateTime(now); } private void fillUpdateFields(FwPoliceStationEntity fwPoliceStation) { fwPoliceStation.setUpdateUser(AuthUtil.getUserId()); fwPoliceStation.setUpdateTime(new Date()); } }