diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/FenceApplication.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/FenceApplication.java new file mode 100644 index 0000000..a43366b --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/FenceApplication.java @@ -0,0 +1,17 @@ +package com.zhilian.business; + +import com.zhilian.common.security.annotation.EnableCustomConfig; +import com.zhilian.common.security.annotation.EnableMyFeignClients; +import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class FenceApplication { + public static void main(String[] args) { + SpringApplication.run(FenceApplication.class,args); + } +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java new file mode 100644 index 0000000..c7225df --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/FenceController.java @@ -0,0 +1,72 @@ +package com.zhilian.business.controller; + +import com.github.pagehelper.PageInfo; +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.core.web.controller.BaseController; +import com.zhilian.business.domain.Fence; +import com.zhilian.business.domain.FenceVo; +import com.zhilian.business.service.FenceService; +import com.zhilian.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * @ClassName FenceController + * @Description 电子围栏控制层 + * @Author ZeJinG.Su + * @Date 14:37 2024/3/29 + */ +@RestController +@RequestMapping("fence") +public class FenceController extends BaseController { + @Autowired + private FenceService fenceService; + + /** + * TODO: 围栏管理 + */ + @PostMapping("/list") + public Result> fenceList(@RequestBody FenceVo fenceVo) { + return success(fenceService.fenceList(fenceVo)); + } + + /** + * 新增围栏 + * @param fence + * @return + */ + @PostMapping("/fenceAdd") + public Result fenceAdd(@RequestBody Fence fence) { + boolean i = fenceService.save(fence); + return toAjax(i); + } + +// @PostMapping("insertFence") +// public Result insertFence(@RequestBody Fence fence) { +// Result result = fenceService.insertFence(fence); +// return Result.success(); +// } + + /** + * 修改电子围栏 + */ + // @RequiresPermissions("system:config:fenceAdd") + @PostMapping("/fenceUpdate") + public Result fenceUpdate(@RequestBody Fence fence) { + boolean i = fenceService.updateById(fence); + return toAjax(i); + } + + /** + * 删除围栏 + * @param + * @return + */ + @PostMapping("/fenceDelete/{fenceId}") + public Result fenceDelete(@PathVariable String fenceId) { + boolean i = fenceService.removeById(fenceId); + return toAjax(i); + } + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java new file mode 100644 index 0000000..d2ca129 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/Fence.java @@ -0,0 +1,55 @@ +package com.zhilian.business.domain; + +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 com.zhilian.common.core.annotation.Excel; +import com.zhilian.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("business_fence") +public class Fence extends BaseEntity { + private static final long serialVersionUID = 1L; + /** + * 电子围栏编号 + */ + @Excel(name = "参数主键", cellType = Excel.ColumnType.NUMERIC) + @TableId(value = "fence_id", type = IdType.AUTO) + private Long fenceId; + /** + * 电子围栏名称 + */ + @Excel(name = "电子围栏名称") + @TableField("fence_name") + private String fenceName; + /** + * 电子围栏类型编号 + */ + @Excel(name = "电子围栏类型编号") + @TableField("fence_type_id") + private Long fenceTypeId; + /** + * 电子围栏状态 + */ + @Excel(name = "电子围栏状态") + @TableField("fence_state") + private Long fenceState; + /** + * 电子围栏经纬度信息 + */ + @Excel(name = "电子围栏经纬度信息") + @TableField("fence_message") + private String fenceMessage; + + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java new file mode 100644 index 0000000..eeb2fe3 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/FenceVo.java @@ -0,0 +1,43 @@ +package com.zhilian.business.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +/** + * @ClassName FenceResp //类名称 + * @Author: yannan //作者 + * @CreateDate: 2024/3/26 20:03 //创建时间 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class FenceVo { + + + /** + * 围栏名称 + */ + private String fenceName; + + /** + * 围栏类型 + */ + private Long fenceTypeId; + + /** + * 围栏状态 + */ + private Long fenceState; + + + /** + * 分页查询 + */ + private Integer pageNum=1; + private Integer pageSize=5; + + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java new file mode 100644 index 0000000..2898904 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/request/FenceRequest.java @@ -0,0 +1,31 @@ +package com.zhilian.business.domain.request; + +import com.zhilian.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class FenceRequest extends BaseEntity { + private static final long serialVersionUID = 1L; + /** + * 电子围栏名称 + */ + private String fenceName; + /** + * 电子围栏类型编号 + */ + private Long fenceTypeId; + /** + * 电子围栏状态 + */ + private Long fenceState; + + +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java new file mode 100644 index 0000000..9b4c3c8 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/FenceMapper.java @@ -0,0 +1,15 @@ +package com.zhilian.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhilian.business.domain.Fence; +import com.zhilian.business.domain.FenceVo; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Mapper +@Component +public interface FenceMapper extends BaseMapper { + List fenceList(FenceVo fenceVo); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java new file mode 100644 index 0000000..9a39ef7 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/FenceService.java @@ -0,0 +1,14 @@ +package com.zhilian.business.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; +import com.zhilian.business.domain.Fence; +import com.zhilian.business.domain.FenceVo; +import com.zhilian.common.core.domain.Result; + +public interface FenceService extends IService { + PageInfo fenceList(FenceVo fenceVo); + + +// Result insertFence(Fence fence); +} diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java new file mode 100644 index 0000000..6d979b9 --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/FenceServiceImpl.java @@ -0,0 +1,38 @@ +package com.zhilian.business.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.zhilian.business.domain.Fence; +import com.zhilian.business.domain.FenceVo; +import com.zhilian.business.mapper.FenceMapper; +import com.zhilian.business.service.FenceService; +import com.zhilian.common.core.domain.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FenceServiceImpl extends ServiceImpl implements FenceService { + @Autowired + private FenceMapper fenceMapper; + @Override + public PageInfo fenceList(FenceVo fenceVo) { + + PageHelper.startPage(fenceVo.getPageNum(),fenceVo.getPageSize()); + + List list=fenceMapper.fenceList(fenceVo); + + PageInfo info = new PageInfo(list); + + return info; + } + +// @Override +// public Result insertFence(Fence fence) { +// boolean save = this.save(fence); +// return Result.success(save); +// } + +} diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml new file mode 100644 index 0000000..7ae037c --- /dev/null +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/zhilian-modules/zhilian-fence/src/main/resources/banner.txt b/zhilian-modules/zhilian-fence/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/zhilian-modules/zhilian-fence/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysConfig.java b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysConfig.java index d7aebfa..fc90bf9 100644 --- a/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysConfig.java +++ b/zhilian-modules/zhilian-system/src/main/java/com/zhilian/system/domain/SysConfig.java @@ -123,4 +123,6 @@ public class SysConfig extends BaseEntity { .append("remark", getRemark()) .toString(); } + + }