From a7cef0a252f9aeebf383e5bc5b208969e57288ff Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期二, 19 十一月 2024 14:41:16 +0800
Subject: [PATCH] add domain change
---
billion-main/src/main/java/com/billion/main/controller/DaParamCollectionController.java | 35 +++++++
billion-main/src/main/java/com/billion/main/service/impl/DaParamCollectionServiceImpl.java | 8
billion-main/src/main/java/com/billion/main/service/DaTightenCollectionService.java | 4
billion-main/src/main/java/com/billion/main/common/BaseEntity.java | 2
billion-main/src/main/java/com/billion/main/mapper/DaStationCollectionMapper.java | 4
billion-main/src/main/java/com/billion/main/service/DaStationCollectionService.java | 4
billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml | 4
pom.xml | 2
billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml | 4
billion-main/src/main/java/com/billion/main/service/DaParamCollectionService.java | 4
billion-main/src/main/java/com/billion/main/mapper/DaMaterialCollectionMapper.java | 4
billion-main/src/main/java/com/billion/main/common/Constant.java | 13 ++
billion-main/src/main/java/com/billion/main/domain/ScCollectionParamConf.java | 2
billion-main/src/main/java/com/billion/main/domain/DaParamCollection.java | 2
billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java | 28 +++++
billion-main/src/main/java/com/billion/main/controller/ScCollectionParamConfController.java | 16 +++
billion-main/src/main/java/com/billion/main/service/DaMaterialCollectionService.java | 4
billion-main/src/main/java/com/billion/main/service/ScCollectionParamConfService.java | 4
billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml | 4
billion-admin/src/main/java/com/billion/RuoYiApplication.java | 10 --
billion-main/src/main/java/com/billion/main/mapper/ScCollectionParamConfMapper.java | 4
billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml | 7 +
billion-main/src/main/java/com/billion/main/domain/DaTightenCollection.java | 2
billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml | 4
billion-main/src/main/java/com/billion/main/domain/DaStationCollection.java | 2
/dev/null | 23 ----
billion-main/src/main/java/com/billion/main/service/impl/DaStationCollectionServiceImpl.java | 10 +-
billion-main/src/main/java/com/billion/main/mapper/DaParamCollectionMapper.java | 6
billion-main/src/main/java/com/billion/main/domain/DaMaterialCollection.java | 3
billion-main/src/main/java/com/billion/main/mapper/DaTightenCollectionMapper.java | 4
billion-main/src/main/java/com/billion/main/service/impl/DaTightenCollectionServiceImpl.java | 10 +-
billion-main/src/main/java/com/billion/main/service/impl/ScCollectionParamConfServiceImpl.java | 10 +-
32 files changed, 153 insertions(+), 90 deletions(-)
diff --git a/billion-admin/src/main/java/com/billion/RuoYiApplication.java b/billion-admin/src/main/java/com/billion/RuoYiApplication.java
index 7c717c5..8e2beee 100644
--- a/billion-admin/src/main/java/com/billion/RuoYiApplication.java
+++ b/billion-admin/src/main/java/com/billion/RuoYiApplication.java
@@ -18,15 +18,5 @@
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
- System.out.println("(鈾モ棤鈥库棤)锞夛緸 鑻ヤ緷鍚姩鎴愬姛 醿�(麓凇`醿�)锞� \n" +
- " .-------. ____ __ \n" +
- " | _ _ \\ \\ \\ / / \n" +
- " | ( ' ) | \\ _. / ' \n" +
- " |(_ o _) / _( )_ .' \n" +
- " | (_,_).' __ ___(_ o _)' \n" +
- " | |\\ \\ | || |(_,_)' \n" +
- " | | \\ `' /| `-' / \n" +
- " | | \\ / \\ / \n" +
- " ''-' `'-' `-..-' ");
}
}
diff --git a/billion-main/src/main/java/common/BaseEntity.java b/billion-main/src/main/java/com/billion/main/common/BaseEntity.java
similarity index 95%
rename from billion-main/src/main/java/common/BaseEntity.java
rename to billion-main/src/main/java/com/billion/main/common/BaseEntity.java
index b9725a8..48f8fb5 100644
--- a/billion-main/src/main/java/common/BaseEntity.java
+++ b/billion-main/src/main/java/com/billion/main/common/BaseEntity.java
@@ -1,4 +1,4 @@
-package common;
+package com.billion.main.common;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/billion-main/src/main/java/com/billion/main/common/Constant.java b/billion-main/src/main/java/com/billion/main/common/Constant.java
new file mode 100644
index 0000000..ed04164
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/common/Constant.java
@@ -0,0 +1,13 @@
+package com.billion.main.common;
+
+/**
+ * 绠�浠嬭鏄�:甯搁噺绫�
+ *
+ * @author: Eric
+ * @date: 2024-11-19 13:44:48
+ * @version: 1.0
+ */
+
+public class Constant {
+
+}
diff --git a/billion-main/src/main/java/com/billion/main/controller/DaParamCollectionController.java b/billion-main/src/main/java/com/billion/main/controller/DaParamCollectionController.java
new file mode 100644
index 0000000..befca71
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/controller/DaParamCollectionController.java
@@ -0,0 +1,35 @@
+package com.billion.main.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.billion.common.core.controller.BaseController;
+import com.billion.common.core.domain.R;
+import com.billion.main.domain.DaParamCollection;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.billion.main.service.DaParamCollectionService;
+
+import javax.annotation.Resource;
+
+/**
+ * 绠�浠嬭鏄�:
+ *
+ * @author: Eric
+ * @date: 2024-11-16 11:07:06
+ * @version: 1.0
+ */
+@RestController
+@RequestMapping("/daParamCollection")
+public class DaParamCollectionController extends BaseController {
+
+ @Resource
+ private DaParamCollectionService daParamCollectionService;
+
+ @GetMapping("/getPage")
+ public R getDaParamCollectionPage(@RequestParam int current,@RequestParam int size ){
+ Page<DaParamCollection> pageQuery = new Page<>(current,size);
+ Page<DaParamCollection> page = daParamCollectionService.page(pageQuery,null);
+ return R.ok(page);
+ }
+}
diff --git a/billion-main/src/main/java/com/billion/main/controller/ScCollectionParamConfController.java b/billion-main/src/main/java/com/billion/main/controller/ScCollectionParamConfController.java
new file mode 100644
index 0000000..980de9e
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/controller/ScCollectionParamConfController.java
@@ -0,0 +1,16 @@
+package com.billion.main.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 绠�浠嬭鏄�:
+ *
+ * @author: Eric
+ * @date: 2024-11-16 11:08:39
+ * @version: 1.0
+ */
+@RestController
+@RequestMapping("/scCollectionConf")
+public class ScCollectionParamConfController {
+}
diff --git a/billion-main/src/main/java/domain/DaMaterialCollection.java b/billion-main/src/main/java/com/billion/main/domain/DaMaterialCollection.java
similarity index 93%
rename from billion-main/src/main/java/domain/DaMaterialCollection.java
rename to billion-main/src/main/java/com/billion/main/domain/DaMaterialCollection.java
index 75913e5..7d4a0a6 100644
--- a/billion-main/src/main/java/domain/DaMaterialCollection.java
+++ b/billion-main/src/main/java/com/billion/main/domain/DaMaterialCollection.java
@@ -1,4 +1,4 @@
-package domain;
+package com.billion.main.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +7,7 @@
import java.io.Serializable;
import java.util.Date;
+import com.billion.main.common.BaseEntity;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.StringSerializer;
import lombok.Data;
diff --git a/billion-main/src/main/java/domain/DaParamCollection.java b/billion-main/src/main/java/com/billion/main/domain/DaParamCollection.java
similarity index 97%
rename from billion-main/src/main/java/domain/DaParamCollection.java
rename to billion-main/src/main/java/com/billion/main/domain/DaParamCollection.java
index 2cfc902..dafddc8 100644
--- a/billion-main/src/main/java/domain/DaParamCollection.java
+++ b/billion-main/src/main/java/com/billion/main/domain/DaParamCollection.java
@@ -1,4 +1,4 @@
-package domain;
+package com.billion.main.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/billion-main/src/main/java/domain/DaStationCollection.java b/billion-main/src/main/java/com/billion/main/domain/DaStationCollection.java
similarity index 97%
rename from billion-main/src/main/java/domain/DaStationCollection.java
rename to billion-main/src/main/java/com/billion/main/domain/DaStationCollection.java
index 6ae0646..e6eb8cc 100644
--- a/billion-main/src/main/java/domain/DaStationCollection.java
+++ b/billion-main/src/main/java/com/billion/main/domain/DaStationCollection.java
@@ -1,4 +1,4 @@
-package domain;
+package com.billion.main.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/billion-main/src/main/java/domain/DaTightenCollection.java b/billion-main/src/main/java/com/billion/main/domain/DaTightenCollection.java
similarity index 97%
rename from billion-main/src/main/java/domain/DaTightenCollection.java
rename to billion-main/src/main/java/com/billion/main/domain/DaTightenCollection.java
index 6d07ae8..22297ee 100644
--- a/billion-main/src/main/java/domain/DaTightenCollection.java
+++ b/billion-main/src/main/java/com/billion/main/domain/DaTightenCollection.java
@@ -1,4 +1,4 @@
-package domain;
+package com.billion.main.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/billion-main/src/main/java/domain/ScCollectionParamConf.java b/billion-main/src/main/java/com/billion/main/domain/ScCollectionParamConf.java
similarity index 98%
rename from billion-main/src/main/java/domain/ScCollectionParamConf.java
rename to billion-main/src/main/java/com/billion/main/domain/ScCollectionParamConf.java
index e156651..11c0fd4 100644
--- a/billion-main/src/main/java/domain/ScCollectionParamConf.java
+++ b/billion-main/src/main/java/com/billion/main/domain/ScCollectionParamConf.java
@@ -1,4 +1,4 @@
-package domain;
+package com.billion.main.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/billion-main/src/main/java/mapper/DaMaterialCollectionMapper.java b/billion-main/src/main/java/com/billion/main/mapper/DaMaterialCollectionMapper.java
similarity index 79%
rename from billion-main/src/main/java/mapper/DaMaterialCollectionMapper.java
rename to billion-main/src/main/java/com/billion/main/mapper/DaMaterialCollectionMapper.java
index 595e081..3327ad9 100644
--- a/billion-main/src/main/java/mapper/DaMaterialCollectionMapper.java
+++ b/billion-main/src/main/java/com/billion/main/mapper/DaMaterialCollectionMapper.java
@@ -1,6 +1,6 @@
-package mapper;
+package com.billion.main.mapper;
-import domain.DaMaterialCollection;
+import com.billion.main.domain.DaMaterialCollection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/billion-main/src/main/java/mapper/DaParamCollectionMapper.java b/billion-main/src/main/java/com/billion/main/mapper/DaParamCollectionMapper.java
similarity index 71%
rename from billion-main/src/main/java/mapper/DaParamCollectionMapper.java
rename to billion-main/src/main/java/com/billion/main/mapper/DaParamCollectionMapper.java
index 8875606..e885215 100644
--- a/billion-main/src/main/java/mapper/DaParamCollectionMapper.java
+++ b/billion-main/src/main/java/com/billion/main/mapper/DaParamCollectionMapper.java
@@ -1,7 +1,8 @@
-package mapper;
+package com.billion.main.mapper;
-import domain.DaParamCollection;
+import com.billion.main.domain.DaParamCollection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
/**
* @author Dell
@@ -9,6 +10,7 @@
* @createDate 2024-11-16 10:33:43
* @Entity generator.domain.DaParamCollection
*/
+@Mapper
public interface DaParamCollectionMapper extends BaseMapper<DaParamCollection> {
}
diff --git a/billion-main/src/main/java/mapper/DaStationCollectionMapper.java b/billion-main/src/main/java/com/billion/main/mapper/DaStationCollectionMapper.java
similarity index 79%
rename from billion-main/src/main/java/mapper/DaStationCollectionMapper.java
rename to billion-main/src/main/java/com/billion/main/mapper/DaStationCollectionMapper.java
index bdad27c..c5899f4 100644
--- a/billion-main/src/main/java/mapper/DaStationCollectionMapper.java
+++ b/billion-main/src/main/java/com/billion/main/mapper/DaStationCollectionMapper.java
@@ -1,6 +1,6 @@
-package mapper;
+package com.billion.main.mapper;
-import domain.DaStationCollection;
+import com.billion.main.domain.DaStationCollection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/billion-main/src/main/java/mapper/DaTightenCollectionMapper.java b/billion-main/src/main/java/com/billion/main/mapper/DaTightenCollectionMapper.java
similarity index 79%
rename from billion-main/src/main/java/mapper/DaTightenCollectionMapper.java
rename to billion-main/src/main/java/com/billion/main/mapper/DaTightenCollectionMapper.java
index 8c7581a..8c557df 100644
--- a/billion-main/src/main/java/mapper/DaTightenCollectionMapper.java
+++ b/billion-main/src/main/java/com/billion/main/mapper/DaTightenCollectionMapper.java
@@ -1,6 +1,6 @@
-package mapper;
+package com.billion.main.mapper;
-import domain.DaTightenCollection;
+import com.billion.main.domain.DaTightenCollection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/billion-main/src/main/java/mapper/ScCollectionParamConfMapper.java b/billion-main/src/main/java/com/billion/main/mapper/ScCollectionParamConfMapper.java
similarity index 80%
rename from billion-main/src/main/java/mapper/ScCollectionParamConfMapper.java
rename to billion-main/src/main/java/com/billion/main/mapper/ScCollectionParamConfMapper.java
index f846f12..833e31c 100644
--- a/billion-main/src/main/java/mapper/ScCollectionParamConfMapper.java
+++ b/billion-main/src/main/java/com/billion/main/mapper/ScCollectionParamConfMapper.java
@@ -1,6 +1,6 @@
-package mapper;
+package com.billion.main.mapper;
-import domain.ScCollectionParamConf;
+import com.billion.main.domain.ScCollectionParamConf;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
diff --git a/billion-main/src/main/java/service/DaMaterialCollectionService.java b/billion-main/src/main/java/com/billion/main/service/DaMaterialCollectionService.java
similarity index 77%
rename from billion-main/src/main/java/service/DaMaterialCollectionService.java
rename to billion-main/src/main/java/com/billion/main/service/DaMaterialCollectionService.java
index 5bb2e3e..0b6e815 100644
--- a/billion-main/src/main/java/service/DaMaterialCollectionService.java
+++ b/billion-main/src/main/java/com/billion/main/service/DaMaterialCollectionService.java
@@ -1,6 +1,6 @@
-package service;
+package com.billion.main.service;
-import domain.DaMaterialCollection;
+import com.billion.main.domain.DaMaterialCollection;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/billion-main/src/main/java/service/DaParamCollectionService.java b/billion-main/src/main/java/com/billion/main/service/DaParamCollectionService.java
similarity index 77%
rename from billion-main/src/main/java/service/DaParamCollectionService.java
rename to billion-main/src/main/java/com/billion/main/service/DaParamCollectionService.java
index e49be02..a73412b 100644
--- a/billion-main/src/main/java/service/DaParamCollectionService.java
+++ b/billion-main/src/main/java/com/billion/main/service/DaParamCollectionService.java
@@ -1,6 +1,6 @@
-package service;
+package com.billion.main.service;
-import domain.DaParamCollection;
+import com.billion.main.domain.DaParamCollection;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/billion-main/src/main/java/service/DaStationCollectionService.java b/billion-main/src/main/java/com/billion/main/service/DaStationCollectionService.java
similarity index 77%
rename from billion-main/src/main/java/service/DaStationCollectionService.java
rename to billion-main/src/main/java/com/billion/main/service/DaStationCollectionService.java
index 7b403ef..21c4710 100644
--- a/billion-main/src/main/java/service/DaStationCollectionService.java
+++ b/billion-main/src/main/java/com/billion/main/service/DaStationCollectionService.java
@@ -1,6 +1,6 @@
-package service;
+package com.billion.main.service;
-import domain.DaStationCollection;
+import com.billion.main.domain.DaStationCollection;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/billion-main/src/main/java/service/DaTightenCollectionService.java b/billion-main/src/main/java/com/billion/main/service/DaTightenCollectionService.java
similarity index 77%
rename from billion-main/src/main/java/service/DaTightenCollectionService.java
rename to billion-main/src/main/java/com/billion/main/service/DaTightenCollectionService.java
index 6209854..592ab10 100644
--- a/billion-main/src/main/java/service/DaTightenCollectionService.java
+++ b/billion-main/src/main/java/com/billion/main/service/DaTightenCollectionService.java
@@ -1,6 +1,6 @@
-package service;
+package com.billion.main.service;
-import domain.DaTightenCollection;
+import com.billion.main.domain.DaTightenCollection;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/billion-main/src/main/java/service/ScCollectionParamConfService.java b/billion-main/src/main/java/com/billion/main/service/ScCollectionParamConfService.java
similarity index 77%
rename from billion-main/src/main/java/service/ScCollectionParamConfService.java
rename to billion-main/src/main/java/com/billion/main/service/ScCollectionParamConfService.java
index 34fed7b..d44a3e1 100644
--- a/billion-main/src/main/java/service/ScCollectionParamConfService.java
+++ b/billion-main/src/main/java/com/billion/main/service/ScCollectionParamConfService.java
@@ -1,6 +1,6 @@
-package service;
+package com.billion.main.service;
-import domain.ScCollectionParamConf;
+import com.billion.main.domain.ScCollectionParamConf;
import com.baomidou.mybatisplus.extension.service.IService;
/**
diff --git a/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java
new file mode 100644
index 0000000..5601bbe
--- /dev/null
+++ b/billion-main/src/main/java/com/billion/main/service/impl/DaMaterialCollectionServiceImpl.java
@@ -0,0 +1,28 @@
+package com.billion.main.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.billion.common.core.domain.R;
+import com.billion.main.mapper.DaMaterialCollectionMapper;
+import com.billion.main.domain.DaMaterialCollection;
+import com.billion.main.service.DaMaterialCollectionService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author Dell
+* @description 閽堝琛ㄣ�恉a_material_collection(鎷х揣閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-11-16 10:33:43
+*/
+@Service
+public class DaMaterialCollectionServiceImpl extends ServiceImpl<DaMaterialCollectionMapper, DaMaterialCollection>
+ implements DaMaterialCollectionService{
+
+ public R getData(){}
+
+
+}
+
+
+
+
diff --git a/billion-main/src/main/java/service/impl/DaParamCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/service/impl/DaParamCollectionServiceImpl.java
similarity index 67%
rename from billion-main/src/main/java/service/impl/DaParamCollectionServiceImpl.java
rename to billion-main/src/main/java/com/billion/main/service/impl/DaParamCollectionServiceImpl.java
index a8dcc4e..7658b91 100644
--- a/billion-main/src/main/java/service/impl/DaParamCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/service/impl/DaParamCollectionServiceImpl.java
@@ -1,9 +1,9 @@
-package service.impl;
+package com.billion.main.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import domain.DaParamCollection;
-import service.DaParamCollectionService;
-import mapper.DaParamCollectionMapper;
+import com.billion.main.mapper.DaParamCollectionMapper;
+import com.billion.main.domain.DaParamCollection;
+import com.billion.main.service.DaParamCollectionService;
import org.springframework.stereotype.Service;
/**
diff --git a/billion-main/src/main/java/service/impl/DaStationCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/service/impl/DaStationCollectionServiceImpl.java
similarity index 61%
rename from billion-main/src/main/java/service/impl/DaStationCollectionServiceImpl.java
rename to billion-main/src/main/java/com/billion/main/service/impl/DaStationCollectionServiceImpl.java
index a0462f4..1a93c64 100644
--- a/billion-main/src/main/java/service/impl/DaStationCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/service/impl/DaStationCollectionServiceImpl.java
@@ -1,9 +1,9 @@
-package service.impl;
+package com.billion.main.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import domain.DaStationCollection;
-import service.DaStationCollectionService;
-import mapper.DaStationCollectionMapper;
+import com.billion.main.domain.DaStationCollection;
+import com.billion.main.mapper.DaStationCollectionMapper;
+import com.billion.main.service.DaStationCollectionService;
import org.springframework.stereotype.Service;
/**
@@ -13,7 +13,7 @@
*/
@Service
public class DaStationCollectionServiceImpl extends ServiceImpl<DaStationCollectionMapper, DaStationCollection>
- implements DaStationCollectionService{
+ implements DaStationCollectionService {
}
diff --git a/billion-main/src/main/java/service/impl/DaTightenCollectionServiceImpl.java b/billion-main/src/main/java/com/billion/main/service/impl/DaTightenCollectionServiceImpl.java
similarity index 61%
rename from billion-main/src/main/java/service/impl/DaTightenCollectionServiceImpl.java
rename to billion-main/src/main/java/com/billion/main/service/impl/DaTightenCollectionServiceImpl.java
index cee9c72..2486b4b 100644
--- a/billion-main/src/main/java/service/impl/DaTightenCollectionServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/service/impl/DaTightenCollectionServiceImpl.java
@@ -1,9 +1,9 @@
-package service.impl;
+package com.billion.main.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import domain.DaTightenCollection;
-import service.DaTightenCollectionService;
-import mapper.DaTightenCollectionMapper;
+import com.billion.main.domain.DaTightenCollection;
+import com.billion.main.mapper.DaTightenCollectionMapper;
+import com.billion.main.service.DaTightenCollectionService;
import org.springframework.stereotype.Service;
/**
@@ -13,7 +13,7 @@
*/
@Service
public class DaTightenCollectionServiceImpl extends ServiceImpl<DaTightenCollectionMapper, DaTightenCollection>
- implements DaTightenCollectionService{
+ implements DaTightenCollectionService {
}
diff --git a/billion-main/src/main/java/service/impl/ScCollectionParamConfServiceImpl.java b/billion-main/src/main/java/com/billion/main/service/impl/ScCollectionParamConfServiceImpl.java
similarity index 61%
rename from billion-main/src/main/java/service/impl/ScCollectionParamConfServiceImpl.java
rename to billion-main/src/main/java/com/billion/main/service/impl/ScCollectionParamConfServiceImpl.java
index 8a77a86..0342594 100644
--- a/billion-main/src/main/java/service/impl/ScCollectionParamConfServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/service/impl/ScCollectionParamConfServiceImpl.java
@@ -1,9 +1,9 @@
-package service.impl;
+package com.billion.main.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import domain.ScCollectionParamConf;
-import service.ScCollectionParamConfService;
-import mapper.ScCollectionParamConfMapper;
+import com.billion.main.domain.ScCollectionParamConf;
+import com.billion.main.mapper.ScCollectionParamConfMapper;
+import com.billion.main.service.ScCollectionParamConfService;
import org.springframework.stereotype.Service;
/**
@@ -13,7 +13,7 @@
*/
@Service
public class ScCollectionParamConfServiceImpl extends ServiceImpl<ScCollectionParamConfMapper, ScCollectionParamConf>
- implements ScCollectionParamConfService{
+ implements ScCollectionParamConfService {
}
diff --git a/billion-main/src/main/java/service/impl/DaMaterialCollectionServiceImpl.java b/billion-main/src/main/java/service/impl/DaMaterialCollectionServiceImpl.java
deleted file mode 100644
index 456c7c5..0000000
--- a/billion-main/src/main/java/service/impl/DaMaterialCollectionServiceImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import domain.DaMaterialCollection;
-import service.DaMaterialCollectionService;
-import mapper.DaMaterialCollectionMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author Dell
-* @description 閽堝琛ㄣ�恉a_material_collection(鎷х揣閲囬泦)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-11-16 10:33:43
-*/
-@Service
-public class DaMaterialCollectionServiceImpl extends ServiceImpl<DaMaterialCollectionMapper, DaMaterialCollection>
- implements DaMaterialCollectionService{
-
-
-}
-
-
-
-
diff --git a/billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml b/billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml
index ae12e8e..86d432a 100644
--- a/billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml
+++ b/billion-main/src/main/resources/mapper/DaMaterialCollectionMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="mapper.DaMaterialCollectionMapper">
+<mapper namespace="com.billion.main.mapper.DaMaterialCollectionMapper">
- <resultMap id="BaseResultMap" type="domain.DaMaterialCollection">
+ <resultMap id="BaseResultMap" type="com.billion.main.domain.DaMaterialCollection">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
<result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
@@ -19,4 +19,7 @@
param_code,param_name,param_value,
collect_time
</sql>
+
+
+
</mapper>
diff --git a/billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml b/billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml
index 2b2198e..790e15f 100644
--- a/billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml
+++ b/billion-main/src/main/resources/mapper/DaParamCollectionMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="mapper.DaParamCollectionMapper">
+<mapper namespace="com.billion.main.mapper.DaParamCollectionMapper">
- <resultMap id="BaseResultMap" type="domain.DaParamCollection">
+ <resultMap id="BaseResultMap" type="com.billion.main.domain.DaParamCollection">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
<result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
diff --git a/billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml b/billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml
index 04be1dc..866c921 100644
--- a/billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml
+++ b/billion-main/src/main/resources/mapper/DaStationCollectionMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="mapper.DaStationCollectionMapper">
+<mapper namespace="com.billion.main.mapper.DaStationCollectionMapper">
- <resultMap id="BaseResultMap" type="domain.DaStationCollection">
+ <resultMap id="BaseResultMap" type="com.billion.main.domain.DaStationCollection">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
<result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
diff --git a/billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml b/billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml
index 4b872ae..54d9850 100644
--- a/billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml
+++ b/billion-main/src/main/resources/mapper/DaTightenCollectionMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="mapper.DaTightenCollectionMapper">
+<mapper namespace="com.billion.main.mapper.DaTightenCollectionMapper">
- <resultMap id="BaseResultMap" type="domain.DaTightenCollection">
+ <resultMap id="BaseResultMap" type="com.billion.main.domain.DaTightenCollection">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="sfcCode" column="sfc_code" jdbcType="VARCHAR"/>
<result property="locationCode" column="location_code" jdbcType="VARCHAR"/>
diff --git a/billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml b/billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml
index 7de216e..1e177fb 100644
--- a/billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml
+++ b/billion-main/src/main/resources/mapper/ScCollectionParamConfMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="mapper.ScCollectionParamConfMapper">
+<mapper namespace="com.billion.main.mapper.ScCollectionParamConfMapper">
- <resultMap id="BaseResultMap" type="domain.ScCollectionParamConf">
+ <resultMap id="BaseResultMap" type="com.billion.main.domain.ScCollectionParamConf">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="productCode" column="product_code" jdbcType="VARCHAR"/>
<result property="productType" column="product_type" jdbcType="VARCHAR"/>
diff --git a/pom.xml b/pom.xml
index 3e4ea75..7d3452c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,8 +236,6 @@
<module>billion-generator</module>
<module>billion-common</module>
<module>billion-main</module>
- <module>billion-main</module>
- <module>billion-main</module>
</modules>
<packaging>pom</packaging>
--
Gitblit v1.9.3