From 0f315a08a36420815d712f8fa3582a4aa1ccf59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=AF=85=E5=A4=A7=E7=A5=9E?= <3163302184@qq.com> Date: Wed, 25 Sep 2024 21:04:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-car/pom.xml | 95 ++++++++++++++++ .../muyu/carrail/CloudCarRailApplication.java | 23 ++++ .../controller/SysCorpuscleController.java | 80 +++++++++++++ .../controller/SysFenceController.java | 106 ++++++++++++++++++ .../com/muyu/carrail/domain/SysCorpuscle.java | 67 +++++++++++ .../com/muyu/carrail/domain/SysFence.java | 95 ++++++++++++++++ .../carrail/mapper/SysCorpuscleMapper.java | 21 ++++ .../muyu/carrail/mapper/SysFenceMapper.java | 16 +++ .../carrail/service/ISysCorpuscleService.java | 25 +++++ .../carrail/service/ISysFenceService.java | 38 +++++++ .../service/impl/SysCorpuscleServiceImpl.java | 43 +++++++ .../service/impl/SysFenceServiceImpl.java | 63 +++++++++++ .../src/main/resources/bootstrap.yml | 58 ++++++++++ .../mapper/carrail/SysFenceMapper.xml | 54 +++++++++ .../mapper/carrail/SyscarRailMapper.xml | 16 +++ cloud-modules/cloud-modules-rail/pom.xml | 91 +++++++++++++++ .../zhangyi/rail/CloudRailApplication.java | 4 + .../rail/controller/RailController.java | 4 + .../com/zhangyi/rail/domain/SysFenceRail.java | 38 +++++++ 19 files changed, 937 insertions(+) create mode 100644 cloud-modules/cloud-modules-car/pom.xml create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysCorpuscleServiceImpl.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysFenceServiceImpl.java create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml create mode 100644 cloud-modules/cloud-modules-rail/pom.xml create mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java create mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java create mode 100644 cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml new file mode 100644 index 0000000..c7daf6d --- /dev/null +++ b/cloud-modules/cloud-modules-car/pom.xml @@ -0,0 +1,95 @@ + + + 4.0.0 + + com.muyu + cloud-modules + 3.6.3 + + + cloud-modules-car + + + 17 + 17 + UTF-8 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + com.muyu + cloud-common-core + + + + com.muyu + cloud-common-api-doc + + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java new file mode 100644 index 0000000..98d9546 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/CloudCarRailApplication.java @@ -0,0 +1,23 @@ +package com.muyu.carrail; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +@EnableCustomConfig +@EnableMyFeignClients +@MapperScan("com.muyu.carrail.mapper") +@SpringBootApplication +public class CloudCarRailApplication { + public static void main(String[] args) { +// try { +// +// } catch (Exception e) { +// e.printStackTrace(); +// } + SpringApplication.run(CloudCarRailApplication.class, args); + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java new file mode 100644 index 0000000..15e083c --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysCorpuscleController.java @@ -0,0 +1,80 @@ +package com.muyu.carrail.controller; + +import java.util.Arrays; +import java.util.List; + +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.security.utils.SecurityUtils; +import jakarta.annotation.Resource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import com.muyu.carrail.domain.SysCorpuscle; +import com.muyu.carrail.service.ISysCorpuscleService; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.domain.Result; + +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 电子围栏Controller + * + * @author muyu + * @date 2024-09-17 + */ +@RestController +@RequestMapping("/carRail") +public class SysCorpuscleController extends BaseController +{ + @Autowired + private ISysCorpuscleService sysCorpuscleService; + + /** + * 查询电子围栏列表 + */ + @RequiresPermissions("carRail:carRail:list") + @GetMapping("/list") + public Result> list(SysCorpuscle sysCorpuscle) + { + startPage(); + List list = sysCorpuscleService.selectSysCorpuscleList(sysCorpuscle); + return getDataTable(list); + } + + @RequiresPermissions("carRail:corpuscle:add") + @PostMapping + public Result add( + @Validated @RequestBody SysCorpuscle sysCorpuscle) + { + + return toAjax(sysCorpuscleService.save(sysCorpuscle)); + } + + /** + * 修改电子围栏 + */ + @RequiresPermissions("carRail:corpuscle:edit") + @PutMapping + public Result edit( + @Validated @RequestBody SysCorpuscle sysCorpuscle) + { + + return toAjax(sysCorpuscleService.updateById(sysCorpuscle)); + } + + + + /** + * 删除电子围栏 + */ + @RequiresPermissions("carRail:corpuscle:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) + { + sysCorpuscleService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java new file mode 100644 index 0000000..a3ff506 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/controller/SysFenceController.java @@ -0,0 +1,106 @@ +package com.muyu.carrail.controller; + +import java.util.Arrays; +import java.util.List; + +import com.muyu.carrail.domain.SysFence; +import com.muyu.carrail.service.ISysFenceService; +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.common.core.web.controller.BaseController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import org.springframework.validation.annotation.Validated; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 围栏组Controller + * + * @author muyu + * @date 2024-09-17 + */ +@RestController +@RequestMapping("/fence") +public class SysFenceController extends BaseController +{ + @Resource + private ISysFenceService sysFenceService; + + /** + * 查询围栏组列表 + */ + @RequiresPermissions("fence:fence:list") + @GetMapping("/list") + public Result> list(SysFence sysFence) + { + startPage(); + List list = sysFenceService.selectSysFenceList(sysFence); + return getDataTable(list); + } + + /** + * 导出围栏组列表 + */ + @RequiresPermissions("fence:fence:export") + @PostMapping("/export") + public void export(HttpServletResponse response, SysFence sysFence) + { + List list = sysFenceService.selectSysFenceList(sysFence); + ExcelUtil util = new ExcelUtil(SysFence.class); + util.exportExcel(response, list, "围栏组数据"); + } + + /** + * 获取围栏组详细信息 + */ + @RequiresPermissions("fence:fence:query") + @GetMapping(value = "/{id}") + public Result> getInfo(@PathVariable("id") Long id) + { + return success(sysFenceService.selectSysFenceById(id)); + } + + /** + * 新增围栏组 + */ + @RequiresPermissions("fence:fence:add") + @PostMapping + public Result add( + @Validated @RequestBody SysFence sysFence) + { + + return toAjax(sysFenceService.save(sysFence)); + } + + /** + * 修改围栏组 + */ + @RequiresPermissions("fence:fence:edit") + @PutMapping + public Result edit( + @Validated @RequestBody SysFence sysFence) + { + + return toAjax(sysFenceService.updateById(sysFence)); + } + + /** + * 删除围栏组 + */ + @RequiresPermissions("fence:fence:remove") + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) + { + sysFenceService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java new file mode 100644 index 0000000..2f85c6e --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysCorpuscle.java @@ -0,0 +1,67 @@ +package com.muyu.carrail.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; + +/** + * 电子围栏对象 sys_corpuscle_fence + * + * @author muyu + * @date 2024-09-17 + */ + +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_corpuscle_fence") +public class SysCorpuscle{ + private static final long serialVersionUID = 1L; + + /** 自增主键 */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 围栏编码 */ + @Excel(name = "围栏编码") + private String fenceCode; + + /** 围栏名称 */ + @Excel(name = "围栏名称") + private String fenceName; + + /** 围栏类型(1.驶入 2.驶出) */ + @Excel(name = "围栏类型(1.驶入 2.驶出)") + private Long fenceType; + + /** 围栏位置 */ + @Excel(name = "围栏位置") + private String fencePosition; + + /** 启用状态(1.启用 2.停用) */ + @Excel(name = "启用状态(1.启用 2.停用)") + private String state; + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("fenceCode", getFenceCode()) + .append("fenceName", getFenceName()) + .append("fenceType", getFenceType()) + .append("fencePosition", getFencePosition()) + .append("state", getState()) + .toString(); + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java new file mode 100644 index 0000000..b7d068b --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/domain/SysFence.java @@ -0,0 +1,95 @@ +package com.muyu.carrail.domain; + +import cn.hutool.core.date.DateTime; +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; + +import java.util.Date; + +/** + * 围栏组对象 sys_fence_group + * + * @author muyu + * @date 2024-09-17 + */ + +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_fence_group") +public class SysFence{ + private static final long serialVersionUID = 1L; + + /** 自增主键 */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 围栏组编码 */ + @Excel(name = "围栏组编码") + private String groupCode; + + /** 围栏组名称 */ + @Excel(name = "围栏组名称") + private String groupName; + + /** 围栏组类型 */ + @Excel(name = "围栏组类型") + private String groupType; + + /** 启用状态 */ + @Excel(name = "启用状态") + private String state; + + /** 创建人 */ + @Excel(name = "创建人") + private String createBy; + + /** 创建时间 */ + @Excel(name = "创建时间") + private Date createTime; + + /** 更新人 */ + @Excel(name = "更新人") + private String updateBy; + + /** 更新时间 */ + @Excel(name = "更新时间") + private Date updateTime; + + /** 启用状态 */ + @Excel(name = "启用状态") + private String remark; + +// /** sysfindname */ +// @Excel(name = "电子围栏集群") +// private String sysfindname; + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("groupCode", getGroupCode()) + .append("groupName", getGroupName()) + .append("groupType", getGroupType()) + .append("state", getState()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) +// .append("sysfindname", getSysfindname()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java new file mode 100644 index 0000000..b2cb32e --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysCorpuscleMapper.java @@ -0,0 +1,21 @@ +package com.muyu.carrail.mapper; + +import java.util.List; +import com.muyu.carrail.domain.SysCorpuscle; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 电子围栏Mapper接口 + * + * @author muyu + * @date 2024-09-17 + */ + +public interface SysCorpuscleMapper extends BaseMapper{ + + List selectCarRail(SysCorpuscle sysCorpuscle); + + boolean addCarRail(SysCorpuscle sysCorpuscle); + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java new file mode 100644 index 0000000..725c176 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/mapper/SysFenceMapper.java @@ -0,0 +1,16 @@ +package com.muyu.carrail.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.carrail.domain.SysFence; +import org.apache.ibatis.annotations.Mapper; + +/** + * 围栏组Mapper接口 + * + * @author muyu + * @date 2024-09-17 + */ +public interface SysFenceMapper extends BaseMapper{ + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java new file mode 100644 index 0000000..276b2d4 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysCorpuscleService.java @@ -0,0 +1,25 @@ +package com.muyu.carrail.service; + +import java.util.List; +import com.muyu.carrail.domain.SysCorpuscle; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 电子围栏Service接口 + * + * @author muyu + * @date 2024-09-17 + */ +public interface ISysCorpuscleService extends IService { + + /** + * 查询电子围栏列表 + * + * @param sysCorpuscle 电子围栏 + * @return 电子围栏集合 + */ + public List selectSysCorpuscleList(SysCorpuscle sysCorpuscle); + + + boolean checkIdUnique(SysCorpuscle sysCorpuscle); +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java new file mode 100644 index 0000000..7ba33a8 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/ISysFenceService.java @@ -0,0 +1,38 @@ +package com.muyu.carrail.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.carrail.domain.SysFence; + +/** + * 围栏组Service接口 + * + * @author muyu + * @date 2024-09-17 + */ +public interface ISysFenceService extends IService { + /** + * 精确查询围栏组 + * + * @param id 围栏组主键 + * @return 围栏组 + */ + public SysFence selectSysFenceById(Long id); + + /** + * 查询围栏组列表 + * + * @param sysFence 围栏组 + * @return 围栏组集合 + */ + public List selectSysFenceList(SysFence sysFence); + + /** + * 判断 围栏组 id是否唯一 + * @param sysFence 围栏组 + * @return 结果 + */ + Boolean checkIdUnique(SysFence sysFence); + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysCorpuscleServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysCorpuscleServiceImpl.java new file mode 100644 index 0000000..61024fe --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysCorpuscleServiceImpl.java @@ -0,0 +1,43 @@ +package com.muyu.carrail.service.impl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.muyu.carrail.mapper.SysCorpuscleMapper; +import com.muyu.carrail.domain.SysCorpuscle; +import com.muyu.carrail.service.ISysCorpuscleService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.util.Assert; + +/** + * 电子围栏Service业务层处理 + * + * @author muyu + * @date 2024-09-17 + */ +@Service +public class SysCorpuscleServiceImpl + extends ServiceImpl + implements ISysCorpuscleService { + + /** + * 精确查询电子围栏 + * + * @param id 电子围栏主键 + * @return 电子围栏 + */ + @Autowired + SysCorpuscleMapper sysCorpuscleMapper; + + @Override + public List selectSysCorpuscleList(SysCorpuscle sysCorpuscle) { + return sysCorpuscleMapper.selectCarRail(sysCorpuscle); + } + + @Override + public boolean checkIdUnique(SysCorpuscle sysCorpuscle) { + return sysCorpuscleMapper.addCarRail(sysCorpuscle); + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysFenceServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysFenceServiceImpl.java new file mode 100644 index 0000000..5ebffcc --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/carrail/service/impl/SysFenceServiceImpl.java @@ -0,0 +1,63 @@ +package com.muyu.carrail.service.impl; + +import java.util.List; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.carrail.domain.SysCorpuscle; +import com.muyu.carrail.domain.SysFence; +import com.muyu.carrail.mapper.SysFenceMapper; +import com.muyu.carrail.service.ISysFenceService; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + + + +/** + * 围栏组Service业务层处理 + * + * @author muyu + * @date 2024-09-17 + */ +@Service +public class SysFenceServiceImpl + extends ServiceImpl + implements ISysFenceService { + + + @Override + public SysFence selectSysFenceById(Long id) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(SysFence::getId, id); + return this.getOne(queryWrapper); + } + + @Override + public List selectSysFenceList(SysFence sysFence) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysFence.getGroupCode())){ + queryWrapper.eq(SysFence::getGroupCode, sysFence.getGroupCode()); + } + if (StringUtils.isNotEmpty(sysFence.getGroupName())){ + queryWrapper.like(SysFence::getGroupName, sysFence.getGroupName()); + } + if (StringUtils.isNotEmpty(sysFence.getGroupType())){ + queryWrapper.eq(SysFence::getGroupType, sysFence.getGroupType()); + } + if (StringUtils.isNotEmpty(sysFence.getState())){ + queryWrapper.eq(SysFence::getState, sysFence.getState()); + } + return this.list(queryWrapper); + + } + + @Override + public Boolean checkIdUnique(SysFence sysFence) { + return null; + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..d1b64a8 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml @@ -0,0 +1,58 @@ +# Tomcat +server: + port: 10011 + +# nacos线上地址 +nacos: + addr: 110.42.213.184:8848 + user-name: nacos + password: nacos + namespace: public +# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all +# Spring +spring: + amqp: + deserialization: + trust: + all: true + main: + allow-bean-definition-overriding: true + application: + # 应用名称 + name: cloud-car + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + config: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +logging: + level: + com.muyu.carrail.mapper: DEBUG + diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml new file mode 100644 index 0000000..26be2dc --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SysFenceMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + select id, group_code, group_name, group_type, state, create_by, create_time, update_by, update_time, remark from sys_fence_group + + + + + + + + + + + delete from sys_fence_group where id = #{id} + + + + delete from sys_fence_group where id in + + #{id} + + + diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml new file mode 100644 index 0000000..c9f9205 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/carrail/SyscarRailMapper.xml @@ -0,0 +1,16 @@ + + + + + + insert into sys_corpuscle_fence(fence_code,fence_name,fence_type,fence_position,state) + values(#{fenceCode},#{fenceName},#{fenceType},#{fencePosition},#{state}) + + + + + diff --git a/cloud-modules/cloud-modules-rail/pom.xml b/cloud-modules/cloud-modules-rail/pom.xml new file mode 100644 index 0000000..2353a2c --- /dev/null +++ b/cloud-modules/cloud-modules-rail/pom.xml @@ -0,0 +1,91 @@ + + + + cloud-modules + com.muyu + 3.6.3 + + 4.0.0 + + cloud-modules-rail + + + 17 + 17 + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + com.muyu + cloud-common-core + + + + com.muyu + cloud-common-api-doc + + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java new file mode 100644 index 0000000..47aba27 --- /dev/null +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/CloudRailApplication.java @@ -0,0 +1,4 @@ +package com.zhangyi.rail; + +public class CloudRailApplication { +} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java new file mode 100644 index 0000000..be833e0 --- /dev/null +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/controller/RailController.java @@ -0,0 +1,4 @@ +package com.zhangyi.rail.controller; + +public class RailController { +} diff --git a/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java new file mode 100644 index 0000000..dc11dbd --- /dev/null +++ b/cloud-modules/cloud-modules-rail/src/main/java/com/zhangyi/rail/domain/SysFenceRail.java @@ -0,0 +1,38 @@ +package com.zhangyi.rail.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import lombok.*; +import lombok.experimental.SuperBuilder; + +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_corpuscle_fence") +public class SysFenceRail { +private static final long seriaversionUID =1L; +/** 自增主键 */ +@TableId(type = IdType.AUTO) + private Long id; + +/** 围栏编码 */ +@Excel(name="围栏编码") + private String fenceCode; + /**围栏名称**/ + @Excel(name = "围栏名称") + private String fenceName; + + /**围栏类型**/ + @Excel(name = "围栏类型") + private Long fenceType; + + + + + +}