From bf465beb883aaa88e452b04f13a18f50f40b1354 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 14 十一月 2022 13:53:47 +0800
Subject: [PATCH] 卡口管理调整
---
ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java | 3
ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java | 14 ++-
ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java | 2
ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java | 36 --------
ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java | 11 --
ycl-platform/src/main/java/com/ycl/vo/video/VideoPointVO.java | 95 +++++++++++++++++++++++
ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml | 26 ++++++
7 files changed, 139 insertions(+), 48 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index 28d34b3..f2499b2 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -1,15 +1,11 @@
package com.ycl.controller.epuipment;
-import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
-import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.equipment.EquipmentBayonet;
-import com.ycl.entity.region.SccgRegion;
import com.ycl.service.dict.IDataDictionaryService;
import com.ycl.service.equipment.IEquipmentBayonetService;
import com.ycl.service.region.ISccgRegionService;
@@ -18,15 +14,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.stream.Collectors;
/**
* <p>
@@ -57,19 +48,7 @@
Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
equipmentBayonetPage.setCurrent(current);
equipmentBayonetPage.setSize(size);
- return CommonResult.success(iEquipmentBayonetService
- .page(equipmentBayonetPage, new LambdaQueryWrapper<EquipmentBayonet>()
- .like(StringUtils.isNotBlank(bayonetName), EquipmentBayonet::getBayonetName, bayonetName))
- .getRecords()
- .stream()
- .map(item -> {
- EquipmentBayonetVO equipmentBayonetVO = new EquipmentBayonetVO();
- BeanUtils.copyProperties(item, equipmentBayonetVO);
- equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
- equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
- equipmentBayonetVO.setBelongArea(iSccgRegionService.getOne(new LambdaQueryWrapper<SccgRegion>().eq(SccgRegion::getId,item.getBelongArea())).getRegionName());
- return equipmentBayonetVO;
- }).collect(Collectors.toList()));
+ return CommonResult.success(iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName));
}
@PostMapping("/addition")
@@ -97,17 +76,6 @@
Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
equipmentBayonetPage.setCurrent(current);
equipmentBayonetPage.setSize(size);
- EasyExcelUtils.export(response,"鏁版嵁",EquipmentBayonetVO.class,iEquipmentBayonetService
- .page(equipmentBayonetPage, new LambdaQueryWrapper<EquipmentBayonet>()
- .like(StringUtils.isNotBlank(bayonetName), EquipmentBayonet::getBayonetName, bayonetName))
- .getRecords()
- .stream()
- .map(item -> {
- EquipmentBayonetVO equipmentBayonetVO = new EquipmentBayonetVO();
- BeanUtils.copyProperties(item, equipmentBayonetVO);
- equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
- equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
- return equipmentBayonetVO;
- }).collect(Collectors.toList()));
+ EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName).getRecords());
}
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
index fdc6221..b12ccc8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
@@ -1,7 +1,6 @@
package com.ycl.controller.video;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
@@ -34,13 +33,9 @@
@RequestParam Long current,
@RequestParam(required = false) Integer streetId,
@RequestParam(required = false) Integer communityId) {
- Page page = new Page<VideoPoint>()
- .setSize(size)
- .setCurrent(current);
- return CommonResult.success(iVideoPointService.page(page, new LambdaQueryWrapper<VideoPoint>()
- .eq(streetId != null, VideoPoint::getStreetId, streetId)
- .eq(communityId != null, VideoPoint::getCommunityId, communityId)));
+ return CommonResult.success(iVideoPointService.getList(streetId,communityId, current.intValue(), size.intValue()));
}
+
@PostMapping("/addition")
@ApiOperation("娣诲姞")
public CommonResult addVideoPoint(@RequestBody VideoPoint videoPoint) {
@@ -55,7 +50,7 @@
@DeleteMapping("/deletion")
@ApiOperation("鍒犻櫎")
- public CommonResult deleteVideoPoint(@RequestParam Long id){
+ public CommonResult deleteVideoPoint(@RequestParam Long id) {
return CommonResult.success(iVideoPointService.removeById(id));
}
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java
index e12b706..a42c080 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/equipment/EquipmentBayonetMapper.java
@@ -1,7 +1,9 @@
package com.ycl.mapper.equipment;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.equipment.EquipmentBayonet;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.vo.equipment.EquipmentBayonetVO;
/**
* <p>
@@ -13,4 +15,5 @@
*/
public interface EquipmentBayonetMapper extends BaseMapper<EquipmentBayonet> {
+ Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java b/ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java
index 1354ce8..6bc1cd3 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/IEquipmentBayonetService.java
@@ -1,5 +1,6 @@
package com.ycl.service.equipment;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.equipment.EquipmentBayonet;
import com.ycl.vo.equipment.EquipmentBayonetVO;
@@ -15,4 +16,5 @@
* @since 2022-10-14
*/
public interface IEquipmentBayonetService extends IService<EquipmentBayonet> {
+ Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java
index 148f835..03cd60a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/equipment/impl/EquipmentBayonetServiceImpl.java
@@ -1,20 +1,14 @@
package com.ycl.service.equipment.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.equipment.EquipmentBayonet;
import com.ycl.mapper.equipment.EquipmentBayonetMapper;
import com.ycl.service.equipment.IEquipmentBayonetService;
import com.ycl.vo.equipment.EquipmentBayonetVO;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -26,4 +20,12 @@
*/
@Service
public class EquipmentBayonetServiceImpl extends ServiceImpl<EquipmentBayonetMapper, EquipmentBayonet> implements IEquipmentBayonetService {
+
+ @Resource
+ EquipmentBayonetMapper equipmentBayonetMapper;
+
+ @Override
+ public Page<EquipmentBayonetVO> selectEquipmentPage(Page<EquipmentBayonet> equipmentBayonetPage, String bayonetName) {
+ return equipmentBayonetMapper.selectEquipmentPage(equipmentBayonetPage, bayonetName);
+ }
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/video/VideoPointVO.java b/ycl-platform/src/main/java/com/ycl/vo/video/VideoPointVO.java
new file mode 100644
index 0000000..e663e23
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/video/VideoPointVO.java
@@ -0,0 +1,95 @@
+package com.ycl.vo.video;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 鐐逛綅绠＄悊
+ * </p>
+ *
+ * @author zhanghua
+ * @since 2022-09-26
+ */
+@Data
+public class VideoPointVO{
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鐐逛綅缁忓害
+ */
+ @TableField("longitude")
+ private Double longitude;
+
+ /**
+ * 鐐逛綅绾害
+ */
+ @TableField("latitude")
+ private Double latitude;
+
+ /**
+ * 鐐逛綅鍚嶇О
+ */
+ @TableField("name")
+ private String name;
+
+ /**
+ * 璁惧缂栫爜鍞竴
+ */
+ @TableField("plat_resource_id")
+ private String platResourceId;
+
+ /**
+ * 璁惧鍝佺墝
+ */
+ @TableField("equipment_brand")
+ private String equipmentBrand;
+
+ /**
+ * 璁惧鍨嬪彿
+ */
+ @TableField("equipment_model")
+ private String equipmentModel;
+
+ /**
+ * 璁惧IP鍦板潃
+ */
+ @TableField("equipment_ip")
+ private String equipmentIp;
+
+ /**
+ * URL鍦板潃
+ */
+ @TableField("url_address")
+ private String urlAddress;
+
+ /**
+ * 琛楅亾id
+ */
+ @TableField("street_id")
+ private String streetName;
+
+ /**
+ * 绀惧尯id
+ */
+ @TableField("community_id")
+ private String communityName;
+
+ /**
+ * 鍏蜂綋鍦板潃
+ */
+ @TableField("address")
+ private String address;
+
+}
diff --git a/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
index eb398d3..9848aff 100644
--- a/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
@@ -18,4 +18,30 @@
id, bayonet_name, longitude, latitude, ip_address, port, description
</sql>
+ <select id="selectEquipmentPage" resultType="com.ycl.vo.equipment.EquipmentBayonetVO">
+ SELECT
+ t1.id,
+ t1.bayonet_name,
+ t1.description,
+ t1.ip_address,
+ t1.latitude,
+ t1.longitude,
+ t1.`port`,
+ t2.`name` as frontEndType,
+ t3.`name` as inOutCityType,
+ t4.region_name as belongArea
+ FROM
+ `ums_equipment_bayonet` t1
+ LEFT JOIN
+ ums_data_dictionary t2 on t1.front_end_type=t2.id
+ LEFT JOIN
+ ums_data_dictionary t3 on t1.in_out_city_type=t3.id
+ LEFT JOIN
+ ums_sccg_region t4 on t4.id=t1.belong_area
+ <where>
+ <if test="bayonetName !=null and bayonetName !='' ">
+ bayonet_name like CONCAT('%',#{bayonetName},'%')
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.8.0