From aec25cae320eafa39cde300d03e995e543cd2698 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 18 May 2023 15:51:04 +0800
Subject: [PATCH] 删除app模块
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml | 6 +++---
/dev/null | 10 ----------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDeviceReportService.java | 7 +++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DeviceReportVO.java | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DeviceReportController.java | 8 ++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.java | 6 +++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DeviceReportServiceImpl.java | 11 +++++------
skjcmanager/skjcmanager-service/pom.xml | 1 -
9 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/pom.xml b/skjcmanager/skjcmanager-service/pom.xml
index b19d3d5..da308b4 100644
--- a/skjcmanager/skjcmanager-service/pom.xml
+++ b/skjcmanager/skjcmanager-service/pom.xml
@@ -22,7 +22,6 @@
<module>skjcmanager-system</module>
<module>skjcmanager-user</module>
<module>skjcmanager-sm</module>
- <module>skjcmanger-app</module>
</modules>
<dependencies>
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/controller/DeviceReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DeviceReportController.java
similarity index 92%
rename from skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/controller/DeviceReportController.java
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DeviceReportController.java
index 46d4039..22945f3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/controller/DeviceReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DeviceReportController.java
@@ -1,8 +1,8 @@
-package cn.gistack.app.jcsb.controller;
+package cn.gistack.sm.jcsb.controller;
-import cn.gistack.app.jcsb.service.IDeviceReportService;
-import cn.gistack.app.jcsb.entity.DeviceReport;
-import cn.gistack.app.jcsb.vo.DeviceReportVO;
+import cn.gistack.sm.jcsb.service.IDeviceReportService;
+import cn.gistack.sm.jcsb.entity.DeviceReport;
+import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java
similarity index 97%
rename from skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java
index 7efda50..8385d51 100644
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DeviceReport.java
@@ -1,4 +1,4 @@
-package cn.gistack.app.jcsb.entity;
+package cn.gistack.sm.jcsb.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.java
similarity index 73%
rename from skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.java
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.java
index 90c39de..723c493 100644
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.java
@@ -1,7 +1,7 @@
-package cn.gistack.app.jcsb.mapper;
+package cn.gistack.sm.jcsb.mapper;
-import cn.gistack.app.jcsb.entity.DeviceReport;
-import cn.gistack.app.jcsb.vo.DeviceReportVO;
+import cn.gistack.sm.jcsb.entity.DeviceReport;
+import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml
similarity index 64%
rename from skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml
index a4c3381..b109980 100644
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/mapper/DeviceReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml
@@ -1,13 +1,13 @@
<?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="cn.gistack.app.jcsb.mapper.DeviceReportMapper">
+<mapper namespace="cn.gistack.sm.jcsb.mapper.DeviceReportMapper">
- <select id="getDetail" resultType="cn.gistack.app.jcsb.vo.DeviceReportVO">
+ <select id="getDetail" resultType="cn.gistack.sm.jcsb.vo.DeviceReportVO">
SELECT * FROM JCSB_DEVICE_REPORT
</select>
- <select id="selectDeviceReportPage" resultType="cn.gistack.app.jcsb.vo.DeviceReportVO">
+ <select id="selectDeviceReportPage" resultType="cn.gistack.sm.jcsb.vo.DeviceReportVO">
SELECT id,description,device_code,device_type,rainfall,water_level,flow,water_storage,specific_flood_limit,temporal_rainfall,record_time
FROM JCSB_DEVICE_REPORT WHERE is_deleted = 0
</select>
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/IDeviceReportService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDeviceReportService.java
similarity index 64%
rename from skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/IDeviceReportService.java
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDeviceReportService.java
index 2a68dc3..c18531f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/IDeviceReportService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDeviceReportService.java
@@ -1,9 +1,8 @@
-package cn.gistack.app.jcsb.service;
+package cn.gistack.sm.jcsb.service;
-import cn.gistack.app.jcsb.entity.DeviceReport;
-import cn.gistack.app.jcsb.vo.DeviceReportVO;
+import cn.gistack.sm.jcsb.entity.DeviceReport;
+import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.mp.base.BaseService;
public interface IDeviceReportService extends BaseService<DeviceReport> {
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/impl/DeviceReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DeviceReportServiceImpl.java
similarity index 66%
rename from skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/impl/DeviceReportServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DeviceReportServiceImpl.java
index aca5f6a..c3efaff 100644
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/service/impl/DeviceReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DeviceReportServiceImpl.java
@@ -1,11 +1,10 @@
-package cn.gistack.app.jcsb.service.impl;
+package cn.gistack.sm.jcsb.service.impl;
-import cn.gistack.app.jcsb.mapper.DeviceReportMapper;
-import cn.gistack.app.jcsb.entity.DeviceReport;
-import cn.gistack.app.jcsb.service.IDeviceReportService;
-import cn.gistack.app.jcsb.vo.DeviceReportVO;
+import cn.gistack.sm.jcsb.mapper.DeviceReportMapper;
+import cn.gistack.sm.jcsb.entity.DeviceReport;
+import cn.gistack.sm.jcsb.service.IDeviceReportService;
+import cn.gistack.sm.jcsb.vo.DeviceReportVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/vo/DeviceReportVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DeviceReportVO.java
similarity index 65%
rename from skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/vo/DeviceReportVO.java
rename to skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DeviceReportVO.java
index ff6b6c8..7a13c96 100644
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/vo/DeviceReportVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DeviceReportVO.java
@@ -1,6 +1,6 @@
-package cn.gistack.app.jcsb.vo;
+package cn.gistack.sm.jcsb.vo;
-import cn.gistack.app.jcsb.entity.DeviceReport;
+import cn.gistack.sm.jcsb.entity.DeviceReport;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/pom.xml b/skjcmanager/skjcmanager-service/skjcmanger-app/pom.xml
deleted file mode 100644
index 7822ea3..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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">
- <parent>
- <artifactId>skjcmanager-service</artifactId>
- <groupId>cn.gistack</groupId>
- <version>3.0.1.RELEASE</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>skjcmanger-app</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.springblade</groupId>
- <artifactId>blade-core-cloud</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springblade</groupId>
- <artifactId>blade-core-boot</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-annotations</artifactId>
- <version>2.0.9</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-
-</project>
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/AppApplication.java b/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/AppApplication.java
deleted file mode 100644
index 37beefe..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/AppApplication.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.gistack.app.jcsb;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springblade.core.cloud.client.BladeCloudApplication;
-import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.launch.constant.AppConstant;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-@BladeCloudApplication
-@EnableFeignClients({"cn.gistack"})
-@MapperScan({"org.springblade.**.mapper.**","cn.gistack.**.mapper.**"})
-public class AppApplication {
- public static void main(String[] args) {
- BladeApplication.run("blade-app", AppApplication.class, args);
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-dev.yml b/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-dev.yml
deleted file mode 100644
index 418bab3..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-#服务器端口
-server:
- port: 8111
-
-#数据源配置
-spring:
- datasource:
- url: ${blade.datasource.dev.url}
- username: ${blade.datasource.dev.username}
- password: ${blade.datasource.dev.password}
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-prod.yml b/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-prod.yml
deleted file mode 100644
index 733e2e3..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-#服务器端口
-server:
- port: 8111
-
-#数据源配置
-spring:
- datasource:
- url: ${blade.datasource.prod.url}
- username: ${blade.datasource.prod.username}
- password: ${blade.datasource.prod.password}
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-test.yml b/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-test.yml
deleted file mode 100644
index fee18e7..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-#服务器端口
-server:
- port: 8111
-
-#数据源配置
-spring:
- datasource:
- url: ${blade.datasource.test.url}
- username: ${blade.datasource.test.username}
- password: ${blade.datasource.test.password}
--
Gitblit v1.9.3