fg

.gitignore

@@ -25,3 +25,51 @@ buildNumber.properties
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 workspace.xml
+
+
+
+
+.idea
+coo_management/target
+data-structures/target
+mp4_sreenshot_service/target
+special_protection_period/target
+
+head_office/data_service/client_service_jin_wan/target
+head_office/head_office_data_center/target
+head_office/head_office_data_center_interface/target
+head_office/head_office_data_structures/target
+
+zhuhai-power-plant/coo_broadcast/coo_broadcast_model/target
+zhuhai-power-plant/coo_broadcast/coo_broadcast_service/target
+zhuhai-power-plant/coo_management_database/coo_management_database/target
+zhuhai-power-plant/coo_management_database/coo_management_database_model/target
+zhuhai-power-plant/coo_visual_service/coo_visual_model/target
+zhuhai-power-plant/coo_visual_service/coo_visual_service/target
+zhuhai-power-plant/data_switching_center/data_switching_center/target
+zhuhai-power-plant/data_switching_center/data_switching_center_model/target
+zhuhai-power-plant/safety_vsm/safety_vsm/target
+zhuhai-power-plant/safety_vsm/safety_vsm_model/target
+
+special_protection_period/.idea
+mp4_sreenshot_service/.idea
+data-structures/.idea
+coo_management/.idea
+
+head_office/.idea
+head_office/data_service/client_service_jin_wan/.idea
+head_office/head_office_data_center/.idea
+head_office/head_office_data_center_interface/.idea
+head_office/head_office_data_structures/.idea
+
+zhuhai-power-plant/.idea
+zhuhai-power-plant/coo_broadcast/coo_broadcast_model/.idea
+zhuhai-power-plant/coo_broadcast/coo_broadcast_service/.idea
+zhuhai-power-plant/coo_management_database/coo_management_database/.idea
+zhuhai-power-plant/coo_management_database/coo_management_database_model/.idea
+zhuhai-power-plant/coo_visual_service/coo_visual_model/.idea
+zhuhai-power-plant/coo_visual_service/coo_visual_service/.idea
+zhuhai-power-plant/data_switching_center/data_switching_center/.idea
+zhuhai-power-plant/data_switching_center/data_switching_center_model/.idea
+zhuhai-power-plant/safety_vsm/safety_vsm/.idea
+zhuhai-power-plant/safety_vsm/safety_vsm_model/.idea

.idea/misc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
@@ -10,5 +11,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
 </project>

.idea/workspace.xml

@@ -5,17 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="eacd3dd8-1e95-428c-a6af-1aadb9921989" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/maven_install.sh" beforeDir="false" afterPath="$PROJECT_DIR$/maven_install.sh" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -31,6 +23,13 @@
       </list>
     </option>
   </component>
+  <component name="Git.Pull.Settings">
+    <option name="OPTIONS">
+      <set>
+        <option value="REBASE" />
+      </set>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -61,10 +60,10 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Documents/admin-client-temperature" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../Documents/admin-client-temperature" />
     <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Project" />
-    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.last.edited" value="SDKs" />
+    <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.20052427" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
@@ -182,6 +181,21 @@
       <workItem from="1747644155888" duration="5369000" />
       <workItem from="1747658293616" duration="1309000" />
       <workItem from="1748326418665" duration="908000" />
+      <workItem from="1749720810538" duration="125000" />
+      <workItem from="1752457742312" duration="11000" />
+      <workItem from="1752724692023" duration="230000" />
+      <workItem from="1752734071176" duration="13000" />
+      <workItem from="1752743626561" duration="6000" />
+      <workItem from="1752749172174" duration="5000" />
+      <workItem from="1752749810933" duration="7000" />
+      <workItem from="1752750102028" duration="8000" />
+      <workItem from="1752750383057" duration="2000" />
+      <workItem from="1752808651174" duration="738000" />
+      <workItem from="1758043662663" duration="39000" />
+      <workItem from="1758043724642" duration="56000" />
+      <workItem from="1758043789777" duration="1094000" />
+      <workItem from="1761029898205" duration="71000" />
+      <workItem from="1761968999056" duration="18000" />
     </task>
     <servers />
   </component>

maven_install.sh

@@ -9,3 +9,17 @@ mvn install:install-file -Dfile=/Users/admin/ojdbc6.jar -DgroupId=com.oracle -Da
 mvn install:install-file -Dfile=C:\Users\Administrator\ojdbc6.jar -DgroupId=com.oracle -DartifactId=ojdbc6 -Dversion=11.2.0.1.0 -Dpackaging=jar
 
 
