diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml
index 77898db51..bf70c50ca 100644
--- a/pqs-prepare/prepare-boot/pom.xml
+++ b/pqs-prepare/prepare-boot/pom.xml
@@ -29,6 +29,11 @@
common-core
${project.version}
+
+ com.njcn
+ process-api
+ ${project.version}
+
com.njcn
harmonic-api
@@ -68,7 +73,7 @@
${project.version}
-
+
com.njcn
system-api
${project.version}
@@ -117,7 +122,6 @@
-
com.squareup.okhttp3
okhttp
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareHarmonicApplication.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java
similarity index 85%
rename from pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareHarmonicApplication.java
rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java
index 87a8fec6f..c9aa86347 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareHarmonicApplication.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/PrepareApplication.java
@@ -17,10 +17,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@EnableFeignClients(basePackages = "com.njcn")
@SpringBootApplication(scanBasePackages = "com.njcn")
@EnableMPP
-public class PrepareHarmonicApplication {
+public class PrepareApplication {
public static void main(String[] args) {
- SpringApplication.run(PrepareHarmonicApplication.class,args);
+ SpringApplication.run(PrepareApplication.class,args);
}
}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/process/PmsTerminalDetectionMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/process/PmsTerminalDetectionMapper.java
new file mode 100644
index 000000000..d911a7448
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/process/PmsTerminalDetectionMapper.java
@@ -0,0 +1,21 @@
+package com.njcn.prepare.harmonic.mapper.mysql.process;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.process.pojo.param.TerminalParam;
+import com.njcn.process.pojo.po.PmsTerminalDetection;
+import com.njcn.process.pojo.vo.TerminalVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author wr
+ * @since 2023-02-27
+ */
+public interface PmsTerminalDetectionMapper extends BaseMapper {
+
+}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/process/mapping/PmsTerminalDetectionMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/process/mapping/PmsTerminalDetectionMapper.xml
new file mode 100644
index 000000000..c475ec977
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/process/mapping/PmsTerminalDetectionMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java
index 468b06409..67f56eb6d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java
@@ -1,10 +1,14 @@
package com.njcn.prepare.harmonic.service.mysql.Impl.line;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPassRateDMapper;
import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO;
import com.njcn.prepare.harmonic.service.mysql.line.RMpPassRateDService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+
/**
*
* Description:
@@ -17,4 +21,10 @@ import org.springframework.stereotype.Service;
@Service
public class RMpPassRateDServiceImpl extends MppServiceImpl implements RMpPassRateDService{
+
+ @DS("process")
+ @Override
+ public List getAll() {
+ return this.list();
+ }
}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java
index 49ff637f1..e349877ff 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java
@@ -2,7 +2,10 @@ package com.njcn.prepare.harmonic.service.mysql.line;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO;
- /**
+
+import java.util.List;
+
+/**
*
* Description:
* 接口文档访问地址:http://serverIP:port/swagger-ui.html
@@ -13,5 +16,5 @@ import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO;
*/
public interface RMpPassRateDService extends IMppService {
-
+ List getAll();
}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/process/PmsTerminalDetectionService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/process/PmsTerminalDetectionService.java
new file mode 100644
index 000000000..c8ae07a26
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/process/PmsTerminalDetectionService.java
@@ -0,0 +1,23 @@
+package com.njcn.prepare.harmonic.service.mysql.process;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.process.pojo.param.TerminalParam;
+import com.njcn.process.pojo.po.PmsTerminalDetection;
+import com.njcn.process.pojo.vo.TerminalVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *
+ * 终端检测监督
+ *
+ *
+ * @author wr
+ * @since 2023-02-27
+ */
+public interface PmsTerminalDetectionService extends IService {
+
+}
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/process/impl/PmsTerminalDetectionServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/process/impl/PmsTerminalDetectionServiceImpl.java
new file mode 100644
index 000000000..c0c712255
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/process/impl/PmsTerminalDetectionServiceImpl.java
@@ -0,0 +1,25 @@
+package com.njcn.prepare.harmonic.service.mysql.process.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.prepare.harmonic.mapper.mysql.process.PmsTerminalDetectionMapper;
+import com.njcn.prepare.harmonic.service.mysql.process.PmsTerminalDetectionService;
+import com.njcn.process.pojo.po.PmsTerminalDetection;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 终端检测监督
+ *
+ *
+ * @author wr
+ * @since 2023-02-27
+ */
+@Service
+@RequiredArgsConstructor
+@DS("process")
+public class PmsTerminalDetectionServiceImpl extends ServiceImpl implements PmsTerminalDetectionService {
+
+
+}
diff --git a/pqs-prepare/prepare-boot/src/test/java/com/njcn/BaseJunitTest.java b/pqs-prepare/prepare-boot/src/test/java/com/njcn/BaseJunitTest.java
new file mode 100644
index 000000000..104d5abe4
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/test/java/com/njcn/BaseJunitTest.java
@@ -0,0 +1,19 @@
+package com.njcn;
+
+import com.njcn.prepare.PrepareApplication;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年12月10日 15:05
+ */
+@RunWith(SpringRunner.class)
+@WebAppConfiguration
+@SpringBootTest(classes = PrepareApplication.class)
+public class BaseJunitTest {
+
+}
diff --git a/pqs-prepare/prepare-boot/src/test/java/com/njcn/DemoTest.java b/pqs-prepare/prepare-boot/src/test/java/com/njcn/DemoTest.java
new file mode 100644
index 000000000..19d96a0d3
--- /dev/null
+++ b/pqs-prepare/prepare-boot/src/test/java/com/njcn/DemoTest.java
@@ -0,0 +1,42 @@
+package com.njcn;
+
+import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO;
+import com.njcn.prepare.harmonic.service.mysql.line.RMpPassRateDService;
+import com.njcn.prepare.harmonic.service.mysql.process.PmsTerminalDetectionService;
+import com.njcn.process.pojo.po.PmsTerminalDetection;
+import lombok.SneakyThrows;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2021年12月14日 12:55
+ */
+public class DemoTest extends BaseJunitTest {
+
+ @Autowired
+ private RMpPassRateDService rMpPassRateDService;
+
+ @Autowired
+ private PmsTerminalDetectionService pmsTerminalDetectionService;
+
+
+ @SneakyThrows
+ @Test
+ public void test() {
+ //查询pms库
+ List list1 = rMpPassRateDService.list();
+
+ //测试方法注解技术监督库
+ List list2 = rMpPassRateDService.getAll();
+
+ //测试service类注解技术监督库
+ List list = pmsTerminalDetectionService.list();
+ System.out.println("hello");
+
+ }
+
+}