diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Fence.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Fence.java new file mode 100644 index 0000000..8cb4ca9 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Fence.java @@ -0,0 +1,42 @@ +package com.business.common.domain; + +import lombok.Data; + +/** + * 电子围栏 + */ +@Data +public class Fence { + /** + * 电子围栏主键 + */ + private Long fenceId; + /** + * 围栏组主键 + */ + private Long groupId; + /** + * 围栏名称 + */ + private String fenceName; + /** + * 围栏类型 + */ + private String fenceType; + /** + * 半径 + */ + private Double radius; + /** + * 驶入驶出 + */ + private String eventType; + /** + * 围栏状态 + */ + private String staut; + /** + *坐标 + */ + private String polygonPoints; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/FenceGroups.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/FenceGroups.java new file mode 100644 index 0000000..08a2a6f --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/FenceGroups.java @@ -0,0 +1,26 @@ +package com.business.common.domain; + +import lombok.Data; + +import java.util.List; + +/** + * + */ +@Data +public class FenceGroups { + /** + * 围栏组id + */ + private Long groupsId; + + private Long carId; + /** + * 围栏组名称 + */ + private String groupsName; + /** + * 电子围栏 + */ + private List fenceList; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/LongitudeAndLatitude.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/LongitudeAndLatitude.java new file mode 100644 index 0000000..b030258 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/LongitudeAndLatitude.java @@ -0,0 +1,8 @@ +package com.business.common.domain; + +import lombok.Data; + +@Data +public class LongitudeAndLatitude { + private String polygonItem; +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Path.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Path.java new file mode 100644 index 0000000..2d3f2c7 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Path.java @@ -0,0 +1,17 @@ +package com.business.common.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class Path { + private String lat; + private String lng; + + +} diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/pojo/GaoDeKey.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/pojo/GaoDeKey.java new file mode 100644 index 0000000..1ee3764 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/pojo/GaoDeKey.java @@ -0,0 +1,15 @@ +package com.business.common.pojo; + +import lombok.Data; + +@Data +public class GaoDeKey { + /** + * key + */ + private String key = "0e95def81c998806b1a63910f7f51f3c"; + /** + * 安全密匙 + */ + private String securityKey = "8d4deb862b1c9ed85a32cb61d6ea7da9"; +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/MapController.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/MapController.java new file mode 100644 index 0000000..603336c --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/MapController.java @@ -0,0 +1,64 @@ +package com.muyu.goods.controller; + +import com.business.common.domain.Fence; +import com.business.common.domain.FenceGroups; +import com.business.common.domain.Path; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.goods.service.IMapService; +import com.muyu.goods.service.impl.MapService; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("map") +public class MapController extends BaseController { + @Autowired + private IMapService iMapService; + + /** + * 查看全部围栏组 + * @return + */ + @PostMapping("selectFenceGroups") + public Result> selectFenceGroups() { + return success(iMapService.selectFenceGroups()); + } + + /** + * 查看全部电子围栏 + * @return + */ + @PostMapping("selectFence") + public Result> selectFence() { + return success(iMapService.selectFence()); + } + + /** + * 查看围栏组 + * @param carId + * @return + */ + @PostMapping("selectFenceGroupsById/{carId}") + public Result selectFenceGroupsById(@PathVariable Long carId){ + return success(iMapService.selectFenceGroupsById(carId)); + } + + /** + * 查看 + * @param list + * @return + */ + @PostMapping("getSel") + public Result getSel(@RequestBody List list){ + return success(iMapService.getSel(list)); + } + + @PostMapping("setSel") + public String setSel(Object r){ + return iMapService.setSel(r); + } +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/CarMapper.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/CarMapper.java index e4e0a84..b947181 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/CarMapper.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/CarMapper.java @@ -61,4 +61,6 @@ public interface CarMapper public int deleteCarByCarIds(Long[] carIds); Car query(Long carId); + + Car carByCar(); } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/MapMapper.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/MapMapper.java new file mode 100644 index 0000000..aa76b5f --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/MapMapper.java @@ -0,0 +1,15 @@ +package com.muyu.goods.mapper; + +import com.business.common.domain.Fence; +import com.business.common.domain.FenceGroups; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface MapMapper { + void indexFenceGroups(@Param("carId") Long carId, @Param("groupsName") String groupsName); + + List selectFenceGroups(); + + List selectFence(); +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IMapService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IMapService.java new file mode 100644 index 0000000..637193d --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IMapService.java @@ -0,0 +1,21 @@ +package com.muyu.goods.service; + +import com.business.common.domain.Fence; +import com.business.common.domain.FenceGroups; +import com.business.common.domain.Path; +import org.apache.poi.ss.formula.functions.T; + +import java.util.List; + +public interface IMapService { + + List selectFenceGroups(); + + List selectFence(); + + FenceGroups selectFenceGroupsById(Long carId); + + List getSel(List list); + + String setSel(Object r); +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/CarServiceImpl.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/CarServiceImpl.java index f95837f..641e4c0 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/CarServiceImpl.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/CarServiceImpl.java @@ -1,11 +1,13 @@ package com.muyu.goods.service.impl; import java.util.List; +import java.util.UUID; import java.util.stream.Collectors; import com.business.common.domain.Car; import com.business.common.domain.Enterprise; import com.muyu.goods.mapper.CarMapper; +import com.muyu.goods.mapper.MapMapper; import com.muyu.goods.service.ICarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +25,8 @@ public class CarServiceImpl implements ICarService private CarMapper carMapper; @Autowired private BusinessServiceImpl businessService; + @Autowired + private MapMapper mapMapper; /** * 查询车辆信息 @@ -71,7 +75,13 @@ public class CarServiceImpl implements ICarService } System.out.println(enterprise); car.setOwnerId(enterprise.getId()); - return carMapper.insertCar(car); + car.setVin(UUID.randomUUID().toString().replaceAll("-","")); + int i = carMapper.insertCar(car); + if (i>0) { + Car car1 = carMapper.carByCar(); + mapMapper.indexFenceGroups(car1.getCarId(),"car"+car1.getCarId()); + } + return i; } /** diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/MapService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/MapService.java new file mode 100644 index 0000000..36e9e77 --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/MapService.java @@ -0,0 +1,55 @@ +package com.muyu.goods.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.business.common.domain.Fence; +import com.business.common.domain.FenceGroups; +import com.business.common.domain.Path; +import com.muyu.goods.mapper.MapMapper; +import com.muyu.goods.service.IMapService; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class MapService implements IMapService { + @Autowired + private MapMapper mapMapper; + + @Override + public List selectFenceGroups() { + List fenceGroupsList = mapMapper.selectFenceGroups(); + for (FenceGroups fenceGroups : fenceGroupsList) { + if (selectFence() == null){ + continue; + } + List fenceList = selectFence().stream().filter(fa -> fa.getGroupId() == fenceGroups.getGroupsId()).collect(Collectors.toList()); + fenceGroups.setFenceList(fenceList); + } + System.out.println(fenceGroupsList); + return fenceGroupsList; + } + + @Override + public List selectFence() { + List fenceList = mapMapper.selectFence(); + return fenceList; + } + + @Override + public FenceGroups selectFenceGroupsById(Long carId) { + List groups = selectFenceGroups().stream().filter(car -> car.getCarId() == carId).collect(Collectors.toList()); + return groups.get(0); + } + + @Override + public List getSel(List list) { + System.out.println(list); + String jsonString = JSONObject.toJSONString(list); + Path path = JSONObject.parseObject(jsonString, Path.class); + return null; + } +} diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/BusinessMapper.xml b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/BusinessMapper.xml index f4fd336..e3912ae 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/BusinessMapper.xml +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/BusinessMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/CarMapper.xml b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/CarMapper.xml index e81ef45..201687f 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/CarMapper.xml +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/CarMapper.xml @@ -42,6 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where car_id = #{carId} + insert into car diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/MapMapper.xml b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/MapMapper.xml new file mode 100644 index 0000000..ee0005a --- /dev/null +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/MapMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + select groups_id, car_id, groups_name from fence_groups + + + + select fence_id, group_id, fence_name, fence_type, radius, event_type, staut, polygon_points from fence + + + insert into fence_groups ( groups_id, car_id, groups_name ) + values (0,#{carId},#{groupsName}); + + + + + + diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/src/main/java/com/muyu/goods/pojo/GaoDeKey.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/src/main/java/com/muyu/goods/pojo/GaoDeKey.java new file mode 100644 index 0000000..dcde417 --- /dev/null +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-common/src/main/java/com/muyu/goods/pojo/GaoDeKey.java @@ -0,0 +1,15 @@ +package com.muyu.goods.pojo; + +import lombok.Data; + +@Data +public class GaoDeKey { + /** + * key + */ + private String key = "0e95def81c998806b1a63910f7f51f3c"; + /** + * 安全密匙 + */ + private String securityKey = "8d4deb862b1c9ed85a32cb61d6ea7da9"; +} diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java index 3eb6532..e0c38d4 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/controller/EnterpriseController.java @@ -147,4 +147,5 @@ public class EnterpriseController extends BaseController public Result getLevel(Long id,Integer serviceLevel){ return success(enterpriseService.getLevel(id,serviceLevel)); } + } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java index 3be0711..c7b070d 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java @@ -1,22 +1,13 @@ package com.muyu.goods.service.impl; import java.io.IOException; -import java.net.URI; -import java.net.http.HttpRequest; -import java.net.http.HttpRequest; -import java.net.http.HttpRequest.BodyPublishers; -import java.net.http.HttpResponse; -import java.net.http.HttpResponse.BodyHandlers; import java.util.List; import java.util.UUID; -import java.util.stream.Collectors; -import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.DateUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.common.system.domain.SysUser; -import com.muyu.goods.manage.SysUserRemote; import com.muyu.goods.pojo.HttpClient; import com.muyu.system.remote.RemoteSystemManageService; import muyu.goods.enterprise.client.config.EnterpriseConfig; @@ -186,4 +177,5 @@ public class EnterpriseServiceImpl implements IEnterpriseService return "选择失败"; } } + }