修改命名及配置

pom.xml

@@ -4,208 +4,213 @@
          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>
 
-    <groupId>com.sky.building</groupId>
-    <artifactId>wisdom_building</artifactId>
+    <groupId>com.sky</groupId>
+    <artifactId>sky_ioc_server</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <name>sky-building</name>
+    <name>ioc-server</name>
 
-    <description>skyversation building server</description>
+    <description>智慧运营管理中心</description>
     <packaging>war</packaging>
 
     <properties>
-        <geotools.version>25.2</geotools.version>
+        <java.version>1.8</java.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- 依赖版本控制 -->
+        <swagger.version>3.0.0</swagger.version>
+        <mybatis.plus.version>3.5.3</mybatis.plus.version>
+        <druid.version>1.2.15</druid.version>
+        <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <commons.fileupload.version>1.4</commons.fileupload.version>
+        <fastjson.version>1.2.83</fastjson.version>
+        <easyexcel.version>3.1.1</easyexcel.version>
     </properties>
 
-
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.2</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <version>2.5.14</version>
+        <relativePath/>
     </parent>
 
-
     <dependencies>
+        <!--spring web start-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <!--            打包专用，平时注释掉-->
-            <!--            <exclusions>-->
-            <!--                <exclusion>-->
-            <!--                    <groupId>org.springframework.boot</groupId>-->
-            <!--                    <artifactId>spring-boot-starter-tomcat</artifactId>-->
-            <!--                </exclusion>-->
-            <!--            </exclusions>-->
-        </dependency>
-        <!--            打包专用，平时注释掉-->
-        <!--        <dependency>-->
-        <!--            <groupId>javax.servlet</groupId>-->
-        <!--            <artifactId>javax.servlet-api</artifactId>-->
-        <!--            <version>3.1.0</version>-->
-        <!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.mybatis.spring.boot</groupId>-->
-<!--            <artifactId>mybatis-spring-boot-starter</artifactId>-->
-<!--            <version>2.2.0</version>-->
-<!--        </dependency>-->
-        <!--        excel 解析库-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
+        <!--maven打war包配置-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.1</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>runtime</scope>
         </dependency>
+        <!--spring web end-->
+
+        <!-- SpringBoot 拦截器 -->
         <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.13</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+
+        <!-- redis -->
         <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.13</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
+        <!-- spring boot 缓存 -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
+        <!-- springboot quartz定时任务 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-quartz</artifactId>-->
-<!--        </dependency>-->
+
+        <!-- spring boot 日志 -->
         <dependency>
-            <groupId>com.vividsolutions</groupId>
-            <artifactId>jts</artifactId>
-            <version>1.13</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
         </dependency>
-        <!-- swagger3.0 -->
+
+        <!-- spring boot 校验 -->
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
-        <!-- redis -->
-        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-redis -->
+
+        <!-- spring boot 测试 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-            <version>2.5.2</version>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
-<!--        &lt;!&ndash; spring cache&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-cache</artifactId>-->
-<!--        </dependency>-->
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
+
+        <!-- 阿里数据库连接池 -->
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-            <version>2.10.0</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>${druid.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+
+        <!--mybatis plus-->
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
-            <scope>provided</scope>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis.plus.version}</version>
+        </dependency>
+
+        <!-- pagehelper 分页插件 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>${pagehelper.boot.version}</version>
+        </dependency>
+
+        <!-- 定时任务 -->
+        <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.mchange</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- io常用工具类 -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons.io.version}</version>
+        </dependency>
+
+        <!-- 文件上传工具类 -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons.fileupload.version}</version>
+        </dependency>
+
+        <!-- excel工具 含poi -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>${easyexcel.version}</version>
+        </dependency>
+
+        <!-- mysql 驱动 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
+
+        <!-- swagger3.0 -->
         <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.8.3</version>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+            <version>${swagger.version}</version>
         </dependency>
+
+        <!-- fastjson -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.62</version>
+            <version>${fastjson.version}</version>
         </dependency>
+
+        <!-- lombok -->
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.8.1</version>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
         </dependency>
 
     </dependencies>
 
     <build>
-        <!--            打包专用，平时注释掉-->
-        <finalName>metadata-sky-war</finalName>
+        <finalName>${project.name}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.0.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
             </plugin>
-            <!--            <plugin>-->
-            <!--                <groupId>org.apache.maven.plugins</groupId>-->
-            <!--                <artifactId>maven-compiler-plugin</artifactId>-->
-            <!--                <version>3.8.1</version>-->
-            <!--                <configuration>-->
-            <!--                    &lt;!&ndash;                    编译使用，平时可不用&ndash;&gt;-->
-            <!--                    &lt;!&ndash;                    <verbose>true</verbose>&ndash;&gt;-->
-            <!--                    &lt;!&ndash;                    <fork>true</fork>&ndash;&gt;-->
-            <!--                    &lt;!&ndash;                    <executable>${JAVA8_HOME}/bin/javac</executable>&ndash;&gt;-->
-            <!--                </configuration>-->
-            <!--            </plugin>-->
-            <!--            <plugin>-->
-            <!--                <artifactId>maven-antrun-plugin</artifactId>-->
-            <!--                <executions>-->
-            <!--                    <execution>-->
-            <!--                        <phase>package</phase>-->
-            <!--                        <configuration>-->
-            <!--                            <tasks>-->
-            <!--                                <copy todir="src/main/docker" file="target/${project.artifactId}-${project.version}.${project.packaging}"/>-->
-            <!--                            </tasks>-->
-            <!--                        </configuration>-->
-            <!--                        <goals>-->
-            <!--                            <goal>run</goal>-->
-            <!--                        </goals>-->
-            <!--                    </execution>-->
-            <!--                </executions>-->
-            <!--            </plugin>-->
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>osgeo</id>
-            <name>OSGeo Release Repository</name>
-            <url>https://repo.osgeo.org/repository/release/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <!--不加如下updatePolicy会报错：resolution will not be reattempted until the update interval of XXX has elapsed or updates are force-->
-                <updatePolicy>always</updatePolicy>
-            </releases>
-        </repository>
-        <repository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>boundless</id>
-            <name>Boundless Maven Repository</name>
-            <url>http://repo.boundlessgeo.com/main</url>
-        </repository>
-    </repositories>
-
-
-
-
-
 </project>

src/main/java/com/sky/building/SkyBuildingApplication.java

@@ -1,20 +0,0 @@
-package com.sky.building;
-
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-
-/**
- * @author LunCe
- */
-@EnableOpenApi
-@MapperScan("com.sky.building.mapper")
-@SpringBootApplication
-public class SkyBuildingApplication  extends SpringBootServletInitializer {
-    public static void main(String[] args) {
-        SpringApplication.run(SkyBuildingApplication.class, args);
-    }
-}

src/main/java/com/sky/building/config/AuthInterceptor.java

@@ -1,18 +0,0 @@
-package com.sky.building.config;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-
-/**
- * @author LunCe
- * 拦截器
- */
-@Component
-@Slf4j
-public class AuthInterceptor implements HandlerInterceptor {
-
-
-}

src/main/java/com/sky/building/config/Swagger3Config.java