+#git推送失败,文件太多过或文件过大：fatal: the remote end hung up unexpectedly
+git config http.postBuffer 524288000
+
+#取消每次git拉取代码时都需要输入帐号密码
+#进入git项目目录，输入
+git config --global credential.helper store
+#在开发工具中拉取或提交一次代码，输入一次用户名和密码，会自动保存git帐号
+#密码，以后就不需要再输入了
+
+
+
+#maven查看依赖树命令
+mvn dependency:tree
+#mvn clean package -DskipTests

pom.xml

@@ -11,7 +11,7 @@
     <groupId>com.rehome</groupId>
     <artifactId>admin-client-temperature</artifactId>
     <version>1.0.0</version>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <name>admin-client-temperature</name>
     <description>admin-client-temperature</description>
     <properties>
@@ -26,6 +26,20 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
@@ -267,6 +281,28 @@
             <version>1.7.9</version>
         </dependency>
         <!--webservice 第三方库axis2 maven引用 Spring-axis end-->
+        <!--人大金仓数据库 start-->
+        <dependency>
+            <groupId>com.kingbase8</groupId>
+            <artifactId>kingbase8</artifactId>
+            <version>8.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.kingbase</groupId>
+            <artifactId>KesDialect-for-hibernate4</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.postgresql</groupId>-->
+<!--            <artifactId>postgresql</artifactId>-->
+<!--            <version>42.3.9</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>cn.com.kingbase</groupId>-->
+<!--            <artifactId>KesDialect-for-hibernate6.2</artifactId>-->
+<!--            <version>6.2</version>-->
+<!--        </dependency>-->
+        <!--人大金仓数据库 start-->
     </dependencies>
     <!--在项目中使用pom.xml进行下载依赖配置的话可以单独使用：
    注意：项目中使用的maven，如果已经在settings.xml中配置过后就无需在配置此项-->
@@ -283,7 +319,7 @@
         </repository>
     </repositories>
     <build>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>${project.artifactId}-kingbase</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java

@@ -22,7 +22,7 @@ import java.util.Map;
 @EnableScheduling
 @EnableAsync
 @SpringBootApplication
-public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware {
+public class AdminClientTemperatureApplication extends SpringBootServletInitializer implements CommandLineRunner, ApplicationContextAware {
 
     /**
      * 获取Spring框架的上下文
@@ -68,4 +68,14 @@ public class AdminClientTemperatureApplication implements CommandLineRunner, App
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         this.applicationContext = applicationContext;
     }
+
+    /**
+     * @date 2021-05-18 09:20
+     * @description: 容器配置，springboot打war包布署必须添加这个配置 为了打包springboot项目
+     * @Param: SpringApplicationBuilder
+     */
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(AdminClientTemperatureApplication.class);
+    }
 }

src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java

@@ -107,7 +107,7 @@ public class MqttRSAClient {
                     System.out.println("topic:"+s);
                     System.out.println("Qos:"+mqttMessage.getQos());
                     System.out.println("message RSA:"+strData);
-                    //temperatureService.saveTemperature(strData,s);
+                    temperatureService.saveTemperature(strData,s);
                 }
 
                 @Override

src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java

