更换数据源为postgresql

pom.xml

@@ -55,6 +55,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.htmlparser</groupId>
+            <artifactId>htmlparser</artifactId>
+            <version>2.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -164,11 +170,18 @@
         </dependency>
 
         <!-- mysql 驱动 -->
+        <!-- <dependency> -->
+        <!--     <groupId>mysql</groupId> -->
+        <!--     <artifactId>mysql-connector-java</artifactId> -->
+        <!-- </dependency> -->
+
+        <!-- postgresql 驱动 -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
         </dependency>
 
+
         <!-- swagger3.0 -->
         <dependency>
             <groupId>io.springfox</groupId>

src/main/java/com/sky/ioc/entity/canteen/Cuisine.java → src/main/java/com/sky/ioc/entity/domain/canteen/Cuisine.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.canteen;
+package com.sky.ioc.entity.domain.canteen;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

src/main/java/com/sky/ioc/entity/canteen/Order.java → src/main/java/com/sky/ioc/entity/domain/canteen/Order.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.canteen;
+package com.sky.ioc.entity.domain.canteen;
 
 import lombok.Data;
 

src/main/java/com/sky/ioc/entity/fitness/Fitnes.java → src/main/java/com/sky/ioc/entity/domain/fitness/Fitnes.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.fitness;
+package com.sky.ioc.entity.domain.fitness;
 
 import lombok.Data;
 

src/main/java/com/sky/ioc/entity/meeting/Meeting.java → src/main/java/com/sky/ioc/entity/domain/meeting/Meeting.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.meeting;
+package com.sky.ioc.entity.domain.meeting;
 
 import lombok.Data;
 

src/main/java/com/sky/ioc/entity/parking/Park.java → src/main/java/com/sky/ioc/entity/domain/parking/Park.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.parking;
+package com.sky.ioc.entity.domain.parking;
 
 import lombok.Data;
 

src/main/java/com/sky/ioc/entity/parking/Parking.java → src/main/java/com/sky/ioc/entity/domain/parking/Parking.java

@@ -1,9 +1,8 @@
-package com.sky.ioc.entity.parking;
+package com.sky.ioc.entity.domain.parking;
 
 import lombok.Data;
 import lombok.NonNull;
 
-import java.sql.ParameterMetaData;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**

src/main/java/com/sky/ioc/entity/space/AccessSpace.java → src/main/java/com/sky/ioc/entity/domain/space/AccessSpace.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.space;
+package com.sky.ioc.entity.domain.space;
 
 import lombok.Data;
 

src/main/java/com/sky/ioc/entity/space/BuildingSpace.java → src/main/java/com/sky/ioc/entity/domain/space/BuildingSpace.java

@@ -1,4 +1,4 @@
-package com.sky.ioc.entity.space;
+package com.sky.ioc.entity.domain.space;
 
 import lombok.Data;
 

src/main/java/com/sky/ioc/entity/supermarket/Supermarket.java → src/main/java/com/sky/ioc/entity/domain/supermarket/Supermarket.java

@@ -1,6 +1,7 @@
-package com.sky.ioc.entity.supermarket;
+package com.sky.ioc.entity.domain.supermarket;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -12,6 +13,7 @@ import java.util.concurrent.ThreadLocalRandom;
  **/
 
 @Data
+@NoArgsConstructor
 public class Supermarket {
 
     private Integer id;

src/main/java/com/sky/ioc/entity/supermarket/SupermarketOrder.java → src/main/java/com/sky/ioc/entity/domain/supermarket/SupermarketOrder.java

@@ -1,9 +1,7 @@
-package com.sky.ioc.entity.supermarket;
+package com.sky.ioc.entity.domain.supermarket;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * TODO
  * @Description  商品订单表
@@ -19,21 +17,21 @@ public class SupermarketOrder {
     /**订单id*/
     private Integer orderId;
     /**订单类型*/
-    private Integer orderType;
+    private String orderType;
     /**订单金额*/
     private Double  orderPrice;
     /**用户id*/
     private Integer userId;
     /**用户名称*/
-    private String userName;
+    private String username;
     /**单位ID*/
     private String companyId;
-    /**单位名称*/
-    private String company;
+    /**部门ID*/
+    private String deptId;
     /**支付时间*/
     private String orderTime;
-    /**商品信息*/
-    private List<Supermarket> supermarketList;
+    /**商品名称*/
+    private String productName;
 
 
 }

src/main/java/com/sky/ioc/mapper/SupermarketGoodsMapper.java

@@ -0,0 +1,7 @@
+package com.sky.ioc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sky.ioc.entity.domain.supermarket.Supermarket;
+
+public interface SupermarketGoodsMapper extends BaseMapper<Supermarket> {
+}

src/main/java/com/sky/ioc/mapper/SupermarketOrderMapper.java

@@ -0,0 +1,7 @@
+package com.sky.ioc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sky.ioc.entity.domain.supermarket.SupermarketOrder;
+
+public interface SupermarketOrderMapper extends BaseMapper<SupermarketOrder> {
+}

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

@@ -1,8 +1,8 @@
 package com.sky.ioc.tool;
 
-import com.sky.ioc.entity.canteen.Cuisine;
-import com.sky.ioc.entity.parking.Parking;
-import com.sky.ioc.entity.supermarket.Supermarket;
+import com.sky.ioc.entity.domain.canteen.Cuisine;
+import com.sky.ioc.entity.domain.parking.Parking;
+import com.sky.ioc.entity.domain.supermarket.Supermarket;
 import com.sky.ioc.entity.work.Access;
 import org.springframework.stereotype.Service;
 

src/main/resources/application-dev.yml

@@ -8,9 +8,9 @@ server:
 spring:
   datasource:
     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
+      url: jdbc:postgresql://121.43.55.7:5433/building?stringtype=unspecified&u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false&tinyInt1isBit=false
+      username: postgres
+      password: SKYversation@0816
   redis:
     host: 121.43.55.7
     port: 6380

src/main/resources/application.yml

@@ -16,11 +16,11 @@ spring:
   # 数据源配置
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
+    driverClassName: org.postgresql.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:}
+      url: jdbc:postgresql://${IOC_DB_IP:127.0.0.1}:${IOC_DB_PORT:5433}/ioc?currentSchema=public&stringtype=unspecified&u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false&tinyInt1isBit=false
+      username: ${IOC_DB_USER:postgres}
+      password: ${IOC_DB_PASSWORD:SKYversation0816}
       # 初始连接数
       initialSize: 5
       # 最小连接池数量
@@ -40,7 +40,7 @@ spring:
       # 配置一个连接在池中最大生存的时间，单位是毫秒
       maxEvictableIdleTimeMillis: 900000
       # 配置检测连接是否有效
-      validationQuery: SELECT 1 FROM DUAL
+      validationQuery: SELECT 1
       testWhileIdle: true
       testOnBorrow: false
       testOnReturn: false