From 78cc285f739d97d117dd2199649715529c40a199 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 04 六月 2025 15:03:13 +0800
Subject: [PATCH] 修改nacos配置
---
blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java | 8
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/entity/MachineGroup.java | 5
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.java | 16 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java | 56 ++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineSaveVO.java | 50 +++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/vo/BaseVO.java | 15 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java | 35 ++--
/dev/null | 7 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java | 13 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java | 50 +++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java | 59 ++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/controller/MachineGroupController.java | 9
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.java | 7 +
doc/sql/mdm/mdm.all.create.sql | 31 ++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.xml | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/MachineGroupService.java | 23 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml | 11 +
17 files changed, 349 insertions(+), 50 deletions(-)
diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
index 36570ee..0a550b8 100644
--- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
+++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
@@ -42,22 +42,22 @@
/**
* nacos 瀵嗙爜
*/
- String NACOS_PASSWORD = "nacos";
+ String NACOS_PASSWORD = "QW_nacos_!@#$";
/**
* nacos dev 鍦板潃
*/
- String NACOS_DEV_ADDR = "127.0.0.1:8848";
+ String NACOS_DEV_ADDR = "127.0.0.1:18848";
/**
* nacos prod 鍦板潃
*/
- String NACOS_PROD_ADDR = "172.30.0.48:8848";
+ String NACOS_PROD_ADDR = "127.0.0.1:8848";
/**
* nacos test 鍦板潃
*/
- String NACOS_TEST_ADDR = "172.30.0.48:8848";
+ String NACOS_TEST_ADDR = "127.0.0.1:8848";
/**
* sentinel dev 鍦板潃
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
deleted file mode 100644
index 2cdfb3e..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-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;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Service
-public class MachineGroupService extends BaseServiceImpl<MachineGroupMapper, MachineGroup> {
-
- @Transactional
- public void removeGroups(List<Long> ids){
- //TODO 妫�鏌ヤ笅闈㈡槸鍚︽湁鏈哄櫒
- for(Long id : ids){
-
- this.removeById(id);
- }
- }
-}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
new file mode 100644
index 0000000..f4594ab
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
@@ -0,0 +1,59 @@
+package org.springblade.mdm.basesetting.machine;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.base.BizServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
+import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
+import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
+import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
+
+ @Transactional
+ public void saveMachine(MachineSaveVO vo){
+ //TODO
+ Machine machine = new Machine();
+ BeanUtil.copyProperties(vo, machine);
+ this.save(machine);
+ }
+
+ public boolean updateMachine(MachineSaveVO vo) {
+ Machine machine = this.getById(vo.getId());
+
+ machine.setMachineSpec(vo.getMachineSpec());
+
+ return this.updateById(machine);
+ }
+
+
+
+ @Transactional
+ public void removeMachines(List<Long> ids) {
+ for(Long id : ids){
+
+ this.removeById(id);
+ }
+ }
+
+
+
+ public IPage<MachineVO> pageQuery(MachineQueryVO query) {
+
+ LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(query.getMachineGroupId()!=null, Machine::getMachineGroupId, query.getMachineGroupId());
+ IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),queryWrapper);
+ return page;
+ }
+}
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/MachineController.java
similarity index 67%
copy from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java
copy to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
index 5716e2b..98b33a1 100644
--- 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/MachineController.java
@@ -10,30 +10,31 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineGroupService;
-import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
+import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
+import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Map;
-
@Slf4j
@RestController
-@RequestMapping("/machinegroup")
-@Tag(name = "鏈哄簥缁�", description = "鏈哄簥缁�")
-public class MachineGroupController {
+@RequestMapping("/machine")
+@Tag(name = "鏈哄簥", description = "鏈哄簥")
+public class MachineController {
@Autowired
- private MachineGroupService grpService;
+ private MachineService service;
/**
* 鏂板
*/
@PostMapping("/save")
@Operation(summary = "鏂板", description = "鏈哄簥缁勪俊鎭�")
- public R<Boolean> save(@RequestBody MachineGroup grp) {
+ public R<Boolean> save(@RequestBody MachineSaveVO vo) {
- return R.<Boolean>status(grpService.save(grp));
+ service.saveMachine(vo);
+ return R.<Boolean>status(true);
}
/**
@@ -41,9 +42,9 @@
*/
@Operation(summary = "淇敼", description = "鏈哄簥缁勪俊鎭�")
@PostMapping("/update")
- public R<Boolean> update(@RequestBody MachineGroup grp) {
+ public R<Boolean> update(@RequestBody MachineSaveVO vo) {
- return R.<Boolean>status(grpService.updateById(grp));
+ return R.<Boolean>status(service.updateMachine(vo));
}
/**
@@ -53,7 +54,7 @@
@PostMapping("/remove")
public R<Void> remove(@RequestParam String ids) {
try {
- grpService.removeGroups(Func.toLongList(ids));
+ service.removeMachines(Func.toLongList(ids));
} catch (Exception e) {
log.error("鍒犻櫎寮傚父",e);
return R.fail(e.getMessage());
@@ -66,8 +67,8 @@
*/
@Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
@GetMapping("/page")
- public R<IPage<MachineGroup>> page(String keyword, Query query) {
-
+ public R<IPage<MachineVO>> page(MachineQueryVO query) {
+ /*
LambdaQueryWrapper<MachineGroup> wrapper = new LambdaQueryWrapper<>();
//wrapper.like(StringUtils.isNotBlank(keyword),MachineGroup::getName, "%"+keyword+"%");
wrapper.and(StringUtils.isNotBlank(keyword),(w1)->{
@@ -75,7 +76,9 @@
.or().like(MachineGroup::getCode,"%"+keyword+"%");
});
- IPage<MachineGroup> pages = grpService.page(Condition.getPage(query), wrapper);
+ */
+
+ IPage<MachineVO> pages = service.pageQuery(query);
return R.data(pages);
}
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
new file mode 100644
index 0000000..c768300
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
@@ -0,0 +1,56 @@
+package org.springblade.mdm.basesetting.machine.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.mp.base.BizEntity;
+
+@Setter
+@Getter
+@TableName("mdm_machine")
+public class Machine extends BizEntity {
+ private String name;
+ private String code;
+ /**
+ * 鎵�灞炴満搴婄粍ID
+ */
+ private Long machineGroupId;
+ /**
+ * 鏈哄櫒瑙勬牸:01杞﹀簥/02閾ｅ簥,鍦ㄤ笟鍔″瓧鍏搁厤缃紙key=machine_spec锛�
+ */
+ private String machineSpec;
+ /**
+ * 鎿嶄綔鍛橈紝鏂囨湰褰曞叆
+ */
+ private String operator;
+ /**
+ * 鎵�灞炲崟浣�/缁勭粐
+ */
+ private Long ownerDept;
+ /**
+ * '鐢熶骇鍟�'
+ */
+ private String manufacturer;
+ /**
+ * 妫�鏌ョ▼搴忓洖浼犵殑杞鏃堕棿锛堝皬鏃讹級
+ */
+ private Integer pollingHours;
+ /**
+ * 鎺у埗绯荤粺锛堝鍙戦偅绉戯級锛屽湪涓氬姟瀛楀吀閰嶇疆(key=machine_controll_system)锛屼娇鐢ㄨ嫳鏂囧瓧姣�
+ */
+ private String controlSystem;
+ /**
+ * 绋嬪簭涓嬪彂鐩綍
+ */
+ private String progSendDir;
+ /**
+ * 绋嬪簭鍥炰紶鐩綍',
+ */
+ private String progReceiveDir;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
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
deleted file mode 100644
index 5247f41..0000000
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-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/MachineMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.java
new file mode 100644
index 0000000..345d9e5
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.java
@@ -0,0 +1,16 @@
+package org.springblade.mdm.basesetting.machine.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.core.mp.mapper.BladeMapper;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+
+public interface MachineMapper extends BladeMapper<Machine> {
+
+ IPage<MachineVO> pageQuery(IPage<Machine> page, @Param(Constants.WRAPPER)LambdaQueryWrapper<Machine> queryWrapper);
+ //pageMachine
+}
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/MachineMapper.xml
similarity index 66%
copy from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml
copy to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
index 814df02..c3836a5 100644
--- 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/MachineMapper.xml
@@ -1,9 +1,9 @@
<?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">
+<mapper namespace="org.springblade.mdm.basesetting.machine.mapper.MachineMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.MachineGroup">
+ <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.Machine">
<id column="id" property="id"/>
<result column="code" property="code"/>
<result column="name" property="name"/>
@@ -13,9 +13,14 @@
<result column="updateTime" property="update_time"/>
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <select id="pageQuery" resultType="org.springblade.mdm.basesetting.machine.vo.MachineVO">
+ select m.id,m.name,m.code,g.name group_name,m.machine_spec,m.manufacturer,m.operator
+ from mdm_machine m join mdm_machine_group g on m.machine_group_id=g.id
+ ${ew.customSqlSegment}
+ </select>
-<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
+ <!-- <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>-->
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java
new file mode 100644
index 0000000..1472a36
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java
@@ -0,0 +1,13 @@
+package org.springblade.mdm.basesetting.machine.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springblade.core.mp.support.Query;
+
+@Setter
+@Getter
+public class MachineQueryVO extends Query {
+ private String keyword;
+ private Long machineGroupId;
+
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineSaveVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineSaveVO.java
new file mode 100644
index 0000000..2bd6cc0
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineSaveVO.java
@@ -0,0 +1,50 @@
+package org.springblade.mdm.basesetting.machine.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springblade.mdm.commons.vo.BaseVO;
+
+@Setter
+@Getter
+public class MachineSaveVO extends BaseVO {
+
+ private String code;
+ private String name;
+ /**
+ * 鎵�灞炴満搴婄粍ID
+ */
+ private Long machineGroupId;
+ /**
+ * 鏈哄櫒瑙勬牸:01杞﹀簥/02閾ｅ簥,鍦ㄤ笟鍔″瓧鍏搁厤缃紙key=machine_spec锛�
+ */
+ private String machineSpec;
+ /**
+ * 鎿嶄綔鍛橈紝鏂囨湰褰曞叆
+ */
+ private String operator;
+ /**
+ * 鎵�灞炲崟浣�/缁勭粐
+ */
+ private Long ownerDept;
+ /**
+ * '鐢熶骇鍟�'
+ */
+ private String manufacturer;
+ /**
+ * 妫�鏌ョ▼搴忓洖浼犵殑杞鏃堕棿锛堝皬鏃讹級
+ */
+ private Integer pollingHours;
+ /**
+ * 鎺у埗绯荤粺锛堝鍙戦偅绉戯級锛屽湪涓氬姟瀛楀吀閰嶇疆(key=machine_controll_system)锛屼娇鐢ㄨ嫳鏂囧瓧姣�
+ */
+ private String controlSystem;
+ /**
+ * 绋嬪簭涓嬪彂鐩綍
+ */
+ private String progSendDir;
+ /**
+ * 绋嬪簭鍥炰紶鐩綍',
+ */
+ private String progReceiveDir;
+ private String remark;
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
new file mode 100644
index 0000000..b900103
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
@@ -0,0 +1,50 @@
+package org.springblade.mdm.basesetting.machine.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springblade.mdm.commons.vo.BaseVO;
+
+@Setter
+@Getter
+public class MachineVO extends BaseVO {
+
+ private String code;
+ private String name;
+ /**
+ * 鎵�灞炴満搴婄粍ID
+ */
+ private Long machineGroupId;
+ /**
+ * 鏈哄櫒瑙勬牸:01杞﹀簥/02閾ｅ簥,鍦ㄤ笟鍔″瓧鍏搁厤缃紙key=machine_spec锛�
+ */
+ private String machineSpec;
+ /**
+ * 鎿嶄綔鍛橈紝鏂囨湰褰曞叆
+ */
+ private String operator;
+ /**
+ * 鎵�灞炲崟浣�/缁勭粐
+ */
+ private Long ownerDept;
+ /**
+ * '鐢熶骇鍟�'
+ */
+ private String manufacturer;
+ /**
+ * 妫�鏌ョ▼搴忓洖浼犵殑杞鏃堕棿锛堝皬鏃讹級
+ */
+ private Integer pollingHours;
+ /**
+ * 鎺у埗绯荤粺锛堝鍙戦偅绉戯級锛屽湪涓氬姟瀛楀吀閰嶇疆(key=machine_controll_system)锛屼娇鐢ㄨ嫳鏂囧瓧姣�
+ */
+ private String controlSystem;
+ /**
+ * 绋嬪簭涓嬪彂鐩綍
+ */
+ private String progSendDir;
+ /**
+ * 绋嬪簭鍥炰紶鐩綍',
+ */
+ private String progReceiveDir;
+ private String remark;
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/MachineGroupService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/MachineGroupService.java
new file mode 100644
index 0000000..1406228
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/MachineGroupService.java
@@ -0,0 +1,23 @@
+package org.springblade.mdm.basesetting.machinegroup;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.base.BizServiceImpl;
+import org.springblade.mdm.basesetting.machinegroup.entity.MachineGroup;
+import org.springblade.mdm.basesetting.machinegroup.mapper.MachineGroupMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class MachineGroupService extends BizServiceImpl<MachineGroupMapper, MachineGroup> {
+
+ @Transactional
+ public void removeGroups(List<Long> ids){
+ //TODO 妫�鏌ヤ笅闈㈡槸鍚︽湁鏈哄櫒
+ for(Long id : ids){
+
+ this.removeById(id);
+ }
+ }
+}
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/machinegroup/controller/MachineGroupController.java
similarity index 88%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/controller/MachineGroupController.java
index 5716e2b..fb3b7ba 100644
--- 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/machinegroup/controller/MachineGroupController.java
@@ -1,4 +1,4 @@
-package org.springblade.mdm.basesetting.machine.controller;
+package org.springblade.mdm.basesetting.machinegroup.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,12 +10,11 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineGroupService;
-import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machinegroup.MachineGroupService;
+import org.springblade.mdm.basesetting.machinegroup.entity.MachineGroup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
@Slf4j
@RestController
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/machinegroup/entity/MachineGroup.java
similarity index 71%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineGroup.java
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/entity/MachineGroup.java
index 6fb5e4e..e3d9aca 100644
--- 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/machinegroup/entity/MachineGroup.java
@@ -1,10 +1,11 @@
-package org.springblade.mdm.basesetting.machine.entity;
+package org.springblade.mdm.basesetting.machinegroup.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.mp.base.BizEntity;
@TableName("mdm_machine_group")
-public class MachineGroup extends BaseEntity {
+public class MachineGroup extends BizEntity {
private String name;
private String code;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.java
new file mode 100644
index 0000000..52592da
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.java
@@ -0,0 +1,7 @@
+package org.springblade.mdm.basesetting.machinegroup.mapper;
+
+import org.springblade.core.mp.mapper.BladeMapper;
+import org.springblade.mdm.basesetting.machinegroup.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/machinegroup/mapper/MachineGroupMapper.xml
similarity index 86%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.xml
index 814df02..c1f4dad 100644
--- 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/machinegroup/mapper/MachineGroupMapper.xml
@@ -1,9 +1,9 @@
<?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">
+<mapper namespace="org.springblade.mdm.basesetting.machinegroup.mapper.MachineGroupMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.MachineGroup">
+ <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machinegroup.entity.MachineGroup">
<id column="id" property="id"/>
<result column="code" property="code"/>
<result column="name" property="name"/>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/vo/BaseVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/vo/BaseVO.java
new file mode 100644
index 0000000..007189d
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/vo/BaseVO.java
@@ -0,0 +1,15 @@
+package org.springblade.mdm.commons.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Setter
+@Getter
+public class BaseVO {
+ private Long id;
+
+ private Integer status;
+ private Date createTime;
+}
diff --git a/doc/sql/mdm/mdm.all.create.sql b/doc/sql/mdm/mdm.all.create.sql
index a0ac7b1..fb6d791 100644
--- a/doc/sql/mdm/mdm.all.create.sql
+++ b/doc/sql/mdm/mdm.all.create.sql
@@ -1,8 +1,8 @@
CREATE TABLE `mdm_machine_group` (
`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 '鏈哄簥缁勭紪鍙�',
+ `name` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '鏈哄簥缁勫悕绉�',
+ `code` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '鏈哄簥缁勭紪鍙�',
`create_user` bigint DEFAULT NULL COMMENT '鍒涘缓浜�',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓閮ㄩ棬',
`create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
@@ -11,26 +11,35 @@
`status` int DEFAULT '1' COMMENT '鐘舵��',
`is_deleted` int DEFAULT '0' COMMENT '鏄惁宸插垹闄�',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='鏈哄簥缁�';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='鏈哄簥缁�';
CREATE TABLE `mdm_machine` (
`id` bigint NOT NULL,
`tenant_id` varchar(6) DEFAULT NULL COMMENT '鎵�灞炵鎴�',
`code` varchar(100) NOT NULL COMMENT '鏈哄簥缂栧彿',
- `name` varchar(100) CHARACTER SET gbk COLLATE gbk_chinese_ci NOT NULL COMMENT '鏈哄簥鍚嶇О',
- `avatar` varchar(1000) DEFAULT NULL COMMENT '鍥剧墖鍦板潃',
- `machine_group_id` bigint DEFAULT NULL COMMENT '鎵�灞炴満搴婄粍ID',
- `status` int DEFAULT NULL COMMENT '涓氬姟鐘舵��',
+ `name` varchar(100) NOT NULL COMMENT '鏈哄簥鎻忚堪/鍨嬪彿',
+ `avatar` varchar(400) DEFAULT NULL COMMENT '鍥剧墖鍦板潃',
+ `machine_group_id` bigint NOT NULL COMMENT '鎵�灞炴満搴婄粍ID',
+ `machine_spec` varchar(20) DEFAULT NULL COMMENT '鏈哄櫒瑙勬牸:01杞﹀簥/02閾ｅ簥,鍦ㄤ笟鍔″瓧鍏搁厤缃紙key=machine_spec锛�',
+ `operator` varchar(100) COMMENT '鎿嶄綔鍛橈紝鏂囨湰褰曞叆',
+ `owner_dept` bigint DEFAULT NULL COMMENT '鎵�灞炲崟浣�/缁勭粐',
+ `manufacturer` varchar(100) COMMENT '鐢熶骇鍟�',
+ `polling_hours` int(11) COMMENT '妫�鏌ョ▼搴忓洖浼犵殑杞鏃堕棿锛堝皬鏃讹級',
+ `control_system` varchar(20) DEFAULT NULL COMMENT '鎺у埗绯荤粺锛堝鍙戦偅绉戯級锛屽湪涓氬姟瀛楀吀閰嶇疆(key=machine_controll_system)锛屼娇鐢ㄨ嫳鏂囧瓧姣�',
+ `prog_send_dir` varchar(100) COMMENT '绋嬪簭涓嬪彂鐩綍',
+ `prog_receive_dir` varchar(100) COMMENT '绋嬪簭鍥炰紶鐩綍',
+ `remark` varchar(200) COMMENT '澶囨敞',
+ `status` int DEFAULT NULL COMMENT '涓氬姟鐘舵�侊紝1锛氬惎鐢紱0绂佺敤',
`create_dept` bigint DEFAULT NULL COMMENT '鍒涘缓鍗曚綅',
`is_deleted` int DEFAULT NULL,
`create_time` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
`create_user` bigint DEFAULT NULL COMMENT '鍒涘缓浜�',
`update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
- `update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�'
+ `update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�',
PRIMARY KEY (`id`) USING BTREE,
- UNIQUE KEY `uniqueCodeIndex` (`code`,`is_deleted`) USING BTREE,
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='鏈哄簥';
+ UNIQUE KEY `uniqueCodeIndex` (`code`,`is_deleted`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='鏈哄簥';
CREATE TABLE `mdm_nc_program` (
@@ -50,7 +59,7 @@
`update_user` bigint DEFAULT NULL COMMENT '鏇存柊浜�'
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `uniqueCodeIndex` (`code`,`is_deleted`) USING BTREE,
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='鏁版帶绋嬪簭';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='鏁版帶绋嬪簭';
CREATE TABLE `mdm_task_receive` (
--
Gitblit v1.9.3