@@ -1,121 +0,0 @@
-package com.sky.building.config;
-
-import io.lettuce.core.dynamic.support.ReflectionUtils;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import springfox.documentation.builders.*;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-import springfox.documentation.schema.ScalarType;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import javax.annotation.Resource;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-@EnableOpenApi
-@Configuration
-public class Swagger3Config implements WebMvcConfigurer {
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.OAS_30)
-                .apiInfo(apiInfo())
-                .select()
-                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                .paths(PathSelectors.any())
-                .build();
-//                .globalRequestParameters(getGlobalRequestParameters())
-//                .globalResponses(HttpMethod.GET, getGlobalResonseMessage())
-//                .globalResponses(HttpMethod.POST, getGlobalResonseMessage());
-    }
-
-    //生成接口信息，包括标题、联系人等
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("Swagger3接口文档")
-                .description("更多请咨询服务开发者Zhh。")
-                .contact(new Contact("Ray。", "http://www.ruiyeclub.cn", "ruiyeclub@foxmail.com"))
-                .version("1.0")
-                .build();
-    }
-
-    //生成全局通用参数
-    private List<RequestParameter> getGlobalRequestParameters() {
-        List<RequestParameter> parameters = new ArrayList<>();
-        parameters.add(new RequestParameterBuilder()
-                .name("appid")
-                .description("平台id")
-                .required(true)
-                .in(ParameterType.QUERY)
-                .query(q -> q.model(m -> m.scalarModel(ScalarType.STRING)))
-                .required(false)
-                .build());
-        parameters.add(new RequestParameterBuilder()
-                .name("udid")
-                .description("设备的唯一id")
-                .required(true)
-                .in(ParameterType.QUERY)
-                .query(q -> q.model(m -> m.scalarModel(ScalarType.STRING)))
-                .required(false)
-                .build());
-        parameters.add(new RequestParameterBuilder()
-                .name("version")
-                .description("客户端的版本号")
-                .required(true)
-                .in(ParameterType.QUERY)
-                .query(q -> q.model(m -> m.scalarModel(ScalarType.STRING)))
-                .required(false)
-                .build());
-        return parameters;
-    }
-
-
-    /**
-     * 通用拦截器排除swagger设置，所有拦截器都会自动加swagger相关的资源排除信息
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-
-        try {
-            Field registrationsField = FieldUtils.getField(InterceptorRegistry.class, "registrations", true);
-            List<InterceptorRegistration> registrations = (List<InterceptorRegistration>) ReflectionUtils.getField(registrationsField, registry);
-            if (registrations != null) {
-                for (InterceptorRegistration interceptorRegistration : registrations) {
-                    interceptorRegistration
-                            .excludePathPatterns("/swagger**/**")
-                            .excludePathPatterns("/webjars/**")
-                            .excludePathPatterns("/v3/**")
-                            .excludePathPatterns("/doc.html");
-                }
-            }
-        } catch (Exception e) {
-             e.printStackTrace();
-        }
-        registry.addInterceptor(authInterceptor).addPathPatterns("/user/**");
-        registry.addInterceptor(authInterceptor).addPathPatterns("/role/**");
-        registry.addInterceptor(authInterceptor).addPathPatterns("/permission/**");
-        registry.addInterceptor(authInterceptor).addPathPatterns("/record/**");
-        registry.addInterceptor(authInterceptor).addPathPatterns("/service/**");
-        registry.addInterceptor(authInterceptor).addPathPatterns("/api/**");
-    }
-    @Resource
-    AuthInterceptor authInterceptor;
-
-    //生成通用响应信息
-    private List<Response> getGlobalResonseMessage() {
-        List<Response> responseList = new ArrayList<>();
-        responseList.add(new ResponseBuilder().code("404").description("找不到资源").build());
-        return responseList;
-    }
-
-
-
-}

src/main/java/com/sky/building/controller/BuildingBicarbonController.java

@@ -1,20 +0,0 @@
-package com.sky.building.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author LunCe
- * 智慧楼宇 -------数智双碳
- */
-@Slf4j
-@RestController
-@RequestMapping("live")
-public class BuildingBicarbonController {
-
-
-//    @Autowired
-//    private BuildingBicarbonService buildingBicarbonService;
-}

src/main/java/com/sky/building/controller/SmartsceneController.java

@@ -1,24 +0,0 @@
-package com.sky.building.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author LunCe
- * 智慧场景
- */
-@Slf4j
-@RestController
-@RequestMapping("live")
-public class SmartsceneController {
-
-
-
-
-
-
-}

src/main/java/com/sky/building/controller/enjoylifeIntelligently/EnjoyLifeIntelligentlyController.java

@@ -1,34 +0,0 @@
-package com.sky.building.controller.enjoylifeIntelligently;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author LunCe
- *
- *  智慧楼宇 -------智享生活
- *
- */
-
-
-@Slf4j
-@RestController
-@RequestMapping("live")
-public class EnjoyLifeIntelligentlyController {
-
-
-//    @Autowired
-//    private EnjoyLifeIntelligentlyService enjoyLifeIntelligentlyService;
-//
-//
-//    @ApiOperation("liveTest")
-//    @PostMapping("liveTest")
-//    public String liveTest(@RequestBody JSONObject jsonObject){
-//        return enjoyLifeIntelligentlyService.liveTest(jsonObject);
-//    }
-
-
-
-}

src/main/java/com/sky/building/entity/ScheduleSetting.java

@@ -1,25 +0,0 @@
-package com.sky.building.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import org.springframework.data.annotation.Id;
-
-/**
- * @author LunCe
- */
-@Data
-public class ScheduleSetting {
-
-    @TableId
-    private Integer jobId;
-    private String beanName;
-    private String MethodName;
-    private String cronExpression;
-    private String remark;
-    private String jobStatus;
-    private Data  createTime;
-    private Data  updateTile;
-
-
-}

src/main/java/com/sky/building/mapper/ScheduleSettingMapper.java

@@ -1,13 +0,0 @@
-package com.sky.building.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sky.building.entity.ScheduleSetting;
-import org.springframework.stereotype.Repository;
-
-/**
- * @author LunCe
- */
-
-@Repository
-public interface ScheduleSettingMapper extends BaseMapper<ScheduleSetting> {
-}

src/main/java/com/sky/building/service/EnjoyLifeIntelligently/HealthCabinService.java

@@ -1,16 +0,0 @@
-package com.sky.building.service.enjoylifeIntelligently;
-
-/**
- * TODO
- *
- * @Description
- * @Author LunCe
- * @Date 2023/2/10 17:35
- **/
-public interface HealthCabinService {
-    String getCoreIndicators(Integer dateType);
-
-    String getHutAnalysis(Integer dateType);
-
-    String getEnvironmentalDetection(Integer dateType);
-}

src/main/java/com/sky/building/service/EnjoyLifeIntelligently/ParkingService.java

@@ -1,22 +0,0 @@
-package com.sky.building.service.enjoylifeIntelligently;
-
-/**
- * TODO
- *
- * @Description
- * @Author LunCe
- * @Date 2023/2/10 13:44
- **/
-public interface ParkingService {
-    String getCoreIndicators(Integer dateType);
-
-    String getTrafficflowSituation(Integer dateType);
-
-    String getVacantParkingSpace(Integer dateType);
-
-    String getStopViolation(Integer dateType);
-
-    String getOccupationOfParkingSpace(Integer dateType);
-
-    String getParkingSpaceDetails(Integer dateType);
-}

src/main/java/com/sky/building/service/EnjoyLifeIntelligently/RestaurantService.java

@@ -1,20 +0,0 @@
-package com.sky.building.service.enjoylifeIntelligently;
-
-/**
- * @author LunCe
- */
-public interface RestaurantService {
-    String getPaymentAnalysis(Integer dateType);
-
-    String getCoreIndicators(Integer dateType);
-
-    String getWelcomeDishes(Integer dateType);
-
-    String getConsumptionAnalysis(Integer dateType);
-
-    String getTodayMenu();
-
-    String getProfitAnalysis(Integer dateType);
-
-    String getMealAnalysis(Integer dateType);
-}

src/main/java/com/sky/building/service/EnjoyLifeIntelligently/SupermarketService.java

@@ -1,16 +0,0 @@
-package com.sky.building.service.enjoylifeIntelligently;
-
-/**
- * TODO
- *
- * @Description
- * @Author LunCe
- * @Date 2023/2/10 14:19
- **/
-public interface SupermarketService {
-    String getCoreIndicators(Integer dateType);
-
-    String getQuotientAnalysiss(Integer dateType);
-
-    String getProductRanking(Integer dateType);
-}