@@ -70,7 +70,7 @@ public class JdbcDemoController {
         //配置数据源
         ds.setId("1");
         ds.setName("mysql");
-        ds.setUrl("jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true");
+        ds.setUrl("jdbc:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true");
         ds.setUsername("root");
         ds.setPassword("Skyinno251,");
         ds.setDriver("com.mysql.cj.jdbc.Driver");
@@ -92,13 +92,13 @@ public class JdbcDemoController {
     //@RequestMapping("/api/list")
     public ResponseDto queryList() {
         // 自定义一个线程池,内部包含8个线程
-        ExecutorService customPool = Executors.newFixedThreadPool(8);
+        ExecutorService customPool = Executors.newFixedThreadPool(4);
         // 自定义一个线程池,内部包含10个线程
         ExecutorService executorService = Executors.newFixedThreadPool(10);
         CompletableFuture<String> future = CompletableFuture.supplyAsync(() -> {
             String sql = "select * from temperature where id = ?";
             List<Object> jdbcParamValues = new ArrayList<>();
-            for (int i = 2292104; i < 2298700; i++) {
+            for (int i = 2305781; i < 2307935; i++) {
                 jdbcParamValues.add(i + 1);
                 Gson gson = new Gson();
                 ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues);

src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java

@@ -26,13 +26,9 @@ import java.util.Date;
 //同时创建普通索引和组合索引,注意普通索引每个索引名都不同，注意组合索引每个索引名都相同
 @Table(indexes = {@Index(name = "idx_dataDate", columnList = "dataDate"),@Index(name = "idx_locationDesc", columnList = "locationDesc"),@Index(name = "idx_dataHour", columnList = "dataHour"),@Index(name = "idx_dataMinute", columnList = "dataMinute"),@Index(name = "data_date_location_desc", columnList = "dataDate"),@Index(name = "data_date_location_desc", columnList = "locationDesc")})
 public class Temperature implements Serializable {
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.IDENTITY)
-//    @ApiModelProperty(value = "主键")
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "主键")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq")
-    @SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver")
     private Long id;
 
     @ApiModelProperty(value = "温度")

src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java

@@ -16,13 +16,9 @@ import java.util.Date;
 @Data
 @Entity
 public class WebServiceProvince implements Serializable {
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.IDENTITY)
-//    @ApiModelProperty(value = "主键")
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "主键")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "webService_province_seq")
-    @SequenceGenerator(name = "webService_province_seq", sequenceName = "webService_province_seq")
     private Long id;
 
     @ApiModelProperty(value = "洲、国内外省份")

src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java

@@ -29,13 +29,9 @@ import java.util.Date;
 //        @Index(name = "data_create_date_city_name", columnList = "cityName"), @Index(name = "data_create_date_city_name", columnList = "createDate")})
 public class WebServiceWeatherInfo {
 
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.IDENTITY)
-//    @ApiModelProperty(value = "主键")
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value = "主键")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "webService_weather_info_seq")
-    @SequenceGenerator(name = "webService_weather_info_seq", sequenceName = "webService_weather_info_seq")
     private Long id;
 
     @Column(length = 100)
@@ -78,15 +74,17 @@ public class WebServiceWeatherInfo {
     private String weatherTrendEnd;
 
     //存放长文本
-    @Lob
-    @Basic(fetch = FetchType.LAZY)
+    //@Lob
+    //@Basic(fetch = FetchType.LAZY)
     @ApiModelProperty(value = "现在的天气实况")
+    @Column(columnDefinition = "text")
     private String weatherRealStatus;
 
     //存放长文本
-    @Lob
-    @Basic(fetch = FetchType.LAZY)
+    //@Lob
+    //@Basic(fetch = FetchType.LAZY)
     @ApiModelProperty(value = "天气和生活指数")
+    @Column(columnDefinition = "text")
     private String weatherLiveIndex;
 
     @Column(length = 20)
@@ -131,8 +129,9 @@ public class WebServiceWeatherInfo {
 
     @ApiModelProperty(value = "被查询的城市或地区的介绍")
     //存放长文本
-    @Lob
-    @Basic(fetch = FetchType.LAZY)
+//    @Lob
+//    @Basic(fetch = FetchType.LAZY)
+    @Column(columnDefinition = "text")
     private String cityIntroduce;
 
     @ApiModelProperty(value = "日期")

src/main/resources/application.yml

@@ -9,35 +9,31 @@ logging:
 
 spring:
   datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-#    driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=appserver;encrypt=false;
-#    username: sa
-#    password: Skyinno251,
-    #url: jdbc:mysql://192.168.3.29:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://127.0.0.1:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://192.168.2.18:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://192.168.1.92:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://192.168.1.24:3306/weather?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://192.168.3.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-    #url: jdbc:mysql://47.242.184.139:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
-#    driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver
-#    username: root
-#    password: Skyinno251,
-    driverClassName: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.3.9:1521/orcl
-    username: appserver
-    password: appserver
+    # =====================kingbase相关配置=====================
+    hikari:
+      #数据库线程池最大连接数
+      maximum-pool-size: 4
+    # 数据库类型
+    name: kingbase
+    #数据库连接驱动
+    driver-class-name: com.kingbase8.Driver
+    #数据库连接url
+    url: jdbc:kingbase8://192.168.3.29:54321/kingbase?useUnicode=true
+    #数据库连接账号
+    username: system
+    #数据库连接密码
+    password: 452131wW
   jpa:
-    database: oracle # 配置 DBMS 类型
-    show-sql: true # 配置是否将执行的 SQL 输出到日志
+    # 配置是否将执行的 SQL 输出到日志
+    show-sql: true
     open-in-view: true
-    hibernate:
-      ddl-auto: update  # 第一次建表create  后面用update，要不然每次重启都会新建表
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Kingbase8Dialect
+        ddl-auto: update
+        hbm2ddl:
+          auto: update
+        format_sql: true
   servlet:
     multipart:
       # 开启 multipart 上传功能