机器组

yangys

2025-06-03 026f276effd1efc0c342449abb7286af776379b9

机器组

 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>

 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>

 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);
        }
    }
}

 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>

 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>

 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);
    }

}


 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> {
}

 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);
    }
}

 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;
    }
}

 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> {
}

 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>

 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}


 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}

 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}

 blade-service/pom.xml

@@ -19,6 +19,7 @@
    <modules>
        <module>blade-desk</module>
        <module>blade-system</module>
        <module>blade-mdm</module>
    </modules>

    <dependencies>

 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 '创建时间',