src/main/java/com/sky/building/service/EnjoyLifeIntelligently/impl/HealthCabinServiceImpl.java

@@ -1,33 +0,0 @@
-package com.sky.building.service.enjoylifeIntelligently.impl;
-
-import com.sky.building.service.enjoylifeIntelligently.HealthCabinService;
-import com.sky.building.tool.Constant;
-import com.sky.building.tool.FalseData;
-import com.sky.building.tool.MessageManage;
-import org.springframework.stereotype.Service;
-
-/**
- * TODO
- *
- * @Description
- * @Author LunCe
- * @Date 2023/2/10 17:35
- **/
-
-@Service
-public class HealthCabinServiceImpl implements HealthCabinService {
-    @Override
-    public String getCoreIndicators(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST4,"查询成功");
-    }
-
-    @Override
-    public String getHutAnalysis(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSMAP,"查询成功");
-    }
-
-    @Override
-    public String getEnvironmentalDetection(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST3,"查询成功");
-    }
-}

src/main/java/com/sky/building/service/EnjoyLifeIntelligently/impl/ParkingServiceImpl.java

@@ -1,51 +0,0 @@
-package com.sky.building.service.enjoylifeIntelligently.impl;
-
-import com.sky.building.service.enjoylifeIntelligently.ParkingService;
-import com.sky.building.tool.Constant;
-import com.sky.building.tool.FalseData;
-import com.sky.building.tool.MessageManage;
-import org.springframework.stereotype.Service;
-
-/**
- * TODO
- *
- * @Description
- * @Author LunCe
- * @Date 2023/2/10 13:45
- **/
-@Service
-public class ParkingServiceImpl implements ParkingService {
-
-
-    @Override
-    public String getCoreIndicators(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST4,"查询成功");
-    }
-
-    @Override
-    public String getTrafficflowSituation(Integer dateType) {
-        return  MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSMAP,"查询成功");
-    }
-
-    @Override
-    public String getVacantParkingSpace(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST5,"查询成功");
-    }
-    @Override
-    public String getParkingSpaceDetails(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST5,"查询成功");
-    }
-
-
-    @Override
-    public String getStopViolation(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST2,"查询成功");
-    }
-
-    @Override
-    public String getOccupationOfParkingSpace(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST2,"查询成功");
-    }
-
-
-}

src/main/java/com/sky/building/service/EnjoyLifeIntelligently/impl/RestaurantServiceImpl.java

@@ -1,82 +0,0 @@
-package com.sky.building.service.enjoylifeIntelligently.impl;
-
-import com.sky.building.service.enjoylifeIntelligently.RestaurantService;
-import com.sky.building.tool.Constant;
-import com.sky.building.tool.FalseData;
-import com.sky.building.tool.MessageManage;
-import org.springframework.stereotype.Service;
-
-
-/**
- * @author LunCe
- */
-@Service
-public class RestaurantServiceImpl implements RestaurantService {
-
-
-    /**
-     * TODO  查询智慧生活中智慧餐厅的支付分析
-     * @Description
-     * @Param dateType
-     * @Return java.lang.String
-     * @Author LunCe
-     * @date 2023/2/10 11:25
-     */
-    @Override
-    public String getPaymentAnalysis(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,FalseData.REPORTFORMSLIST2,"查询成功");
-    }
-
-
-    /**
-     * 查询智慧生活中智慧餐厅的核心指标
-     * */
-    @Override
-    public String getCoreIndicators(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,FalseData.REPORTFORMSLIST4,"查询成功");
-    }
-
-    /**
-     * 查询智慧生活中智慧餐厅的欢迎菜品
-     * */
-    @Override
-    public String getWelcomeDishes(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,FalseData.REPORTFORMSLIST3,"查询成功");
-    }
-
-
-
-    /**
-     * 查询智慧生活中智慧餐厅的消费分析
-     * */
-    @Override
-    public String getConsumptionAnalysis(Integer dateType) {
-
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,FalseData.REPORTFORMSMAP.get(dateType),"查询成功");
-    }
-
-
-    /**
-     * 查询智慧生活中智慧餐厅的今日菜谱
-     * */
-    @Override
-    public String getTodayMenu() {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,FalseData.REPORTFORMSLIST3,"查询成功");
-    }
-
-    /**
-     * 查询智慧生活中智慧餐厅的盈利分析
-     * */
-    @Override
-    public String getProfitAnalysis(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,FalseData.REPORTFORMSLIST2,"查询成功");
-    }
-
-    /**
-     * 查询智慧生活中智慧餐厅的用餐分析
-     * */
-    @Override
-    public String getMealAnalysis(Integer dateType) {
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,FalseData.REPORTFORMSMAP.get(dateType),"查询成功");
-    }
-}

src/main/java/com/sky/building/service/EnjoyLifeIntelligently/impl/SupermarketServiceImpl.java

@@ -1,32 +0,0 @@
-package com.sky.building.service.enjoylifeIntelligently.impl;
-
-import com.sky.building.service.enjoylifeIntelligently.SupermarketService;
-import com.sky.building.tool.Constant;
-import com.sky.building.tool.FalseData;
-import com.sky.building.tool.MessageManage;
-import org.springframework.stereotype.Service;
-
-/**
- * TODO
- *
- * @Description
- * @Author LunCe
- * @Date 2023/2/10 14:19
- **/
-@Service
-public class SupermarketServiceImpl implements SupermarketService {
-    @Override
-    public String getCoreIndicators(Integer dateType) {
-        return  MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST4,"查询成功");
-    }
-
-    @Override
-    public String getQuotientAnalysiss(Integer dateType) {
-        return  MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSMAP,"查询成功");
-    }
-
-    @Override
-    public String getProductRanking(Integer dateType) {
-        return  MessageManage.getInstance().getResultContent(Constant.SUCCESS, FalseData.REPORTFORMSLIST5,"查询成功");
-    }
-}

src/main/java/com/sky/building/service/SmartSignage/PersonnelService.java

@@ -1,10 +0,0 @@
-package com.sky.building.service.smartsignage;
-
-/**
- * @author LunCe
- */
-public interface PersonnelService {
-    String personnelInfoCount();
-
-    String getPersonnelInfoList();
-}

src/main/java/com/sky/building/service/SmartSignage/SmartSignageService.java

@@ -1,10 +0,0 @@
-package com.sky.building.service.smartsignage;
-
-/**
- * @author LunCe
- */
-public interface SmartSignageService {
-    String getBuildingSituation();
-
-    String getCarbonQuota();
-}

src/main/java/com/sky/building/tool/Constant.java

@@ -1,54 +0,0 @@
-package com.sky.building.tool;
-
-
-public class Constant {
-
-    public static String skyServiceHead;
-
-    /** 网络请求返回值 **/
-    public final static int SUCCESS = 200;
-    /** 参数错误 **/
-    public final static int PARAM_ERROR = -1;
-    /** 服务端错误 **/
-    public final static int SERVER_ERROR = 500;
-    /** 无权限 **/
-    public final static int NO_PERMISSION = 201;
-    /** 数据错误，无数据 **/
-    public final static int NO_DATA = 202;
-    /** 内部错误 **/
-    public final static int INTER_ERROR = 203;
-    /** 数据库错误 **/
-    public final static int DATABASE_ERROR = 204;
-    /** 数据为空 **/
-    public final static int NULL_DATA = 205;
-    /** 用户过期 **/
-    public final static int USER_FAILURE = 206;
-    /** 用户失效 **/
-    public final static int USER_ARCHIVED = 207;
-    /** 无token **/
-    public final static int NO_TOKEN = 208;
-    /** 经纬度错误 **/
-    public final static int ERROR_LATLON = 209;
-    /** 文件错误 **/
-    public final static int FILE_ERROR = 216;
-    /** 无附件文件 **/
-    public final static int NO_FILE_ERROR = 210;
-    /** 模型数据错误，无模型 **/
-    public final static int NO_MODEL_ERROR = 211;
-    /** 无效token **/
-    public final static int FAILURE_TOKEN = 212;
-    /** 更新时间过旧 **/
-    public final static int OLD_TIME = 213;
-    /** RestTemplate请求失败*/
-    public final static int RETURN_ERROR=214;
-    /** 数据格式错误 **/
-    public final static int DATA_ERROR = 215;
-
-
-    public final static String REDIS_USER_ID = "REDIS_USER_ID";
-
-    // TODO 部署使用地址
-    /** oauth地址获取token地址 **/
-    public final static String OAUTH_GET_USER_BY_TOKEN = ":8888/oauth/api/user/getUserByToken";
-
-}

