From 026f276effd1efc0c342449abb7286af776379b9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 03 六月 2025 20:46:55 +0800
Subject: [PATCH] 机器组
---
blade-ops/blade-admin/pom.xml | 2
blade-service/blade-mdm/src/main/resources/application-prod.yml | 10 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java | 10 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/MdmApplication.java | 44 +++++++
blade-service/blade-mdm/pom.xml | 68 +++++++++++
blade-service/blade-mdm/src/main/resources/application-test.yml | 10 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml | 22 +++
blade-service/pom.xml | 1
blade-service-api/blade-mdm-api/pom.xml | 17 ++
blade-service/blade-mdm/src/main/resources/application-dev.yml | 11 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.java | 7 +
doc/sql/mdm/mdm.all.create.sql | 1
blade-service-api/pom.xml | 1
blade-service-api/blade-mdm-api/src/main/java/org/springblade/Main.java | 17 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineGroup.java | 26 ++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java | 63 ++++++++++
16 files changed, 310 insertions(+), 0 deletions(-)
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index 76408f9..eb8d10a 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -83,11 +83,13 @@
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
</dependency>-->
<!--Taobao-Sdk-->
+ <!--
<dependency>
<groupId>com.taobao</groupId>
<artifactId>taobao-sdk</artifactId>
<version>20201116</version>
</dependency>
+ -->
</dependencies>
<build>
diff --git a/blade-service-api/blade-mdm-api/pom.xml b/blade-service-api/blade-mdm-api/pom.xml
new file mode 100644
index 0000000..667cd4a
--- /dev/null
+++ b/blade-service-api/blade-mdm-api/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>blade-service-api</artifactId>
+ <groupId>org.springblade</groupId>
+ <version>${revision}</version>
+ </parent>
+
+ <artifactId>blade-mdm-api</artifactId>
+ <name>${project.artifactId}</name>
+ <packaging>jar</packaging>
+
+</project>
diff --git a/blade-service-api/blade-mdm-api/src/main/java/org/springblade/Main.java b/blade-service-api/blade-mdm-api/src/main/java/org/springblade/Main.java
new file mode 100644
index 0000000..acb28e2
--- /dev/null
+++ b/blade-service-api/blade-mdm-api/src/main/java/org/springblade/Main.java
@@ -0,0 +1,17 @@
+package org.springblade;
+
+//TIP 瑕�<b>杩愯</b>浠ｇ爜锛岃鎸� <shortcut actionId="Run"/> 鎴�
+// 鐐瑰嚮瑁呰鍖哄煙涓殑 <icon src="AllIcons.Actions.Execute"/> 鍥炬爣銆�
+public class Main {
+ public static void main(String[] args) {
+ //TIP 褰撴枃鏈厜鏍囦綅浜庨珮浜樉绀虹殑鏂囨湰澶勬椂鎸� <shortcut actionId="ShowIntentionActions"/>
+ // 鏌ョ湅 IntelliJ IDEA 寤鸿濡備綍淇銆�
+ System.out.printf("Hello and welcome!");
+
+ for (int i = 1; i <= 5; i++) {
+ //TIP 鎸� <shortcut actionId="Debug"/> 寮�濮嬭皟璇曚唬鐮併�傛垜浠凡缁忚缃簡涓�涓� <icon src="AllIcons.Debugger.Db_set_breakpoint"/> 鏂偣
+ // 浣嗘偍濮嬬粓鍙互閫氳繃鎸� <shortcut actionId="ToggleLineBreakpoint"/> 娣诲姞鏇村鏂偣銆�
+ System.out.println("i = " + i);
+ }
+ }
+}
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 0a715b3..cd70cf6 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -20,6 +20,7 @@
<module>blade-scope-api</module>
<module>blade-system-api</module>
<module>blade-user-api</module>
+ <module>blade-mdm-api</module>
</modules>
<dependencies>
diff --git a/blade-service/blade-mdm/pom.xml b/blade-service/blade-mdm/pom.xml
new file mode 100644
index 0000000..4e3b6ed
--- /dev/null
+++ b/blade-service/blade-mdm/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-service</artifactId>
+ <version>${revision}</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>blade-mdm</artifactId>
+ <name>${project.artifactId}</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-core-boot</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-swagger</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-mdm-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-mybatis</artifactId>
+
+ </dependency>
+
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-user-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-flow-api</artifactId>
+ </dependency>
+ <!--Oss-->
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-oss</artifactId>
+ </dependency>
+ <!--MinIO-->
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ </dependency>
+ <!--QiNiu-->
+ <dependency>
+ <groupId>com.qiniu</groupId>
+ <artifactId>qiniu-java-sdk</artifactId>
+ </dependency>
+ <!--<dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-transaction</artifactId>
+ </dependency>-->
+ </dependencies>
+
+
+
+</project>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/MdmApplication.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/MdmApplication.java
new file mode 100644
index 0000000..434b287
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/MdmApplication.java
@@ -0,0 +1,44 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.mdm;
+
+import org.springblade.core.cloud.client.BladeCloudApplication;
+import org.springblade.core.launch.BladeApplication;
+//import org.springblade.core.launch.constant.AppConstant;
+
+/**
+ * 绯荤粺妯″潡鍚姩鍣�
+ * @author Chill
+ */
+@BladeCloudApplication
+public class MdmApplication {
+
+ public static void main(String[] args) {
+ BladeApplication.run("blade-mdm", MdmApplication.class, args);
+ }
+
+}
+
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java
new file mode 100644
index 0000000..081e24c
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java
@@ -0,0 +1,10 @@
+package org.springblade.mdm.basesetting.machine;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springblade.mdm.basesetting.machine.mapper.MachineGroupMapper;
+import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
+@Service
+public class MachineGroupService extends BaseServiceImpl<MachineGroupMapper, MachineGroup> {
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java
new file mode 100644
index 0000000..cd7d908
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java
@@ -0,0 +1,63 @@
+package org.springblade.mdm.basesetting.machine.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.mdm.basesetting.machine.MachineGroupService;
+import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/machinegroup")
+@Tag(name = "鏈哄簥缁�", description = "鏈哄簥缁�")
+public class MachineGroupController {
+
+ @Autowired
+ private MachineGroupService grpService;
+
+ /**
+ * 鏂板
+ */
+ @PostMapping("/save")
+ @Operation(summary = "鏂板", description = "鏈哄簥缁勪俊鎭�")
+ public R<Boolean> save(@RequestBody MachineGroup grp) {
+
+ return R.<Boolean>status(grpService.save(grp));
+ }
+
+ /**
+ * 淇敼
+ */
+ @Operation(summary = "淇敼", description = "鏈哄簥缁勪俊鎭�")
+ @PostMapping("/update")
+ public R<Boolean> update(@RequestBody MachineGroup grp) {
+
+ return R.<Boolean>status(grpService.updateById(grp));
+ }
+
+ /**
+ * 鍒嗛〉
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
+ @GetMapping("/page")
+ public R<IPage<MachineGroup>> page(String keyword, Query query) {
+
+ LambdaQueryWrapper<MachineGroup> wrapper = new LambdaQueryWrapper<>();
+ //wrapper.like(StringUtils.isNotBlank(keyword),MachineGroup::getName, "%"+keyword+"%");
+ wrapper.and(StringUtils.isNotBlank(keyword),(w1)->{
+ w1.like(MachineGroup::getName,"%"+keyword+"%")
+ .or().like(MachineGroup::getCode,"%"+keyword+"%");
+ });
+
+ IPage<MachineGroup> pages = grpService.page(Condition.getPage(query), wrapper);
+ return R.data(pages);
+ }
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineGroup.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineGroup.java
new file mode 100644
index 0000000..6fb5e4e
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineGroup.java
@@ -0,0 +1,26 @@
+package org.springblade.mdm.basesetting.machine.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.core.mp.base.BaseEntity;
+
+@TableName("mdm_machine_group")
+public class MachineGroup extends BaseEntity {
+ private String name;
+ private String code;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.java
new file mode 100644
index 0000000..5247f41
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.java
@@ -0,0 +1,7 @@
+package org.springblade.mdm.basesetting.machine.mapper;
+
+import org.springblade.core.mp.mapper.BladeMapper;
+import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
+
+public interface MachineGroupMapper extends BladeMapper<MachineGroup> {
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml
new file mode 100644
index 0000000..814df02
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.mdm.basesetting.machine.mapper.MachineGroupMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.MachineGroup">
+ <id column="id" property="id"/>
+ <result column="code" property="code"/>
+ <result column="name" property="name"/>
+
+ <result column="status" property="status"/>
+ <result column="createTime" property="create_time"/>
+ <result column="updateTime" property="update_time"/>
+ <result column="is_deleted" property="isDeleted"/>
+ </resultMap>
+
+
+<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
+<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
+<!-- </select>-->
+
+</mapper>
diff --git a/blade-service/blade-mdm/src/main/resources/application-dev.yml b/blade-service/blade-mdm/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..732fb67
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/resources/application-dev.yml
@@ -0,0 +1,11 @@
+#鏈嶅姟鍣ㄧ鍙�
+server:
+ port: 8107
+
+#鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ url: ${blade.datasource.dev.url}
+ username: ${blade.datasource.dev.username}
+ password: ${blade.datasource.dev.password}
+
diff --git a/blade-service/blade-mdm/src/main/resources/application-prod.yml b/blade-service/blade-mdm/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..54a5e2a
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/resources/application-prod.yml
@@ -0,0 +1,10 @@
+#鏈嶅姟鍣ㄧ鍙�
+server:
+ port: 8107
+
+#鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ url: ${blade.datasource.prod.url}
+ username: ${blade.datasource.prod.username}
+ password: ${blade.datasource.prod.password}
diff --git a/blade-service/blade-mdm/src/main/resources/application-test.yml b/blade-service/blade-mdm/src/main/resources/application-test.yml
new file mode 100644
index 0000000..ebd6d77
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/resources/application-test.yml
@@ -0,0 +1,10 @@
+#鏈嶅姟鍣ㄧ鍙�
+server:
+ port: 8107
+
+#鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ url: ${blade.datasource.test.url}
+ username: ${blade.datasource.test.username}
+ password: ${blade.datasource.test.password}
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index 3df422c..7b3781c 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -19,6 +19,7 @@
<modules>
<module>blade-desk</module>
<module>blade-system</module>
+ <module>blade-mdm</module>
</modules>
<dependencies>
diff --git a/doc/sql/mdm/mdm.all.create.sql b/doc/sql/mdm/mdm.all.create.sql
index eb36590..a0ac7b1 100644
--- a/doc/sql/mdm/mdm.all.create.sql
+++ b/doc/sql/mdm/mdm.all.create.sql
@@ -2,6 +2,7 @@
`id` bigint NOT NULL COMMENT '涓婚敭',
`tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '000000' COMMENT '绉熸埛ID',
`name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鏈哄簥缁勫悕绉�',
+ `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鏈哄簥缁勭紪鍙�',
`create_user` bigint DEFAULT NULL COMMENT '鍒涘缓浜�',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓閮ㄩ棬',
`create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
--
Gitblit v1.9.3