diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/AddServiceController.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/AddServiceController.java index 18b4c30..e0045c7 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/AddServiceController.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/AddServiceController.java @@ -9,6 +9,7 @@ import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.domain.AddService; +import com.muyu.many.domain.MessageData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -95,4 +96,6 @@ public class AddServiceController extends BaseController { return toAjax(addServiceService.deleteAddServiceByIds(ids)); } + + } diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java index 30a139b..860796e 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.muyu.authentication.service.IEnterpriseService; import com.muyu.domain.vo.EnterpriseReq; +import com.muyu.many.domain.MessageData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.muyu.common.log.annotation.Log; @@ -125,4 +126,11 @@ public class EnterpriseController extends BaseController enterpriseService.list() ); } + + @GetMapping("/redisList/{vin}") + public Result redisList(@PathVariable String vin){ + return Result.success( + enterpriseService.redisList(vin) + ); + } } diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IAddServiceService.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IAddServiceService.java index 7f205d8..c7caa4e 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IAddServiceService.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IAddServiceService.java @@ -1,6 +1,7 @@ package com.muyu.authentication.service; import com.muyu.domain.AddService; +import com.muyu.many.domain.MessageData; import java.util.List; @@ -59,4 +60,5 @@ public interface IAddServiceService * @return 结果 */ public int deleteAddServiceById(Long id); + } diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IEnterpriseService.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IEnterpriseService.java index 215ecfa..0ab6297 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IEnterpriseService.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IEnterpriseService.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.Enterprise; import com.muyu.domain.vo.EnterpriseReq; +import com.muyu.many.domain.MessageData; /** * 企业Service接口 @@ -68,4 +69,5 @@ public interface IEnterpriseService extends IService String enterpriseUpdateId(Long id); + MessageData redisList(String vin); } diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/AddServiceServiceImpl.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/AddServiceServiceImpl.java index b828349..6f7e946 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/AddServiceServiceImpl.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/AddServiceServiceImpl.java @@ -1,10 +1,13 @@ package com.muyu.authentication.service.impl; +import com.alibaba.fastjson.JSON; import com.muyu.authentication.mapper.AddServiceMapper; import com.muyu.authentication.service.IAddServiceService; import com.muyu.common.core.utils.DateUtils; import com.muyu.domain.AddService; +import com.muyu.many.domain.MessageData; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import java.util.List; @@ -93,4 +96,8 @@ public class AddServiceServiceImpl implements IAddServiceService { return addServiceMapper.deleteAddServiceById(id); } + + @Autowired + private StringRedisTemplate redisTemplate; + } diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java index 45d8602..8cfc6b3 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java @@ -18,10 +18,12 @@ import com.muyu.common.core.utils.DateUtils; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.domain.vo.EnterpriseReq; +import com.muyu.many.domain.MessageData; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import com.muyu.domain.Enterprise; import com.muyu.authentication.service.IEnterpriseService; @@ -236,4 +238,13 @@ public class EnterpriseServiceImpl extends ServiceImpl locationsList; +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-common/src/main/java/com/muyu/many/domain/vo/Locations.java b/muyu-modules/muyu-modules-many/muyu-modules-many-common/src/main/java/com/muyu/many/domain/vo/Locations.java new file mode 100644 index 0000000..e5368f6 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-common/src/main/java/com/muyu/many/domain/vo/Locations.java @@ -0,0 +1,25 @@ +package com.muyu.many.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 经纬度信息 + * + * @ClassName Locations + * @Author AnNan.Wang + * @Date 2024/6/18 10:55 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class Locations { + private String Q; + private String R; + private String lat; + private String lng; +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FenceController.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FenceController.java index c341516..21d3f59 100644 --- a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FenceController.java +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FenceController.java @@ -8,10 +8,14 @@ import com.muyu.clw.common.many.datasource.holder.DynamicDataSourceHolder; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.many.domain.Fence; +import com.muyu.many.domain.MessageData; import com.muyu.many.domain.req.FenceEditReq; import com.muyu.many.domain.req.FenceQueryReq; import com.muyu.many.domain.req.FenceSaveReq; +import com.muyu.many.domain.vo.FenceReq; +import com.muyu.many.domain.vo.Locations; import io.swagger.annotations.*; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.muyu.common.core.domain.Result; @@ -29,6 +33,7 @@ import com.muyu.common.log.enums.BusinessType; @Api(tags = "电子围栏") @RestController @RequestMapping("/fence") +@Log4j2 public class FenceController extends BaseController { @Autowired private FenceService fenceService; @@ -106,4 +111,10 @@ public class FenceController extends BaseController { DynamicDataSourceHolder.removeDynamicDataSourceKey(); return toAjax(b); } + + @PostMapping("/IdAdd") + public Result IdAdd(@RequestBody FenceReq fenceReq){ + log.info(fenceReq); + return fenceService.IdAdd(fenceReq); + } } diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FenceService.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FenceService.java index 2c83f1c..bad934a 100644 --- a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FenceService.java +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FenceService.java @@ -1,7 +1,11 @@ package com.muyu.authentication.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.domain.Result; import com.muyu.many.domain.Fence; +import com.muyu.many.domain.MessageData; +import com.muyu.many.domain.vo.FenceReq; +import com.muyu.many.domain.vo.Locations; import java.util.List; @@ -20,4 +24,8 @@ public interface FenceService extends IService { */ public List list(Fence fence); + + + Result IdAdd(FenceReq fenceReq); + } diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FenceServiceImpl.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FenceServiceImpl.java index 32e03a7..c9f12ba 100644 --- a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FenceServiceImpl.java +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FenceServiceImpl.java @@ -1,14 +1,22 @@ package com.muyu.authentication.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.authentication.mapper.FenceMapper; import com.muyu.authentication.service.FenceService; import com.muyu.clw.common.many.datasource.holder.DynamicDataSourceHolder; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; import com.muyu.many.domain.Fence; +import com.muyu.many.domain.MessageData; +import com.muyu.many.domain.vo.FenceReq; +import com.muyu.many.domain.vo.Locations; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.ListOperations; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import java.util.List; @@ -70,4 +78,16 @@ public class FenceServiceImpl extends ServiceImpl implements return list(queryWrapper); } + + + @Override + public Result IdAdd(FenceReq fenceReq) { + boolean b = this.updateById( + Fence.builder() + .id(fenceReq.getId()) + .longitudeAndLatitude(String.valueOf(fenceReq.getLocationsList())) + .build() + ); + return Result.success(b ? "修改成功" : "修改失败"); + } }