src/main/java/com/sky/building/tool/MessageManage.java

@@ -1,111 +0,0 @@
-package com.sky.building.tool;
-
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONException;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-
-/***
- * 接口返回消息封装管理工具
- * @author LunCe
- */
-
-@Slf4j
-public class MessageManage {
-
-    private static MessageManage messageManage = new MessageManage();
-    private MessageManage(){}
-    public static MessageManage getInstance(){
-        if(messageManage == null)
-            messageManage = new MessageManage();
-        return messageManage;
-    }
-
-    public String getResultContent(int code, String content, String message){
-        JSONObject json = new JSONObject();
-        try {
-            json.put("code", code);
-            if(content == null || content.equals("")){
-                json.put("content", new JSONArray());
-            } else {
-                json.put("content", content);
-            }
-            json.put("message", message);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        log.info(json.toString());
-        return json.toString();
-    }
-
-    public String getResultContent(int code, Object bean, String message){
-        JSONObject json = new JSONObject();
-        try {
-            json.put("code", code);
-            if(bean == null){
-                json.put("content", new JSONArray());
-            } else {
-                json.put("content", JSON.toJSON(bean));
-            }
-            json.put("message", message);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        log.info(json.toString());
-        return json.toString();
-    }
-
-    public String getResultContent(int code, List lis, String message){
-        JSONObject json = new JSONObject();
-        try {
-            json.put("code", code);
-            json.put("message", message);
-            if(lis != null && lis.size() > 0){
-                JSONArray data = new JSONArray();
-                for(Object obj : lis){
-                    data.add(JSON.toJSON(obj));
-                }
-                json.put("content", data);
-            } else {
-                json.put("content", new JSONArray());
-            }
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        log.info(json.toString());
-        return json.toString();
-    }
-
-    public String getResultContent(int code, List lis, String message, Long total){
-        JSONObject json = new JSONObject();
-        try {
-            json.put("code", code);
-            json.put("message", message);
-            if(total == null || total < 0){
-                json.put("total", 0);
-            } else {
-                json.put("total", total);
-            }
-            if(lis != null && lis.size() > 0){
-                JSONArray data = new JSONArray();
-                for(Object obj : lis){
-                    data.add(JSON.toJSON(obj));
-                }
-                json.put("content", data);
-            } else {
-                json.put("content", new JSONArray());
-            }
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        log.info(json.toString());
-        return json.toString();
-    }
-
-}

src/main/java/com/sky/ioc/SkyIocApplication.java

@@ -0,0 +1,12 @@
+package com.sky.ioc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SkyIocApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SkyIocApplication.class, args);
+    }
+}

src/main/java/com/sky/building/controller/ApiController.java → src/main/java/com/sky/ioc/api/ApiController.java

@@ -1,4 +1,4 @@
-package com.sky.building.controller;
+package com.sky.ioc.api;
 
 
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/sky/building/config/GlobalExceptionHandler.java → src/main/java/com/sky/ioc/config/GlobalExceptionHandler.java

@@ -1,12 +1,7 @@
-package com.sky.building.config;
+package com.sky.ioc.config;
 
-import com.alibaba.fastjson.JSONObject;
-import com.sky.building.tool.Constant;
-import com.sky.building.tool.MessageManage;
-import lombok.Data;
+import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -25,13 +20,13 @@ import java.io.PrintStream;
 public class GlobalExceptionHandler {
 
     @ExceptionHandler(Exception.class)
-    public String exception(Exception e,HttpServletRequest request) {
+    public ReturnMsg exception(Exception e,HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         StringBuffer requestURL = request.getRequestURL();
         // 打印出错误日志
         String exceptionAllinformation_01 = getExceptionAllinformation_01(e);
         log.error("异常地址'{"+requestURL+"}'","发生异常为：'{"+exceptionAllinformation_01+"'}");
-        return  MessageManage.getInstance().getResultContent(Constant.INTER_ERROR,"异常地址'{"+requestURL+"}'","发生异常为：'{"+exceptionAllinformation_01+"'}");
+        return ReturnMsg.fail();
     }
 
     public static String getExceptionAllinformation_01(Exception ex) {

src/main/java/com/sky/building/config/MyRedisConfig.java → src/main/java/com/sky/ioc/config/MyRedisConfig.java

@@ -1,4 +1,4 @@
-package com.sky.building.config;
+package com.sky.ioc.config;
 
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;

src/main/java/com/sky/ioc/config/MybatisPlusConfig.java

@@ -0,0 +1,9 @@
+package com.sky.ioc.config;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("com.sky.**.mapper")
+public class MybatisPlusConfig {
+}

src/main/java/com/sky/ioc/config/SkyConfig.java

@@ -0,0 +1,30 @@
+package com.sky.ioc.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "sky")
+public class SkyConfig {
+    /** 项目名称 */
+    private static String name;
+
+    /** 版本 */
+    private static String version;
+
+    public static String getName() {
+        return name;
+    }
+
+    public static void setName(String name) {
+        SkyConfig.name = name;
+    }
+
+    public static String getVersion() {
+        return version;
+    }
+
+    public static void setVersion(String version) {
+        SkyConfig.version = version;
+    }
+}

src/main/java/com/sky/ioc/config/SwaggerConfig.java

@@ -0,0 +1,56 @@
+package com.sky.ioc.config;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.oas.annotations.EnableOpenApi;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+/**
+ * Swagger的接口配置
+ */
+@EnableOpenApi
+@Configuration
+public class SwaggerConfig {
+    /**
+     * 是否开启swagger
+     */
+    @Value("${swagger.enabled}")
+    private boolean enabled;
+
+    /**
+     * 创建API
+     */
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.OAS_30)
+                .enable(enabled)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .paths(PathSelectors.any()).build();
+    }
+
+    /**
+     * 添加摘要信息
+     */
+    private ApiInfo apiInfo() {
+        // 用ApiInfoBuilder进行定制
+        return new ApiInfoBuilder()
+                // 设置标题
+                .title(SkyConfig.getName())
+                // 描述
+                .description("")
+                // 作者信息
+                .contact(new Contact(SkyConfig.getName(), null, null))
+                // 版本
+                .version("版本号:" + SkyConfig.getVersion()).build();
+    }
+}

src/main/java/com/sky/ioc/constant/Constant.java

@@ -0,0 +1,7 @@
+package com.sky.ioc.constant;
+
+
+public class Constant {
+
+    public static MsgCode MSG_CODE = new MsgCode();
+}

src/main/java/com/sky/ioc/constant/MsgCode.java

@@ -0,0 +1,13 @@
+package com.sky.ioc.constant;
+
+public class MsgCode {
+
+    /** 网络请求返回值 **/
+    public final int SUCCESS = 200;
+    /** 无权限 **/
+    public final int NO_PERMISSION = 201;
+    /** 参数错误 **/
+    public final int PARAM_ERROR = 202;
+    /** 服务端错误 **/
+    public final int SERVER_ERROR = 500;
+}

src/main/java/com/sky/building/controller/SmartOfficeController.java → src/main/java/com/sky/ioc/controller/carbon/CarbonController.java

@@ -1,16 +1,12 @@
-package com.sky.building.controller;
+package com.sky.ioc.controller.carbon;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author LunCe
- *
- * 智慧办公
- */
+/** 智能看板 */
 @Slf4j
 @RestController
-@RequestMapping("live")
-public class SmartOfficeController {
+@RequestMapping("/carbon")
+public class CarbonController {
 }

src/main/java/com/sky/building/controller/smartsignage/AssetsController.java → src/main/java/com/sky/ioc/controller/dashboard/AssetsController.java

@@ -1,4 +1,4 @@
-package com.sky.building.controller.smartsignage;
+package com.sky.ioc.controller.dashboard;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/sky/building/controller/smartsignage/SmartSignageController.java → src/main/java/com/sky/ioc/controller/dashboard/DashboardController.java

@@ -1,7 +1,7 @@
-package com.sky.building.controller.smartsignage;
+package com.sky.ioc.controller.dashboard;
 
-import com.sky.building.service.smartsignage.SmartSignageService;
-import io.swagger.annotations.Api;
+import com.sky.ioc.service.dashboard.SmartSignageService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,18 +9,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author LunCe
- * 智慧楼宇 ------智能看板
- */
-
-@Api("智慧楼宇 ------智能看板")
+/** 智能看板 */
 @Slf4j
 @RestController
-@RequestMapping("signage")
-public class SmartSignageController {
-
-
+@RequestMapping("/dashboard")
+public class DashboardController {
 
     @Autowired
     private SmartSignageService smartSignageService;
@@ -33,7 +26,7 @@ public class SmartSignageController {
 
     @ApiOperation("智能看板-楼宇态势")
     @GetMapping("getBuildingSituation")
-    public String getBuildingSituation(){
+    public ReturnMsg getBuildingSituation(){
         return smartSignageService.getBuildingSituation();
     }
 
@@ -45,9 +38,7 @@ public class SmartSignageController {
      * */
     @ApiOperation("智能看板-碳配额")
     @GetMapping("getCarbonQuota")
-    public String getCarbonQuota(){
+    public ReturnMsg getCarbonQuota(){
         return smartSignageService.getCarbonQuota();
     }
-
-
 }

src/main/java/com/sky/building/controller/smartsignage/DiningRoomController.java → src/main/java/com/sky/ioc/controller/dashboard/DiningRoomController.java

@@ -1,4 +1,4 @@
-package com.sky.building.controller.smartsignage;
+package com.sky.ioc.controller.dashboard;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/sky/building/controller/smartsignage/ElectricityController.java → src/main/java/com/sky/ioc/controller/dashboard/ElectricityController.java

@@ -1,4 +1,4 @@
-package com.sky.building.controller.smartsignage;
+package com.sky.ioc.controller.dashboard;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/sky/building/controller/smartsignage/PersonnelController.java → src/main/java/com/sky/ioc/controller/dashboard/PersonnelController.java

@@ -1,6 +1,7 @@
-package com.sky.building.controller.smartsignage;
+package com.sky.ioc.controller.dashboard;
 
-import com.sky.building.service.smartsignage.PersonnelService;
+import com.sky.ioc.service.dashboard.PersonnelService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +28,7 @@ public class PersonnelController {
 
     @ApiOperation("查询智能看板统计画像的统计人员信息")
     @GetMapping("getPersonnelInfoCount")
-    public String  getPersonnelInfoCount(){
+    public ReturnMsg getPersonnelInfoCount(){
         return personnelService.personnelInfoCount();
     }
 
@@ -35,7 +36,7 @@ public class PersonnelController {
 
     @ApiOperation("查询智能看板统计画像的统计人员信息报表")
     @GetMapping("getPersonnelInfoList")
-    public String  getPersonnelInfoList(){
+    public ReturnMsg  getPersonnelInfoList(){
         return personnelService.getPersonnelInfoList();
     }
 

src/main/java/com/sky/building/controller/smartsignage/UseColdController.java → src/main/java/com/sky/ioc/controller/dashboard/UseColdController.java

@@ -1,4 +1,4 @@
-package com.sky.building.controller.smartsignage;
+package com.sky.ioc.controller.dashboard;
 
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/sky/building/controller/smartsignage/UseHeatController.java → src/main/java/com/sky/ioc/controller/dashboard/UseHeatController.java

@@ -1,4 +1,4 @@
-package com.sky.building.controller.smartsignage;
+package com.sky.ioc.controller.dashboard;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/sky/building/controller/smartsignage/WaterController.java → src/main/java/com/sky/ioc/controller/dashboard/WaterController.java

@@ -1,4 +1,4 @@
-package com.sky.building.controller.smartsignage;
+package com.sky.ioc.controller.dashboard;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/sky/building/controller/enjoylifeIntelligently/HealthCabinController.java → src/main/java/com/sky/ioc/controller/life/HealthHomeController.java

@@ -1,6 +1,7 @@
-package com.sky.building.controller.enjoylifeIntelligently;
+package com.sky.ioc.controller.life;
 
-import com.sky.building.service.enjoylifeIntelligently.HealthCabinService;
+import com.sky.ioc.service.life.HealthService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -9,46 +10,39 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * TODO
- *
- * @Description
- * @Author LunCe
- * @Date 2023/2/10 17:32
- **/
 
 @Api("健康小屋")
 @Slf4j
 @RestController
-@RequestMapping("health_cabin")
-public class HealthCabinController {
+@RequestMapping("healthhome")
+public class HealthHomeController {
 
     @Autowired
-    private HealthCabinService healthCabinService;
+    private HealthService healthService;
 
     @ApiOperation("查询智慧生活中健康小屋的核心指标")
     @GetMapping("getCoreIndicators")
-    public String  getCoreIndicators(Integer dateType){
+    public ReturnMsg getCoreIndicators(Integer dateType){
 //        dateType   1.周，2.月，3.年
-        return healthCabinService.getCoreIndicators(dateType);
+        return healthService.getCoreIndicators(dateType);
     }
 
 
 
     @ApiOperation("查询智慧生活中健康小屋的小屋分析")
     @GetMapping("getHutAnalysis")
-    public String  getHutAnalysis(Integer dateType){
+    public ReturnMsg  getHutAnalysis(Integer dateType){
 //        dateType   1.周，2.月，3.年
-        return healthCabinService.getHutAnalysis(dateType);
+        return healthService.getHutAnalysis(dateType);
     }
 
 
 
     @ApiOperation("查询智慧生活中健康小屋的环境监测")
     @GetMapping("getEnvironmentalDetection")
-    public String  getEnvironmentalDetection(Integer dateType){
+    public ReturnMsg  getEnvironmentalDetection(Integer dateType){
 //        dateType   1.周，2.月，3.年
-        return healthCabinService.getEnvironmentalDetection(dateType);
+        return healthService.getEnvironmentalDetection(dateType);
     }
 
 

src/main/java/com/sky/building/controller/SmartOperationController.java → src/main/java/com/sky/ioc/controller/life/LifeController.java

@@ -1,15 +1,13 @@
-package com.sky.building.controller;
+package com.sky.ioc.controller.life;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author LunCe
- * 智慧运营
- */
+/** 智享生活 */
 @Slf4j
 @RestController
-@RequestMapping("live")
-public class SmartOperationController {
+@RequestMapping("/life")
+public class LifeController {
+
 }

src/main/java/com/sky/building/controller/enjoylifeIntelligently/ParkingController.java → src/main/java/com/sky/ioc/controller/life/ParkingController.java

@@ -1,6 +1,7 @@
-package com.sky.building.controller.enjoylifeIntelligently;
+package com.sky.ioc.controller.life;
 
-import com.sky.building.service.enjoylifeIntelligently.ParkingService;
+import com.sky.ioc.service.life.ParkingService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -32,7 +33,7 @@ public class ParkingController {
 
     @ApiOperation("查询智慧生活中智慧停车的核心指标")
     @GetMapping("getCoreIndicators")
-    public String  getCoreIndicators(Integer dateType){
+    public ReturnMsg getCoreIndicators(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return parkingService.getCoreIndicators(dateType);
     }
@@ -40,7 +41,7 @@ public class ParkingController {
 
     @ApiOperation("查询智慧生活中智慧停车的车流态势")
     @GetMapping("getTrafficflowSituation")
-    public String  getTrafficflowSituation(Integer dateType){
+    public ReturnMsg  getTrafficflowSituation(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return parkingService.getTrafficflowSituation(dateType);
     }
@@ -48,7 +49,7 @@ public class ParkingController {
 
     @ApiOperation("查询智慧生活中智慧停车的空置车位")
    // @GetMapping("getTrafficflowSituation")
-    public String  getVacantParkingSpace(Integer dateType){
+    public ReturnMsg  getVacantParkingSpace(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return parkingService.getVacantParkingSpace(dateType);
     }
@@ -57,7 +58,7 @@ public class ParkingController {
 
     @ApiOperation("查询智慧生活中智慧停车的车位详情")
     @GetMapping("getParkingSpaceDetails")
-    public String  getParkingSpaceDetails(Integer dateType){
+    public ReturnMsg  getParkingSpaceDetails(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return parkingService.getParkingSpaceDetails(dateType);
     }
@@ -65,7 +66,7 @@ public class ParkingController {
 
     @ApiOperation("查询智慧生活中智慧停车的违停情况")
     @GetMapping("getStopViolation")
-    public String  getStopViolation(Integer dateType){
+    public ReturnMsg  getStopViolation(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return parkingService.getStopViolation(dateType);
     }
@@ -74,7 +75,7 @@ public class ParkingController {
 
     @ApiOperation("查询智慧生活中智慧停车的占用车位数量")
     @GetMapping("getOccupationOfParkingSpace")
-    public String  getOccupationOfParkingSpace(Integer dateType){
+    public ReturnMsg  getOccupationOfParkingSpace(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return parkingService.getOccupationOfParkingSpace(dateType);
     }

src/main/java/com/sky/building/controller/enjoylifeIntelligently/RestaurantController.java → src/main/java/com/sky/ioc/controller/life/RestaurantController.java

@@ -1,6 +1,7 @@
-package com.sky.building.controller.enjoylifeIntelligently;
+package com.sky.ioc.controller.life;
 
-import com.sky.building.service.enjoylifeIntelligently.RestaurantService;
+import com.sky.ioc.service.life.RestaurantService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -28,34 +29,34 @@ public class RestaurantController {
 
     @ApiOperation("查询智慧生活中智慧餐厅的核心指标")
     @GetMapping("getCoreIndicators")
-    public String  getCoreIndicators(Integer dateType){
+    public ReturnMsg  getCoreIndicators(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return restaurantService.getCoreIndicators(dateType);
     }
 
     @ApiOperation("查询智慧生活中智慧餐厅的用餐分析")
     @GetMapping("getMealAnalysis")
-    public String  getMealAnalysis(Integer dateType){
+    public ReturnMsg  getMealAnalysis(Integer dateType){
         return restaurantService.getMealAnalysis(dateType);
     }
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的欢迎菜品")
     @GetMapping("getWelcomeDishes")
-    public String  getWelcomeDishes(Integer dateType){
+    public ReturnMsg getWelcomeDishes(Integer dateType){
         return restaurantService.getWelcomeDishes(dateType);
     }
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的消费分析")
     @GetMapping("getConsumptionAnalysis")
-    public String  getConsumptionAnalysis(Integer dateType){
+    public ReturnMsg  getConsumptionAnalysis(Integer dateType){
         return restaurantService.getConsumptionAnalysis(dateType);
     }
 
     @ApiOperation("查询智慧生活中智慧餐厅的盈利分析")
     @GetMapping("getProfitAnalysis")
-    public String  getProfitAnalysis(Integer dateType){
+    public ReturnMsg  getProfitAnalysis(Integer dateType){
         return restaurantService.getProfitAnalysis(dateType);
     }
 
@@ -70,14 +71,14 @@ public class RestaurantController {
      */
     @ApiOperation("查询智慧生活中智慧餐厅的支付分析")
     @GetMapping("getPaymentAnalysis")
-    public String  getPaymentAnalysis(Integer dateType){
+    public ReturnMsg  getPaymentAnalysis(Integer dateType){
         return restaurantService.getPaymentAnalysis(dateType);
     }
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的今日菜谱")
     @GetMapping("getTodayMenu")
-    public String  getTodayMenu(){
+    public ReturnMsg  getTodayMenu(){
         return restaurantService.getTodayMenu();
     }
 

src/main/java/com/sky/building/controller/enjoylifeIntelligently/SupermarketController.java → src/main/java/com/sky/ioc/controller/life/SupermarketController.java

@@ -1,6 +1,7 @@
-package com.sky.building.controller.enjoylifeIntelligently;
+package com.sky.ioc.controller.life;
 
-import com.sky.building.service.enjoylifeIntelligently.SupermarketService;
+import com.sky.ioc.service.life.SupermarketService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -30,7 +31,7 @@ public class SupermarketController {
 
     @ApiOperation("查询智慧生活中无人超市的核心指标")
     @GetMapping("getCoreIndicators")
-    public String  getCoreIndicators(Integer dateType){
+    public ReturnMsg getCoreIndicators(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return supermarketService.getCoreIndicators(dateType);
     }
@@ -39,7 +40,7 @@ public class SupermarketController {
 
     @ApiOperation("查询智慧生活中无人超市的商超分析")
     @GetMapping("getQuotientAnalysiss")
-    public String  getQuotientAnalysiss(Integer dateType){
+    public ReturnMsg  getQuotientAnalysiss(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return supermarketService.getQuotientAnalysiss(dateType);
     }
@@ -47,7 +48,7 @@ public class SupermarketController {
 
     @ApiOperation("查询智慧生活中无人超市的商品排行")
     @GetMapping("getProductRanking")
-    public String  getProductRanking(Integer dateType){
+    public ReturnMsg  getProductRanking(Integer dateType){
 //        dateType   1.周，2.月，3.年
         return supermarketService.getProductRanking(dateType);
     }

src/main/java/com/sky/ioc/controller/work/WorkController.java

@@ -0,0 +1,12 @@
+package com.sky.ioc.controller.work;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/** 智慧办公 */
+@Slf4j
+@RestController
+@RequestMapping("/work")
+public class WorkController {
+}

src/main/java/com/sky/building/entity/smartsignage/Personnel.java → src/main/java/com/sky/ioc/entity/result/dashboard/Personnel.java

@@ -1,4 +1,4 @@
-package com.sky.building.entity.smartsignage;
+package com.sky.ioc.entity.result.dashboard;
 
 import lombok.Data;
 

src/main/java/com/sky/ioc/service/dashboard/PersonnelService.java

@@ -0,0 +1,12 @@
+package com.sky.ioc.service.dashboard;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * @author LunCe
+ */
+public interface PersonnelService {
+    ReturnMsg personnelInfoCount();
+
+    ReturnMsg getPersonnelInfoList();
+}

src/main/java/com/sky/ioc/service/dashboard/SmartSignageService.java

@@ -0,0 +1,12 @@
+package com.sky.ioc.service.dashboard;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * @author LunCe
+ */
+public interface SmartSignageService {
+    ReturnMsg getBuildingSituation();
+
+    ReturnMsg getCarbonQuota();
+}

src/main/java/com/sky/building/service/SmartSignage/impl/PersonnelServiceImpl.java → src/main/java/com/sky/ioc/service/dashboard/impl/PersonnelServiceImpl.java

@@ -1,9 +1,8 @@
-package com.sky.building.service.smartsignage.impl;
+package com.sky.ioc.service.dashboard.impl;
 
-import com.sky.building.entity.smartsignage.Personnel;
-import com.sky.building.service.smartsignage.PersonnelService;
-import com.sky.building.tool.Constant;
-import com.sky.building.tool.MessageManage;
+import com.sky.ioc.entity.result.dashboard.Personnel;
+import com.sky.ioc.service.dashboard.PersonnelService;
+import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
@@ -18,7 +17,7 @@ import java.util.*;
 public class PersonnelServiceImpl implements PersonnelService {
 
     @Override
-    public String personnelInfoCount() {
+    public ReturnMsg personnelInfoCount() {
         List<Map<String,Object>> listMap = new ArrayList<>();
         listMap.get(0).put("info","进入大厦");
         listMap.get(0).put("personnel",1800);
@@ -39,12 +38,12 @@ public class PersonnelServiceImpl implements PersonnelService {
         listMap.get(3).put("personnel",1800);
         listMap.get(3).put("rise","0.14%");
         listMap.get(3).put("decline","0.14%");
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,listMap,"查询成功");
+        return ReturnMsg.ok(listMap);
     }
 
     //查询智能看板统计画像的统计人员信息报表
     @Override
-    public String getPersonnelInfoList() {
+    public ReturnMsg getPersonnelInfoList() {
         List<Personnel> list = new ArrayList<>();
         SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
         Calendar c = Calendar.getInstance();
@@ -52,7 +51,7 @@ public class PersonnelServiceImpl implements PersonnelService {
         list.add(new Personnel(20, 30, 40, new Date()));
         list.add(new Personnel(16, 191, 118, new Date()));
         list.add(new Personnel(38, 28, 28, new Date()));
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,list,"查询成功");
+        return ReturnMsg.ok(list);
     }
 
 }

src/main/java/com/sky/building/service/SmartSignage/impl/SmartSignageServiceImpl.java → src/main/java/com/sky/ioc/service/dashboard/impl/SmartSignageServiceImpl.java

@@ -1,10 +1,9 @@
-package com.sky.building.service.smartsignage.impl;
+package com.sky.ioc.service.dashboard.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.sky.building.service.smartsignage.SmartSignageService;
-import com.sky.building.tool.Constant;
-import com.sky.building.tool.MessageManage;
+import com.sky.ioc.service.dashboard.SmartSignageService;
+import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -19,7 +18,7 @@ import java.util.Map;
 @Service
 public class SmartSignageServiceImpl implements SmartSignageService {
     @Override
-    public String getBuildingSituation() {
+    public ReturnMsg getBuildingSituation() {
         JSONArray jsonArray = new JSONArray();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("total",2000);
@@ -43,11 +42,11 @@ public class SmartSignageServiceImpl implements SmartSignageService {
         JSONObject jsonObject1 = new JSONObject();
         jsonObject1.put("data",jsonArray);
         jsonObject1.put("totalArea","15000㎡");
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,jsonObject1,"查询成功");
+        return ReturnMsg.ok(jsonObject1);
     }
 
     @Override
-    public String getCarbonQuota() {
+    public ReturnMsg getCarbonQuota() {
         List<Map<String,Object>> listMap = new ArrayList<>();
         listMap.get(0).put("info","上分");
         listMap.get(0).put("consumed",500);
@@ -69,6 +68,6 @@ public class SmartSignageServiceImpl implements SmartSignageService {
         listMap.get(4).put("info","总部");
         listMap.get(4).put("consumed",500);
         listMap.get(4).put("carbonQuota",520);
-        return MessageManage.getInstance().getResultContent(Constant.SUCCESS,listMap,"查询成功");
+        return ReturnMsg.ok(listMap);
     }
 }

src/main/java/com/sky/ioc/service/life/HealthService.java

@@ -0,0 +1,18 @@
+package com.sky.ioc.service.life;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/10 17:35
+ **/
+public interface HealthService {
+    ReturnMsg getCoreIndicators(Integer dateType);
+
+    ReturnMsg getHutAnalysis(Integer dateType);
+
+    ReturnMsg getEnvironmentalDetection(Integer dateType);
+}

src/main/java/com/sky/ioc/service/life/ParkingService.java

@@ -0,0 +1,24 @@
+package com.sky.ioc.service.life;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/10 13:44
+ **/
+public interface ParkingService {
+    ReturnMsg getCoreIndicators(Integer dateType);
+
+    ReturnMsg getTrafficflowSituation(Integer dateType);
+
+    ReturnMsg getVacantParkingSpace(Integer dateType);
+
+    ReturnMsg getStopViolation(Integer dateType);
+
+    ReturnMsg getOccupationOfParkingSpace(Integer dateType);
+
+    ReturnMsg getParkingSpaceDetails(Integer dateType);
+}

src/main/java/com/sky/ioc/service/life/RestaurantService.java

@@ -0,0 +1,22 @@
+package com.sky.ioc.service.life;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * @author LunCe
+ */
+public interface RestaurantService {
+    ReturnMsg getPaymentAnalysis(Integer dateType);
+
+    ReturnMsg getCoreIndicators(Integer dateType);
+
+    ReturnMsg getWelcomeDishes(Integer dateType);
+
+    ReturnMsg getConsumptionAnalysis(Integer dateType);
+
+    ReturnMsg getTodayMenu();
+
+    ReturnMsg getProfitAnalysis(Integer dateType);
+
+    ReturnMsg getMealAnalysis(Integer dateType);
+}

src/main/java/com/sky/ioc/service/life/SupermarketService.java

@@ -0,0 +1,18 @@
+package com.sky.ioc.service.life;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/10 14:19
+ **/
+public interface SupermarketService {
+    ReturnMsg getCoreIndicators(Integer dateType);
+
+    ReturnMsg getQuotientAnalysiss(Integer dateType);
+
+    ReturnMsg getProductRanking(Integer dateType);
+}

src/main/java/com/sky/ioc/service/life/impl/HealthServiceImpl.java

@@ -0,0 +1,32 @@
+package com.sky.ioc.service.life.impl;
+
+import com.sky.ioc.service.life.HealthService;
+import com.sky.ioc.tool.FalseData;
+import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/10 17:35
+ **/
+
+@Service
+public class HealthServiceImpl implements HealthService {
+    @Override
+    public ReturnMsg getCoreIndicators(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+    }
+
+    @Override
+    public ReturnMsg getHutAnalysis(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSMAP);
+    }
+
+    @Override
+    public ReturnMsg getEnvironmentalDetection(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST3);
+    }
+}

src/main/java/com/sky/ioc/service/life/impl/ParkingServiceImpl.java

@@ -0,0 +1,50 @@
+package com.sky.ioc.service.life.impl;
+
+import com.sky.ioc.service.life.ParkingService;
+import com.sky.ioc.tool.FalseData;
+import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/10 13:45
+ **/
+@Service
+public class ParkingServiceImpl implements ParkingService {
+
+
+    @Override
+    public ReturnMsg getCoreIndicators(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+    }
+
+    @Override
+    public ReturnMsg getTrafficflowSituation(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSMAP);
+    }
+
+    @Override
+    public ReturnMsg getVacantParkingSpace(Integer dateType) {
+        return ReturnMsg.ok(ReturnMsg.fail());
+    }
+    @Override
+    public ReturnMsg getParkingSpaceDetails(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST5);
+    }
+
+
+    @Override
+    public ReturnMsg getStopViolation(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+    }
+
+    @Override
+    public ReturnMsg getOccupationOfParkingSpace(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+    }
+
+
+}

src/main/java/com/sky/ioc/service/life/impl/RestaurantServiceImpl.java

@@ -0,0 +1,81 @@
+package com.sky.ioc.service.life.impl;
+
+import com.sky.ioc.service.life.RestaurantService;
+import com.sky.ioc.tool.FalseData;
+import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author LunCe
+ */
+@Service
+public class RestaurantServiceImpl implements RestaurantService {
+
+
+    /**
+     * TODO  查询智慧生活中智慧餐厅的支付分析
+     *
+     * @Description
+     * @Param dateType
+     * @Return java.lang.String
+     * @Author LunCe
+     * @date 2023/2/10 11:25
+     */
+    @Override
+    public ReturnMsg getPaymentAnalysis(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+    }
+
+
+    /**
+     * 查询智慧生活中智慧餐厅的核心指标
+     */
+    @Override
+    public ReturnMsg getCoreIndicators(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+    }
+
+    /**
+     * 查询智慧生活中智慧餐厅的欢迎菜品
+     */
+    @Override
+    public ReturnMsg getWelcomeDishes(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST3);
+    }
+
+
+
+    /**
+     * 查询智慧生活中智慧餐厅的消费分析
+     */
+    @Override
+    public ReturnMsg getConsumptionAnalysis(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSMAP.get(dateType));
+    }
+
+
+    /**
+     * 查询智慧生活中智慧餐厅的今日菜谱
+     */
+    @Override
+    public ReturnMsg getTodayMenu() {
+        return ReturnMsg.ok(FalseData.REPORTFORMSMAP);
+    }
+
+    /**
+     * 查询智慧生活中智慧餐厅的盈利分析
+     */
+    @Override
+    public ReturnMsg getProfitAnalysis(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+    }
+
+    /**
+     * 查询智慧生活中智慧餐厅的用餐分析
+     */
+    @Override
+    public ReturnMsg getMealAnalysis(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSMAP.get(dateType));
+    }
+}

src/main/java/com/sky/ioc/service/life/impl/SupermarketServiceImpl.java

@@ -0,0 +1,31 @@
+package com.sky.ioc.service.life.impl;
+
+import com.sky.ioc.service.life.SupermarketService;
+import com.sky.ioc.tool.FalseData;
+import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/10 14:19
+ **/
+@Service
+public class SupermarketServiceImpl implements SupermarketService {
+    @Override
+    public ReturnMsg getCoreIndicators(Integer dateType) {
+        return  ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+    }
+
+    @Override
+    public ReturnMsg getQuotientAnalysiss(Integer dateType) {
+        return  ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+    }
+
+    @Override
+    public ReturnMsg getProductRanking(Integer dateType) {
+        return ReturnMsg.ok(FalseData.REPORTFORMSLIST5);
+    }
+}

src/main/java/com/sky/building/tool/DateUtil.java → src/main/java/com/sky/ioc/tool/DateUtil.java

@@ -1,4 +1,4 @@
-package com.sky.building.tool;
+package com.sky.ioc.tool;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/main/java/com/sky/building/tool/FalseData.java → src/main/java/com/sky/ioc/tool/FalseData.java

@@ -1,4 +1,4 @@
-package com.sky.building.tool;
+package com.sky.ioc.tool;
 
 import org.springframework.stereotype.Service;
 
@@ -382,7 +382,6 @@ public class FalseData {
         listMap3.add(hashMap12);
 
         REPORTFORMSMAP.put(3,listMap3);
-        System.out.println("假数据字典创建成功");
     }
 
 

src/main/java/com/sky/ioc/tool/ReturnMsg.java

@@ -0,0 +1,71 @@
+package com.sky.ioc.tool;
+
+
+import com.sky.ioc.constant.Constant;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+/***
+ * 接口返回消息封装管理工具
+ * @author LunCe
+ */
+@Data
+@Slf4j
+public class ReturnMsg<T> {
+
+    private int code;
+
+    private String msg;
+
+    private T data;
+
+    public static <T> ReturnMsg<T> ok()
+    {
+        return restResult(null, Constant.MSG_CODE.SUCCESS, "操作成功");
+    }
+
+    public static <T> ReturnMsg<T> ok(T data)
+    {
+        return restResult(data, Constant.MSG_CODE.SUCCESS, "操作成功");
+    }
+
+    public static <T> ReturnMsg<T> ok(T data, String msg)
+    {
+        return restResult(data, Constant.MSG_CODE.SUCCESS, msg);
+    }
+
+    public static <T> ReturnMsg<T> fail()
+    {
+        return restResult(null, Constant.MSG_CODE.SERVER_ERROR, "操作失败");
+    }
+
+    public static <T> ReturnMsg<T> fail(String msg)
+    {
+        return restResult(null, Constant.MSG_CODE.SERVER_ERROR, msg);
+    }
+
+    public static <T> ReturnMsg<T> fail(T data)
+    {
+        return restResult(data, Constant.MSG_CODE.SERVER_ERROR, "操作失败");
+    }
+
+    public static <T> ReturnMsg<T> fail(T data, String msg)
+    {
+        return restResult(data, Constant.MSG_CODE.SERVER_ERROR, msg);
+    }
+
+    public static <T> ReturnMsg<T> fail(int code, String msg)
+    {
+        return restResult(null, code, msg);
+    }
+
+    private static <T> ReturnMsg<T> restResult(T data, int code, String msg)
+    {
+        ReturnMsg<T> apiResult = new ReturnMsg<>();
+        apiResult.setCode(code);
+        apiResult.setData(data);
+        apiResult.setMsg(msg);
+        return apiResult;
+    }
+
+}

src/main/resources/application-dev.yml

@@ -1,26 +1,27 @@
+# 开发环境
 server:
   port: 10099
   servlet:
     context-path: /
 
-
-
-
-
+# 数据源
 spring:
   datasource:
-    url: jdbc:mysql://${OAUTH_MYSQL_DB_IP:121.43.55.7}:${OAUTH_MYSQL_DB_PORT:3307}/building?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-    username: ${OAUTH_MYSQL_ACCOUNT:root}
-    password: ${OAUTH_MYSQL_PASSWORD:SKYversation0816}
+    druid:
+      url: jdbc:mysql://121.43.55.7:3307/ioc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+      username: root
+      password: SKYversation0816
   redis:
-    database: 0
-    host: ${DMS_REDIS_IP:121.43.55.7}
-    port: ${DMS_REDIS_PORT:6380}
-    password: ${DMS_REDIS_PASSWORD:SKYversation}
-    connect-timeout: 5000
-    jedis:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
+    host: 121.43.55.7
+    port: 6380
+    database: 12
+    password: SKYversation
+
+# 日志配置
+logging:
+  level:
+    com.sky: debug
+
+# Swagger配置
+swagger:
+  enabled: true

src/main/resources/application-publish.yml

@@ -1,4 +0,0 @@
-server:
-  port: 10081
-  servlet:
-    context-path: /dms/

src/main/resources/application.yml

@@ -1,4 +1,110 @@
+server:
+  # 端口
+  port: 10099
+  servlet:
+    # 访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+
+# Spring配置
 spring:
+  # 环境设置
   profiles:
-#    active: publish
-    active: dev
+    active: dev
+  # 数据源配置
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      url: jdbc:mysql://${IOC_DB_IP:127.0.0.1}:${IOC_DB_PORT:3306}/ioc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+      username: ${IOC_DB_USER:}
+      password: ${IOC_DB_PASSWORD:}
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      # 控制台设置
+      statViewServlet:
+        enabled: true
+        allow:
+        url-pattern: /druid/*
+        login-username: iocDbAdmin
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # redis 配置
+  redis:
+    host: ${IOC_REDIS_IP:127.0.0.1}
+    port: ${IOC_REDIS_PORT:6379}
+    database: ${IOC_REDIS_DB:0}
+    password: ${IOC_REDIS_PASSWORD:}
+  # json 配置
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+
+# MyBatis
+mybatis-plus:
+  # 搜索指定包别名
+  type-aliases-package: com.sky.**.entity.domain
+  # 配置mapper xml的扫描路径
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  configuration:
+    # 字段名驼峰映射
+    map-underscore-to-camel-case: true
+    # 日志输出
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
+  global-config:
+    # 启动时logo输出
+    banner: false
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: false
+
+# 日志配置
+logging:
+  level:
+    com.sky: info
+
+# 自定义配置
+sky:
+  name: 智慧运营管理中心