diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 96b49636..76d5a7da 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -119,7 +119,7 @@ security: - /error - /*/api-docs - /*/api-docs/** - - /warm-flow-ui/config + - /warm-flow-ui/** - /other/ys7Device/webhook # todo 仅测试 - /facility/matrix/** @@ -244,6 +244,8 @@ springdoc: packages-to-scan: org.dromara.workflow - group: 14.罗成模块 packages-to-scan: org.dromara.cory + - group: 15.无人机模块 + packages-to-scan: org.dromara.drone - group: 20.代码生成模块 packages-to-scan: org.dromara.generator # knife4j的增强配置，不需要增强可以不配 diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java index 4c53ecb1..13a79416 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java @@ -33,8 +33,8 @@ public class BaseEntity implements Serializable { /** * 创建部门 */ -/* @TableField(fill = FieldFill.INSERT) - private Long createDept;*/ + @TableField(fill = FieldFill.INSERT) + private Long createDept; /** * 创建者 diff --git a/xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java index 5cb96c35..fec25792 100644 --- a/xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java +++ b/xinnengyuan/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -44,7 +44,7 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler { // 填充创建人、更新人和创建部门信息 baseEntity.setCreateBy(userId); baseEntity.setUpdateBy(userId); -// baseEntity.setCreateDept(ObjectUtils.notNull(baseEntity.getCreateDept(), loginUser.getDeptId())); + baseEntity.setCreateDept(ObjectUtils.notNull(baseEntity.getCreateDept(), loginUser.getDeptId())); } } } else { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/config/WebMvcConfig.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/config/WebMvcConfig.java deleted file mode 100644 index e27a2ec1..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/config/WebMvcConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.dromara.common.config; - -import jakarta.annotation.Resource; -import lombok.Data; -import org.dromara.common.interceptor.ValidProjectInterceptor; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -import java.util.List; - -/** - * @author lcj - * @date 2025/7/8 9:06 - */ -@Data -@Configuration -@ConfigurationProperties(prefix = "security") -public class WebMvcConfig implements WebMvcConfigurer { - - @Resource - private ValidProjectInterceptor validProjectInterceptor; - - /** - * 排除路径 - */ - private List excludes; - - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(validProjectInterceptor) - .addPathPatterns("/**") - .excludePathPatterns(excludes) - .excludePathPatterns("/resource/sse/**", "/auth/**", "/system/user/**", "/project/projectRelevancy/login/list", "/system/menu/getRouters"); - } -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/interceptor/ValidProjectInterceptor.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/interceptor/ValidProjectInterceptor.java deleted file mode 100644 index 792794c9..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/interceptor/ValidProjectInterceptor.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.dromara.common.interceptor; - -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.HttpStatus; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.project.service.IBusProjectService; -import org.springframework.stereotype.Component; -import org.springframework.web.servlet.HandlerInterceptor; - -/** - * @author lcj - * @date 2025/7/7 19:57 - */ -@Slf4j -@Component -public class ValidProjectInterceptor implements HandlerInterceptor { - - @Resource - private IBusProjectService projectService; - - // 请求前执行 - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - String projectId = request.getHeader("projectId"); - Long userId = LoginHelper.getUserId(); - if (StringUtils.isBlank(projectId) || userId == null) { - throw new ServiceException("无访问权限", HttpStatus.FORBIDDEN); - } - projectService.validAuth(Long.valueOf(projectId), userId); - // 返回 true 表示继续执行；false 则请求被终止 - return true; - } - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUser.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUser.java index 8e5a4f34..5f6b7f02 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUser.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUser.java @@ -1,7 +1,6 @@ package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -185,16 +184,4 @@ public class SubConstructionUser extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUserFile.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUserFile.java index bdddb92f..da3d57ed 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUserFile.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubConstructionUserFile.java @@ -57,5 +57,4 @@ public class SubConstructionUserFile implements Serializable { */ private String remark; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractor.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractor.java index 9fc44afd..5849e8a6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractor.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractor.java @@ -1,14 +1,12 @@ package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 分包单位对象 sub_contractor @@ -80,16 +78,4 @@ public class SubContractor extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterial.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterial.java index 24370f17..4676386b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterial.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorMaterial.java @@ -1,7 +1,6 @@ package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +8,6 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.math.BigDecimal; -import java.util.Date; /** * 分包方物料对象 sub_contractor_material @@ -76,15 +74,4 @@ public class SubContractorMaterial extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorTool.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorTool.java index 9f9c92c2..9912a57a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorTool.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/SubContractorTool.java @@ -1,7 +1,6 @@ package org.dromara.contractor.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +8,6 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.math.BigDecimal; -import java.util.Date; /** * 分包方工器具对象 sub_contractor_tool @@ -71,15 +69,4 @@ public class SubContractorTool extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactformtemplate.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactformtemplate.java index 6b6c8c01..a3894789 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactformtemplate.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/BusContactformtemplate.java @@ -1,11 +1,11 @@ package org.dromara.cory.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/controller/DroDroneConfigController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/controller/DroDroneConfigController.java new file mode 100644 index 00000000..2e98c41b --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/controller/DroDroneConfigController.java @@ -0,0 +1,105 @@ +package org.dromara.drone.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.drone.domain.vo.DroDroneConfigVo; +import org.dromara.drone.domain.bo.DroDroneConfigBo; +import org.dromara.drone.service.IDroDroneConfigService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 无人机配置 + * + * @author lcj + * @date 2025-07-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/drone/droneConfig") +public class DroDroneConfigController extends BaseController { + + private final IDroDroneConfigService droDroneConfigService; + + /** + * 查询无人机配置列表 + */ + @SaCheckPermission("drone:droneConfig:list") + @GetMapping("/list") + public TableDataInfo list(DroDroneConfigBo bo, PageQuery pageQuery) { + return droDroneConfigService.queryPageList(bo, pageQuery); + } + + /** + * 导出无人机配置列表 + */ + @SaCheckPermission("drone:droneConfig:export") + @Log(title = "无人机配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(DroDroneConfigBo bo, HttpServletResponse response) { + List list = droDroneConfigService.queryList(bo); + ExcelUtil.exportExcel(list, "无人机配置", DroDroneConfigVo.class, response); + } + + /** + * 获取无人机配置详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("drone:droneConfig:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(droDroneConfigService.queryById(id)); + } + + /** + * 新增无人机配置 + */ + @SaCheckPermission("drone:droneConfig:add") + @Log(title = "无人机配置", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody DroDroneConfigBo bo) { + return toAjax(droDroneConfigService.insertByBo(bo)); + } + + /** + * 修改无人机配置 + */ + @SaCheckPermission("drone:droneConfig:edit") + @Log(title = "无人机配置", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody DroDroneConfigBo bo) { + return toAjax(droDroneConfigService.updateByBo(bo)); + } + + /** + * 删除无人机配置 + * + * @param ids 主键串 + */ + @SaCheckPermission("drone:droneConfig:remove") + @Log(title = "无人机配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(droDroneConfigService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/DroDroneConfig.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/DroDroneConfig.java new file mode 100644 index 00000000..b6abc188 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/DroDroneConfig.java @@ -0,0 +1,66 @@ +package org.dromara.drone.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 无人机配置对象 dro_drone_config + * + * @author lcj + * @date 2025-07-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dro_drone_config") +public class DroDroneConfig extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 项目id + */ + private Long projectId; + + /** + * 无人机服务地址 + */ + private String dockSocketUrl; + + /** + * ai识别服务地址 + */ + private String aiUrl; + + /** + * srs服务器地址 + */ + private String srsUrl; + + /** + * srs(rtmp服务端口) + */ + private String rtmpPort; + + /** + * srs(webrtc服务端口) + */ + private String rtcPort; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/bo/DroDroneConfigBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/bo/DroDroneConfigBo.java new file mode 100644 index 00000000..5b4f87e6 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/bo/DroDroneConfigBo.java @@ -0,0 +1,71 @@ +package org.dromara.drone.domain.bo; + +import org.dromara.drone.domain.DroDroneConfig; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 无人机配置业务对象 dro_drone_config + * + * @author lcj + * @date 2025-07-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DroDroneConfig.class, reverseConvertGenerate = false) +public class DroDroneConfigBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 项目id + */ + @NotNull(message = "项目id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long projectId; + + /** + * 无人机服务地址 + */ + @NotBlank(message = "无人机服务地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String dockSocketUrl; + + /** + * ai识别服务地址 + */ + @NotBlank(message = "ai识别服务地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String aiUrl; + + /** + * srs服务器地址 + */ + @NotBlank(message = "srs服务器地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String srsUrl; + + /** + * srs(rtmp服务端口) + */ + @NotBlank(message = "srs(rtmp服务端口)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String rtmpPort; + + /** + * srs(webrtc服务端口) + */ + @NotBlank(message = "srs(webrtc服务端口)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String rtcPort; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/vo/DroDroneConfigVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/vo/DroDroneConfigVo.java new file mode 100644 index 00000000..398badfe --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/vo/DroDroneConfigVo.java @@ -0,0 +1,80 @@ +package org.dromara.drone.domain.vo; + +import org.dromara.drone.domain.DroDroneConfig; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 无人机配置视图对象 dro_drone_config + * + * @author lcj + * @date 2025-07-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DroDroneConfig.class) +public class DroDroneConfigVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 项目id + */ + @ExcelProperty(value = "项目id") + private Long projectId; + + /** + * 无人机服务地址 + */ + @ExcelProperty(value = "无人机服务地址") + private String dockSocketUrl; + + /** + * ai识别服务地址 + */ + @ExcelProperty(value = "ai识别服务地址") + private String aiUrl; + + /** + * srs服务器地址 + */ + @ExcelProperty(value = "srs服务器地址") + private String srsUrl; + + /** + * srs(rtmp服务端口) + */ + @ExcelProperty(value = "srs(rtmp服务端口)") + private String rtmpPort; + + /** + * srs(webrtc服务端口) + */ + @ExcelProperty(value = "srs(webrtc服务端口)") + private String rtcPort; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/mapper/DroDroneConfigMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/mapper/DroDroneConfigMapper.java new file mode 100644 index 00000000..78830575 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/mapper/DroDroneConfigMapper.java @@ -0,0 +1,15 @@ +package org.dromara.drone.mapper; + +import org.dromara.drone.domain.DroDroneConfig; +import org.dromara.drone.domain.vo.DroDroneConfigVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 无人机配置Mapper接口 + * + * @author lcj + * @date 2025-07-08 + */ +public interface DroDroneConfigMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/IDroDroneConfigService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/IDroDroneConfigService.java new file mode 100644 index 00000000..67c3ebe3 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/IDroDroneConfigService.java @@ -0,0 +1,68 @@ +package org.dromara.drone.service; + +import org.dromara.drone.domain.vo.DroDroneConfigVo; +import org.dromara.drone.domain.bo.DroDroneConfigBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 无人机配置Service接口 + * + * @author lcj + * @date 2025-07-08 + */ +public interface IDroDroneConfigService { + + /** + * 查询无人机配置 + * + * @param id 主键 + * @return 无人机配置 + */ + DroDroneConfigVo queryById(Long id); + + /** + * 分页查询无人机配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 无人机配置分页列表 + */ + TableDataInfo queryPageList(DroDroneConfigBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的无人机配置列表 + * + * @param bo 查询条件 + * @return 无人机配置列表 + */ + List queryList(DroDroneConfigBo bo); + + /** + * 新增无人机配置 + * + * @param bo 无人机配置 + * @return 是否新增成功 + */ + Boolean insertByBo(DroDroneConfigBo bo); + + /** + * 修改无人机配置 + * + * @param bo 无人机配置 + * @return 是否修改成功 + */ + Boolean updateByBo(DroDroneConfigBo bo); + + /** + * 校验并批量删除无人机配置信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/impl/DroDroneConfigServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/impl/DroDroneConfigServiceImpl.java new file mode 100644 index 00000000..457c1e63 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/impl/DroDroneConfigServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.drone.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.drone.domain.bo.DroDroneConfigBo; +import org.dromara.drone.domain.vo.DroDroneConfigVo; +import org.dromara.drone.domain.DroDroneConfig; +import org.dromara.drone.mapper.DroDroneConfigMapper; +import org.dromara.drone.service.IDroDroneConfigService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 无人机配置Service业务层处理 + * + * @author lcj + * @date 2025-07-08 + */ +@RequiredArgsConstructor +@Service +public class DroDroneConfigServiceImpl implements IDroDroneConfigService { + + private final DroDroneConfigMapper baseMapper; + + /** + * 查询无人机配置 + * + * @param id 主键 + * @return 无人机配置 + */ + @Override + public DroDroneConfigVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询无人机配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 无人机配置分页列表 + */ + @Override + public TableDataInfo queryPageList(DroDroneConfigBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的无人机配置列表 + * + * @param bo 查询条件 + * @return 无人机配置列表 + */ + @Override + public List queryList(DroDroneConfigBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DroDroneConfigBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(DroDroneConfig::getId); + lqw.eq(bo.getProjectId() != null, DroDroneConfig::getProjectId, bo.getProjectId()); + return lqw; + } + + /** + * 新增无人机配置 + * + * @param bo 无人机配置 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DroDroneConfigBo bo) { + DroDroneConfig add = MapstructUtils.convert(bo, DroDroneConfig.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改无人机配置 + * + * @param bo 无人机配置 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DroDroneConfigBo bo) { + DroDroneConfig update = MapstructUtils.convert(bo, DroDroneConfig.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DroDroneConfig entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除无人机配置信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java index 0b6c30c8..4280300d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacBoxTransformer.java @@ -1,7 +1,6 @@ package org.dromara.facility.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +8,6 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.time.LocalDate; -import java.util.Date; /** * 设施-箱变对象 fac_box_transformer @@ -81,15 +79,4 @@ public class FacBoxTransformer extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java index 1025104f..89aa38b4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacInverter.java @@ -1,7 +1,6 @@ package org.dromara.facility.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,7 +8,6 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.time.LocalDate; -import java.util.Date; /** * 设施-逆变器对象 fac_inverter @@ -81,15 +79,4 @@ public class FacInverter extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacMatrix.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacMatrix.java index c9689f4d..6839507c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacMatrix.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/FacMatrix.java @@ -1,14 +1,12 @@ package org.dromara.facility.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 设施-方阵对象 fac_matrix @@ -50,15 +48,4 @@ public class FacMatrix extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachinery.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachinery.java index a1d04724..c308c56f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachinery.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachinery.java @@ -1,14 +1,12 @@ package org.dromara.machinery.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 机械对象 eqp_machinery @@ -70,16 +68,4 @@ public class EqpMachinery extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachineryDetail.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachineryDetail.java index a8a9a911..f84ca7ac 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachineryDetail.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/EqpMachineryDetail.java @@ -1,7 +1,6 @@ package org.dromara.machinery.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -75,16 +74,4 @@ public class EqpMachineryDetail extends BaseEntity { */ private Long machineryId; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatCompany.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatCompany.java index b6afe5a9..205f75d6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatCompany.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatCompany.java @@ -1,14 +1,12 @@ package org.dromara.materials.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 公司对象 mat_company @@ -65,16 +63,4 @@ public class MatCompany extends BaseEntity { */ private String qualification; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterials.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterials.java index e788cfd5..a84c7dbe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterials.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterials.java @@ -1,14 +1,12 @@ package org.dromara.materials.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 材料名称对象 mat_materials @@ -80,16 +78,4 @@ public class MatMaterials extends BaseEntity { */ private String status; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialsInventory.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialsInventory.java index b1f1e73e..6b3d42eb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialsInventory.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialsInventory.java @@ -1,7 +1,6 @@ package org.dromara.materials.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -90,16 +89,4 @@ public class MatMaterialsInventory extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/controller/OthYs7DeviceController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/controller/OthYs7DeviceController.java index 461c7b54..fe9d7a38 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/controller/OthYs7DeviceController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/controller/OthYs7DeviceController.java @@ -146,23 +146,15 @@ public class OthYs7DeviceController extends BaseController { @RequestMapping(value = "/webhook") public ResponseEntity webhook(@RequestHeader HttpHeaders header, @RequestBody String body) { WebhookMessage receiveMessage; - log.info("消息获取时间:{}, 请求头:{},请求体:{}", System.currentTimeMillis(), JSONUtil.toJsonStr(header), body); - System.out.println("收到的消息:" + body); + log.info("消息获取时间:{}, 收到的消息:{}", System.currentTimeMillis(), body); receiveMessage = JSONUtil.toBean(body, WebhookMessage.class); - // todo:对收到的消息进行处理,最好发送到其他中间件,或者写到数据库中,不要影响回调地址的处理 othYs7DeviceService.webhook(receiveMessage); // 必须进行返回 Map result = new HashMap<>(1); assert receiveMessage != null; String messageId = receiveMessage.getHeader().getMessageId(); result.put("messageId", messageId); - final ResponseEntity resp = ResponseEntity.ok(JSONUtil.toJsonStr(result)); - log.info("返回的信息:{}", JSONUtil.toJsonStr(result)); - return resp; + return ResponseEntity.ok(JSONUtil.toJsonStr(result)); } - @RequestMapping(value = "/test") - public R test() { - return R.ok("操作成功", "测试成功"); - } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressPlan.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressPlan.java index 8f3773d8..e029adb6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressPlan.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressPlan.java @@ -1,7 +1,6 @@ package org.dromara.progress.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -80,16 +79,4 @@ public class PgsProgressPlan extends BaseEntity { */ private Long delayNumber; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressPlanDetail.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressPlanDetail.java index 84714727..9c27b2b0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressPlanDetail.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressPlanDetail.java @@ -1,7 +1,6 @@ package org.dromara.progress.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -70,16 +69,4 @@ public class PgsProgressPlanDetail extends BaseEntity { */ private Long aiFill; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java index 24db9c54..dcb47cda 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendance.java @@ -1,7 +1,6 @@ package org.dromara.project.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -110,15 +109,4 @@ public class BusAttendance extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionBlacklist.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionBlacklist.java index 2671cc58..d05f9651 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionBlacklist.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusConstructionBlacklist.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.io.Serializable; @@ -16,12 +18,13 @@ import java.util.Date; * @author lcj * @date 2025-03-27 */ +@EqualsAndHashCode(callSuper = true) @Data @TableName("bus_construction_blacklist") -public class BusConstructionBlacklist implements Serializable { +public class BusConstructionBlacklist extends BaseEntity { @Serial - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 2723907622284296331L; /** * 主键id @@ -54,16 +57,4 @@ public class BusConstructionBlacklist implements Serializable { */ private String remark; - /** - * 创建者 - */ - @TableField(fill = FieldFill.INSERT) - private Long createBy; - - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - private Date createTime; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java index 1acb7a58..94103322 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java @@ -151,5 +151,4 @@ public class BusProject extends BaseEntity { @TableLogic private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectNews.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectNews.java index 1814e62d..543adaf4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectNews.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectNews.java @@ -1,14 +1,12 @@ package org.dromara.project.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 项目新闻对象 bus_project_news @@ -50,15 +48,4 @@ public class BusProjectNews extends BaseEntity { */ private String file; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java index c1452bbb..08f9182a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeam.java @@ -1,14 +1,12 @@ package org.dromara.project.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 项目班组对象 bus_project_team @@ -50,16 +48,4 @@ public class BusProjectTeam extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeamMember.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeamMember.java index be212ad7..071c9bca 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeamMember.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProjectTeamMember.java @@ -52,11 +52,6 @@ public class BusProjectTeamMember implements Serializable { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - /** * 创建时间 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusReissueCard.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusReissueCard.java index db4d285f..9bb0991e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusReissueCard.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusReissueCard.java @@ -1,7 +1,6 @@ package org.dromara.project.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -125,15 +124,4 @@ public class BusReissueCard extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusUserProjectRelevancy.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusUserProjectRelevancy.java index 92b1f115..092d3c1a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusUserProjectRelevancy.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusUserProjectRelevancy.java @@ -3,10 +3,9 @@ package org.dromara.project.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.io.Serializable; /** * 系统用户与项目关联对象 user_project_relevancy @@ -15,9 +14,8 @@ import java.io.Serial; * @date 2025-03-04 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("bus_user_project_relevancy") -public class BusUserProjectRelevancy extends BaseEntity { +public class BusUserProjectRelevancy implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusWorkWage.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusWorkWage.java index 1708f90e..d47d530a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusWorkWage.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusWorkWage.java @@ -1,14 +1,12 @@ package org.dromara.project.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 工种薪水对象 bus_work_wage @@ -65,16 +63,4 @@ public class BusWorkWage extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusWorkerDailyReport.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusWorkerDailyReport.java index af6dc35d..69a4cae0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusWorkerDailyReport.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusWorkerDailyReport.java @@ -1,7 +1,6 @@ package org.dromara.project.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -125,15 +124,4 @@ public class BusWorkerDailyReport extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityConstructionLog.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityConstructionLog.java index 77b499f5..31f60b98 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityConstructionLog.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityConstructionLog.java @@ -1,7 +1,6 @@ package org.dromara.quality.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -60,15 +59,4 @@ public class QltQualityConstructionLog extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityInspection.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityInspection.java index f40f1345..7f61e05a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityInspection.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/QltQualityInspection.java @@ -1,7 +1,6 @@ package org.dromara.quality.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -115,15 +114,4 @@ public class QltQualityInspection extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionBank.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionBank.java index 6eed4537..f98c7c86 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionBank.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionBank.java @@ -1,14 +1,12 @@ package org.dromara.safety.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 题库对象 hse_question_bank @@ -65,16 +63,4 @@ public class HseQuestionBank extends BaseEntity { */ private String wxOrPc; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionUserAnswer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionUserAnswer.java index 11579b8c..4ee1b645 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionUserAnswer.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionUserAnswer.java @@ -1,14 +1,12 @@ package org.dromara.safety.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 用户试卷存储对象 hse_question_user_answer @@ -80,16 +78,4 @@ public class HseQuestionUserAnswer extends BaseEntity { */ private String examType; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsConfig.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsConfig.java index 1b86e769..99b9e57e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsConfig.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseQuestionsConfig.java @@ -76,5 +76,4 @@ public class HseQuestionsConfig implements Serializable { */ private Long answerTime; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRecognizeRecord.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRecognizeRecord.java index 645775b0..3f09eb2b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRecognizeRecord.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRecognizeRecord.java @@ -1,7 +1,6 @@ package org.dromara.safety.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -83,15 +82,4 @@ public class HseRecognizeRecord implements Serializable { */ private Date updateTime; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java index 15fca8a9..4da68fc6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java @@ -1,7 +1,6 @@ package org.dromara.safety.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -135,15 +134,4 @@ public class HseSafetyInspection extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyLog.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyLog.java index 3ed66f6c..00da4ebb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyLog.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyLog.java @@ -1,14 +1,12 @@ package org.dromara.safety.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 安全日志对象 hse_safety_log @@ -110,15 +108,4 @@ public class HseSafetyLog extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java index 601c4746..a7e87913 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java @@ -1,14 +1,12 @@ package org.dromara.safety.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.util.Date; /** * 安全周报对象 hse_safety_weekly_report @@ -60,15 +58,4 @@ public class HseSafetyWeeklyReport extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java index 9f83b7a7..b29e143b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java @@ -1,7 +1,6 @@ package org.dromara.safety.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -75,15 +74,4 @@ public class HseTeamMeeting extends BaseEntity { */ private String remark; - /** - * 删除时间 - */ - private Date deletedAt; - - /** - * 是否删除（0正常 1删除） - */ - @TableLogic - private Long isDelete; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/drone/DroDroneConfigMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/drone/DroDroneConfigMapper.xml new file mode 100644 index 00000000..6c6418ac --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/drone/DroDroneConfigMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowDesignController.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowDesignController.java new file mode 100644 index 00000000..3650bb03 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowDesignController.java @@ -0,0 +1,19 @@ +package org.dromara.workflow.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author lcj + * @date 2025/7/8 15:23 + */ +@RestController +@RequestMapping("/workflow/design") +public class WorkflowDesignController { + + @RequestMapping("/index") + public String forwardWorkflowDesign() { + return "forward:/index.html"; + } + +} diff --git a/xinnengyuan/script/sql/menuInitValue.sql b/xinnengyuan/script/sql/menuInitValue.sql index 039f6d25..2e506dae 100644 --- a/xinnengyuan/script/sql/menuInitValue.sql +++ b/xinnengyuan/script/sql/menuInitValue.sql @@ -1107,3 +1107,23 @@ values(1941032233947213830, '物料领料单明细项删除', 194103223394721382 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) values(1941032233947213831, '物料领料单明细项导出', 1941032233947213826, '5', '#', '', 1, 0, 'F', '0', '0', 'materials:materialIssueItem:export', '#', 103, 1, sysdate(), null, null, ''); + +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1942399191372275713, '无人机配置', '1922479275240435713', '1', 'droneConfig', 'drone/droneConfig/index', 1, 0, 'C', '0', '0', 'drone:droneConfig:list', '#', 103, 1, sysdate(), null, null, '无人机配置菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1942399191372275714, '无人机配置查询', 1942399191372275713, '1', '#', '', 1, 0, 'F', '0', '0', 'drone:droneConfig:query', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1942399191372275715, '无人机配置新增', 1942399191372275713, '2', '#', '', 1, 0, 'F', '0', '0', 'drone:droneConfig:add', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1942399191372275716, '无人机配置修改', 1942399191372275713, '3', '#', '', 1, 0, 'F', '0', '0', 'drone:droneConfig:edit', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1942399191372275717, '无人机配置删除', 1942399191372275713, '4', '#', '', 1, 0, 'F', '0', '0', 'drone:droneConfig:remove', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(1942399191372275718, '无人机配置导出', 1942399191372275713, '5', '#', '', 1, 0, 'F', '0', '0', 'drone:droneConfig:export', '#', 103, 1, sysdate(), null, null, ''); diff --git a/xinnengyuan/script/sql/xinnengyuan.sql b/xinnengyuan/script/sql/xinnengyuan.sql index 555dfdb0..852b723f 100644 --- a/xinnengyuan/script/sql/xinnengyuan.sql +++ b/xinnengyuan/script/sql/xinnengyuan.sql @@ -1545,3 +1545,19 @@ CREATE TABLE `mat_material_issue_item` index `idx_issue_id` (`issue_id` asc) using btree comment '领料单id' ) comment '物料领料单明细项' collate = utf8mb4_unicode_ci; +DROP TABLE IF EXISTS `dro_drone_config`; +CREATE TABLE `dro_drone_config` +( + `id` bigint not null auto_increment comment '主键id', + `project_id` bigint not null comment '项目id', + `config_name` varchar(255) null comment '配置名称', + `config_url` varchar(255) null comment '配置地址', + `remark` text null comment '备注', + `create_by` bigint null comment '创建者', + `update_by` bigint null comment '更新者', + `create_time` datetime default CURRENT_TIMESTAMP null comment '创建时间', + `update_time` datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间', + primary key (`id`) using btree, + index `idx_project_id` (`project_id` asc) using btree comment '项目id' +) comment '无人机配置' collate = utf8mb4_unicode_ci; +