From ffc698bc11b070f819fec77cbd9d6cc4fa1fac51 Mon Sep 17 00:00:00 2001 From: 86191 <2160251938@qq.com> Date: Tue, 24 Sep 2024 11:13:34 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E9=87=8D=E6=9E=84=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E4=BB=A5=E5=8F=8A=E5=9B=B4=E6=A0=8F=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/fence/FenceApplication.java | 19 --- .../controller/ElectronicFenceController.java | 2 +- .../ElectronicFenceGroupController.java | 2 +- .../fence/controller/TbFenceController.java | 112 ------------------ .../fence/controller/TbGroupController.java | 36 ------ .../java/com/muyu/fence/domain/TbFence.java | 72 ----------- .../java/com/muyu/fence/domain/TbGroup.java | 26 ---- .../domain/database/ElectronicFence.java | 2 +- .../domain/database/ElectronicFenceGroup.java | 2 +- .../fence/domain/database/FenceGroupMid.java | 2 +- .../domain/req/ElectroicFenceAddReq.java | 2 +- .../domain/req/ElectroicFenceListReq.java | 2 +- .../domain/req/ElectroicFenceUpdReq.java | 2 +- .../req/ElectronicFenceGroupAddReq.java | 2 +- .../req/ElectronicFenceGroupListReq.java | 2 +- .../req/ElectronicFenceGroupUpdReq.java | 2 +- .../domain/req/FenceAndGroupBoundReq.java | 2 +- .../muyu/fence/domain/req/FenceWayReq.java | 2 +- .../domain/resp/ElectronicFenceGroupResp.java | 2 +- .../domain/resp/ElectronicFenceResp.java | 2 +- .../fence/domain/resp/GroupFenceListresp.java | 2 +- .../domain/utils/ElectricFenceModel.java | 2 +- .../domain/utils/ElectricFenceResultTmp.java | 2 +- .../domain/utils/ElectronicFenceResult.java | 2 +- .../domain/utils/ElectronicFenceSetting.java | 2 +- .../mapper/ElectronicFenceGroupMapper.java | 2 +- .../fence/mapper/ElectronicFenceMapper.java | 2 +- .../fence/mapper/FenceGroupMidMapper.java | 2 +- .../com/muyu/fence/mapper/TbFenceMapper.java | 17 --- .../com/muyu/fence/mapper/TbGroupDao.java | 12 -- .../service/ElectronicFenceGroupService.java | 2 +- .../fence/service/ElectronicFenceService.java | 2 +- .../fence/service/FenceGroupMidService.java | 2 +- .../muyu/fence/service/ITbFenceService.java | 37 ------ .../muyu/fence/service/TbGroupService.java | 10 -- .../impl/ElectronicFenceGroupServiceImpl.java | 2 +- .../impl/ElectronicFenceServiceImpl.java | 2 +- .../impl/FenceGroupMidServiceImpl.java | 2 +- .../service/impl/TbFenceServiceImpl.java | 80 ------------- .../service/impl/TbGroupServiceImpl.java | 32 ----- .../main/resources/mapper/TbGroupMapper.xml | 17 --- 41 files changed, 29 insertions(+), 499 deletions(-) delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/FenceApplication.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbFenceController.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbGroupController.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbFence.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbGroup.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbFenceMapper.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbGroupDao.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ITbFenceService.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/TbGroupService.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbFenceServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbGroupServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-fence/src/main/resources/mapper/TbGroupMapper.xml diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/FenceApplication.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/FenceApplication.java deleted file mode 100644 index 1f010ec..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/FenceApplication.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.fence; - -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @Author YuPing - * @Description 电子围栏启动类 - * @Version 1.0 - * @Data 2024-09-18 11:27:38 - */ -@SpringBootApplication -@EnableMyFeignClients -public class FenceApplication { - public static void main(String[] args) { - SpringApplication.run(FenceApplication.class, args); - } -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/ElectronicFenceController.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/ElectronicFenceController.java index 360b1b3..e0e4f43 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/ElectronicFenceController.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/ElectronicFenceController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.controller * @Project：cloud-server * @name：FenceEtlController diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/ElectronicFenceGroupController.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/ElectronicFenceGroupController.java index d37b03e..3dc1bdf 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/ElectronicFenceGroupController.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/ElectronicFenceGroupController.java @@ -20,7 +20,7 @@ import java.util.Collection; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.controller * @Project：cloud-server * @name：FenceGroupController diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbFenceController.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbFenceController.java deleted file mode 100644 index 866e962..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbFenceController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.muyu.fence.controller; - -import java.util.Arrays; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.fence.domain.TbFence; -import com.muyu.fence.service.ITbFenceService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; -import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; - -/** - * 电子围栏Controller - * - * @author muyu - * @date 2024-09-18 - */ -@RestController -@RequestMapping("/fence") -public class TbFenceController extends BaseController -{ - @Resource - private ITbFenceService tbFenceService; - - /** - * 查询电子围栏列表 - */ - @RequiresPermissions("fence:fence:list") - @GetMapping("/list") - public Result> list(TbFence tbFence) - { - startPage(); - List list = tbFenceService.selectTbFenceList(tbFence); - return getDataTable(list); - } - - /** - * 导出电子围栏列表 - */ - @RequiresPermissions("fence:fence:export") - @PostMapping("/export") - public void export(HttpServletResponse response, TbFence tbFence) - { - List list = tbFenceService.selectTbFenceList(tbFence); - ExcelUtil util = new ExcelUtil(TbFence.class); - util.exportExcel(response, list, "电子围栏数据"); - } - - /** - * 获取电子围栏详细信息 - */ - @RequiresPermissions("fence:fence:query") - @GetMapping(value = "/{fenceId}") - public Result> getInfo(@PathVariable("fenceId") Long fenceId) - { - return success(tbFenceService.selectTbFenceByFenceId(fenceId)); - } - - /** - * 新增电子围栏 - */ - @RequiresPermissions("fence:fence:add") - @PostMapping - public Result add( - @Validated @RequestBody TbFence tbFence) - { - if (tbFenceService.checkIdUnique(tbFence)) { - return error("新增 电子围栏 '" + tbFence + "'失败，电子围栏已存在"); - } - tbFence.setCreateBy(SecurityUtils.getUsername()); - return toAjax(tbFenceService.save(tbFence)); - } - - /** - * 修改电子围栏 - */ - @RequiresPermissions("fence:fence:edit") - @PutMapping - public Result edit( - @Validated @RequestBody TbFence tbFence) - { - if (!tbFenceService.checkIdUnique(tbFence)) { - return error("修改 电子围栏 '" + tbFence + "'失败，电子围栏不存在"); - } - tbFence.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(tbFenceService.updateById(tbFence)); - } - - /** - * 删除电子围栏 - */ - @RequiresPermissions("fence:fence:remove") - @DeleteMapping("/{fenceIds}") - public Result remove(@PathVariable("fenceIds") Long[] fenceIds) - { - tbFenceService.removeBatchByIds(Arrays.asList(fenceIds)); - return success(); - } -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbGroupController.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbGroupController.java deleted file mode 100644 index 14c3a9f..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/controller/TbGroupController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.fence.controller; - -import com.muyu.common.core.domain.Result; -import com.muyu.fence.domain.TbGroup; -import com.muyu.fence.service.TbGroupService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @Author YuPing - * @Description 围栏控制器 - * @Version 1.0 - * @Data 2024-09-22 17:00:08 - */ - -@RestController -@RequestMapping("/tbGroup") -public class TbGroupController { - - @Autowired - private TbGroupService tbGroupService; - - /** - * 查询围栏列表 - * @return - */ - @GetMapping("/selectTbGroupList") - public Result> selectTbGroupList() { - return Result.success(tbGroupService.selectTbGroupList()); - } - -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbFence.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbFence.java deleted file mode 100644 index 2e1ee83..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbFence.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.muyu.fence.domain; - -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; - -/** - * 电子围栏对象 tb_fence - * - * @author muyu - * @date 2024-09-18 - */ - -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("tb_fence") -public class TbFence extends BaseEntity{ - private static final long serialVersionUID = 1L; - - /** 围栏编号 */ - @TableId( type = IdType.AUTO) - private Long fenceId; - - /** 围栏名称 */ - @Excel(name = "围栏名称") - private String fenceName; - - /** 围栏类型1.驶入2驶出 */ - @Excel(name = "围栏类型1.驶入2驶出") - private Long fenceType; - - /** 围栏状态1.正常2.停用 */ - @Excel(name = "围栏状态1.正常2.停用") - private Long fenceFlag; - - /** 经纬度信息 */ - @Excel(name = "经纬度信息") - private String longitudeAndLatitudeInformation; - - /** 优先级 */ - @Excel(name = "优先级") - private String fencePriority; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("fenceId", getFenceId()) - .append("fenceName", getFenceName()) - .append("fenceType", getFenceType()) - .append("fenceFlag", getFenceFlag()) - .append("longitudeAndLatitudeInformation", getLongitudeAndLatitudeInformation()) - .append("fencePriority", getFencePriority()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbGroup.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbGroup.java deleted file mode 100644 index f0711b6..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/TbGroup.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.fence.domain; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author YuPing - * @Description 围栏组 - * @Version 1.0 - * @Data 2024-09-22 16:55:16 - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -public class TbGroup { - /** - * 围栏组编号 - */ - private Integer groupId; - /** - * 围栏组名称 - */ - private String groupName; -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/ElectronicFence.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/ElectronicFence.java index 247b0d4..f4dcf1d 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/ElectronicFence.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/ElectronicFence.java @@ -16,7 +16,7 @@ import lombok.experimental.SuperBuilder; import java.util.function.Supplier; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：ElectronicFence diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/ElectronicFenceGroup.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/ElectronicFenceGroup.java index 2615957..172298a 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/ElectronicFenceGroup.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/ElectronicFenceGroup.java @@ -16,7 +16,7 @@ import lombok.experimental.SuperBuilder; import java.util.function.Supplier; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：ElectronicFenceGroup diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/FenceGroupMid.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/FenceGroupMid.java index d35038e..1514242 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/FenceGroupMid.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/database/FenceGroupMid.java @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：FenceGroupMid diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceAddReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceAddReq.java index 65b7fbe..44890c4 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceAddReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceAddReq.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.req * @Project：cloud-server * @name：ElectroicAdd diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java index e9ef424..cbfbf85 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.req * @Project：cloud-server * @name：ElectroicFenceReq diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceUpdReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceUpdReq.java index 1491799..92d45de 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceUpdReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceUpdReq.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.req * @Project：cloud-server * @name：ElectroicFenceUpdReq diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupAddReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupAddReq.java index 52eea61..c6d8ce5 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupAddReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupAddReq.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.req * @Project：cloud-server * @name：ElectronicFenceGroupAddReq diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupListReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupListReq.java index 4704904..49d3e11 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupListReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupListReq.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.req * @Project：cloud-server * @name：ElectronicFenceGroupListReq diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupUpdReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupUpdReq.java index df8fdd1..2d08619 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupUpdReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectronicFenceGroupUpdReq.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.req * @Project：cloud-server * @name：ElectronicFenceGroupAddReq diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/FenceAndGroupBoundReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/FenceAndGroupBoundReq.java index 500f8d1..4334b9f 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/FenceAndGroupBoundReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/FenceAndGroupBoundReq.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.req * @Project：cloud-server * @name：FenceAndGroupBoundReq diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/FenceWayReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/FenceWayReq.java index 6ec48c9..ec635aa 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/FenceWayReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/FenceWayReq.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：FenceWay diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/ElectronicFenceGroupResp.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/ElectronicFenceGroupResp.java index 381ceb0..21109c4 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/ElectronicFenceGroupResp.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/ElectronicFenceGroupResp.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.resp * @Project：cloud-server * @name：ElectronicFenceGroupResp diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/ElectronicFenceResp.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/ElectronicFenceResp.java index 8fbf914..f48df2d 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/ElectronicFenceResp.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/ElectronicFenceResp.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：ElectronicFence diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/GroupFenceListresp.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/GroupFenceListresp.java index bda4412..4b5745e 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/GroupFenceListresp.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/resp/GroupFenceListresp.java @@ -9,7 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain.req * @Project：cloud-server * @name：GroupFenceListresp diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectricFenceModel.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectricFenceModel.java index ecb6757..c6d6a60 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectricFenceModel.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectricFenceModel.java @@ -1,7 +1,7 @@ package com.muyu.fence.domain.utils; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：ElectricFenceModel diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectricFenceResultTmp.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectricFenceResultTmp.java index eb7fdc5..a42ec5b 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectricFenceResultTmp.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectricFenceResultTmp.java @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：ElectricFenceResultTmp diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectronicFenceResult.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectronicFenceResult.java index 38786c7..86174ea 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectronicFenceResult.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectronicFenceResult.java @@ -9,7 +9,7 @@ import java.sql.Timestamp; import java.util.Date; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：ElectronicFenceResult diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectronicFenceSetting.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectronicFenceSetting.java index 74f3876..fa03f1f 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectronicFenceSetting.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/utils/ElectronicFenceSetting.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.domain * @Project：cloud-server * @name：ElectronicFenceSetting diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceGroupMapper.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceGroupMapper.java index bc9c9d6..d25b310 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceGroupMapper.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceGroupMapper.java @@ -5,7 +5,7 @@ import com.muyu.fence.domain.database.ElectronicFenceGroup; import org.apache.ibatis.annotations.Mapper; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.mapper * @Project：cloud-server * @name：FenceGroupMapper diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceMapper.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceMapper.java index fe3912d..6445244 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceMapper.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/ElectronicFenceMapper.java @@ -5,7 +5,7 @@ import com.muyu.fence.domain.database.ElectronicFence; import org.apache.ibatis.annotations.Mapper; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.mapper * @Project：cloud-server * @name：ElectronicFenceMapper diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/FenceGroupMidMapper.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/FenceGroupMidMapper.java index 64787e5..e910631 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/FenceGroupMidMapper.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/FenceGroupMidMapper.java @@ -5,7 +5,7 @@ import com.muyu.fence.domain.database.FenceGroupMid; import org.apache.ibatis.annotations.Mapper; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.mapper * @Project：cloud-server * @name：FenceGroupMidMapper diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbFenceMapper.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbFenceMapper.java deleted file mode 100644 index 09ed802..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbFenceMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.fence.mapper; - -import java.util.List; -import com.muyu.fence.domain.TbFence; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 电子围栏Mapper接口 - * - * @author muyu - * @date 2024-09-18 - */ -@Mapper -public interface TbFenceMapper extends BaseMapper{ - -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbGroupDao.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbGroupDao.java deleted file mode 100644 index 5ac5594..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/mapper/TbGroupDao.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.muyu.fence.mapper; - -import com.muyu.fence.domain.TbGroup; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface TbGroupDao { - //查询围栏组列表 - public List selectTbGroupList(); -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ElectronicFenceGroupService.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ElectronicFenceGroupService.java index a73a60d..ca8f74b 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ElectronicFenceGroupService.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ElectronicFenceGroupService.java @@ -10,7 +10,7 @@ import com.muyu.fence.domain.resp.ElectronicFenceGroupResp; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.service * @Project：cloud-server * @name：FenceGroupController diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ElectronicFenceService.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ElectronicFenceService.java index cb83f69..112ca67 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ElectronicFenceService.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ElectronicFenceService.java @@ -9,7 +9,7 @@ import com.muyu.fence.domain.resp.ElectronicFenceResp; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.service * @Project：cloud-server * @name：ElectronicFenceService diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/FenceGroupMidService.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/FenceGroupMidService.java index bc10697..c628cd4 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/FenceGroupMidService.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/FenceGroupMidService.java @@ -8,7 +8,7 @@ import com.muyu.fence.domain.resp.ElectronicFenceResp; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.service * @Project：cloud-server * @name：FenceGroupMidService diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ITbFenceService.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ITbFenceService.java deleted file mode 100644 index 31ad8ff..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/ITbFenceService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fence.service; - -import java.util.List; -import com.muyu.fence.domain.TbFence; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 电子围栏Service接口 - * - * @author muyu - * @date 2024-09-18 - */ -public interface ITbFenceService extends IService { - /** - * 精确查询电子围栏 - * - * @param fenceId 电子围栏主键 - * @return 电子围栏 - */ - public TbFence selectTbFenceByFenceId(Long fenceId); - - /** - * 查询电子围栏列表 - * - * @param tbFence 电子围栏 - * @return 电子围栏集合 - */ - public List selectTbFenceList(TbFence tbFence); - - /** - * 判断 电子围栏 id是否唯一 - * @param tbFence 电子围栏 - * @return 结果 - */ - Boolean checkIdUnique(TbFence tbFence); - -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/TbGroupService.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/TbGroupService.java deleted file mode 100644 index def85cc..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/TbGroupService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.muyu.fence.service; - -import com.muyu.fence.domain.TbGroup; - -import java.util.List; - -public interface TbGroupService { - //查询围栏组列表 - public List selectTbGroupList(); -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/ElectronicFenceGroupServiceImpl.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/ElectronicFenceGroupServiceImpl.java index afa81ff..61484ea 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/ElectronicFenceGroupServiceImpl.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/ElectronicFenceGroupServiceImpl.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Set; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.service.impl * @Project：cloud-server * @name：FenceGroupServiceImpl diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/ElectronicFenceServiceImpl.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/ElectronicFenceServiceImpl.java index 4d1fa61..aca2f8d 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/ElectronicFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/ElectronicFenceServiceImpl.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Set; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.service.impl * @Project：cloud-server * @name：ElectronicFenceServiceImpl diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/FenceGroupMidServiceImpl.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/FenceGroupMidServiceImpl.java index b0c6e2d..79e0c83 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/FenceGroupMidServiceImpl.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/FenceGroupMidServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * @Author：张承志 + * @Author：yuping * @Package：com.muyu.fence.service.impl * @Project：cloud-server * @name：FenceGroupMidServiceImpl diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbFenceServiceImpl.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbFenceServiceImpl.java deleted file mode 100644 index db2042b..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbFenceServiceImpl.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.muyu.fence.service.impl; - -import java.util.List; -import org.springframework.stereotype.Service; -import com.muyu.fence.mapper.TbFenceMapper; -import com.muyu.fence.domain.TbFence; -import com.muyu.fence.service.ITbFenceService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.util.Assert; - -/** - * 电子围栏Service业务层处理 - * - * @author muyu - * @date 2024-09-18 - */ -@Service -public class TbFenceServiceImpl - extends ServiceImpl - implements ITbFenceService { - - /** - * 精确查询电子围栏 - * - * @param fenceId 电子围栏主键 - * @return 电子围栏 - */ - @Override - public TbFence selectTbFenceByFenceId(Long fenceId) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(fenceId, "fenceId不可为空"); - queryWrapper.eq(TbFence::getFenceId, fenceId); - return this.getOne(queryWrapper); - } - - - /** - * 查询电子围栏列表 - * - * @param tbFence 电子围栏 - * @return 电子围栏 - */ - @Override - public List selectTbFenceList(TbFence tbFence) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(tbFence.getFenceName())){ - queryWrapper.like(TbFence::getFenceName, tbFence.getFenceName()); - } - if (tbFence.getFenceType()!=null){ - queryWrapper.eq(TbFence::getFenceType, tbFence.getFenceType()); - } - if (tbFence.getFenceFlag()!=null){ - queryWrapper.eq(TbFence::getFenceFlag, tbFence.getFenceFlag()); - } - if (StringUtils.isNotEmpty(tbFence.getLongitudeAndLatitudeInformation())){ - queryWrapper.eq(TbFence::getLongitudeAndLatitudeInformation, tbFence.getLongitudeAndLatitudeInformation()); - } - if (tbFence.getFencePriority()!=null){ - queryWrapper.eq(TbFence::getFencePriority, tbFence.getFencePriority()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * @param tbFence 电子围栏 - * @return 电子围栏 - */ - @Override - public Boolean checkIdUnique(TbFence tbFence) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(TbFence::getFenceId, tbFence.getFenceId()); - return this.count(queryWrapper) > 0; - } - -} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbGroupServiceImpl.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbGroupServiceImpl.java deleted file mode 100644 index 1813167..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/service/impl/TbGroupServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.fence.service.impl; - -import com.muyu.fence.domain.TbGroup; -import com.muyu.fence.mapper.TbGroupDao; -import com.muyu.fence.service.TbGroupService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Author YuPing - * @Description 围栏组业务实现 - * @Version 1.0 - * @Data 2024-09-22 16:59:33 - */ - -@Service -public class TbGroupServiceImpl implements TbGroupService { - - @Autowired - private TbGroupDao tbGroupDao; - - /** - * 查询围栏组列表 - * @return - */ - @Override - public List selectTbGroupList() { - return tbGroupDao.selectTbGroupList(); - } -} diff --git a/cloud-modules/cloud-modules-fence/src/main/resources/mapper/TbGroupMapper.xml b/cloud-modules/cloud-modules-fence/src/main/resources/mapper/TbGroupMapper.xml deleted file mode 100644 index 96844ea..0000000 --- a/cloud-modules/cloud-modules-fence/src/main/resources/mapper/TbGroupMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - -