Selaa lähdekoodia

发包

Signed-off-by: tangsong <86121657@qq.com>
tangsong 1 vuosi sitten
vanhempi
commit
11426e16b2

+ 6 - 1
base-server/pom.xml

@@ -39,7 +39,12 @@
39 39
             <artifactId>druid</artifactId>
40 40
             <version>1.0.28</version>
41 41
         </dependency>
42
-
42
+        <!--mysql数据库-->
43
+        <dependency>
44
+            <groupId>mysql</groupId>
45
+            <artifactId>mysql-connector-java</artifactId>
46
+            <version>8.0.28</version>
47
+        </dependency>
43 48
 <!--	 	<dependency>-->
44 49
 <!--		  <groupId>com.alibaba</groupId>-->
45 50
 <!--		  <artifactId>druid-spring-boot-starter</artifactId>-->

+ 1 - 1
base-server/src/main/java/com/unis/base/server/dao/UserSealRoleDao.java

@@ -13,6 +13,6 @@ import tk.mybatis.mapper.common.Mapper;
13 13
 @Transactional(rollbackFor = Exception.class)
14 14
 public interface UserSealRoleDao extends Mapper<UserSealRoleDo> {
15 15
 
16
-    @Select("select seals from usercenter:sys_user_info where user_loginname = #{accountName, jdbcType=VARCHAR} and state_code = 1")
16
+    @Select("select seals from usercenter.sys_user_info where user_loginname = #{accountName, jdbcType=VARCHAR} and state_code = 1")
17 17
     String getSealsByAccount(@Param("accountName") String accountName);
18 18
 }

+ 6 - 10
base-server/src/main/java/com/unis/base/server/entity/DCfxxsjyDO.java

@@ -1,16 +1,6 @@
1 1
 package com.unis.base.server.entity;
2 2
 
3
-import java.math.BigDecimal;
4
-import java.util.ArrayList;
5
-import java.util.Date;
6
-import java.util.List;
7
-
8
-import javax.persistence.Column;
9
-import javax.persistence.Table;
10
-import javax.persistence.Transient;
11
-
12 3
 import com.fasterxml.jackson.annotation.JsonFormat;
13
-import com.unis.base.common.vo.DCfxxsjyUpdateLogVO;
14 4
 import io.swagger.annotations.ApiModelProperty;
15 5
 import lombok.AllArgsConstructor;
16 6
 import lombok.Getter;
@@ -18,6 +8,12 @@ import lombok.NoArgsConstructor;
18 8
 import lombok.Setter;
19 9
 import org.springframework.format.annotation.DateTimeFormat;
20 10
 
11
+import javax.persistence.Column;
12
+import javax.persistence.Table;
13
+import javax.persistence.Transient;
14
+import java.math.BigDecimal;
15
+import java.util.Date;
16
+
21 17
 /**
22 18
  * @author huangxing
23 19
  * @version 1.0

+ 13 - 24
base-server/src/main/java/com/unis/base/server/service/impl/CblyBbServiceImpl.java

@@ -1,37 +1,26 @@
1 1
 package com.unis.base.server.service.impl;
2 2
 
3 3
 
4
-import java.io.*;
5
-import java.util.ArrayList;
6
-import java.util.Date;
7
-import java.util.List;
8
-import java.util.UUID;
9
-
10
-import javax.annotation.Resource;
11
-
12
-import org.apache.poi.hssf.usermodel.HSSFCell;
13
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
14
-import org.apache.poi.hssf.usermodel.HSSFFont;
15
-import org.apache.poi.hssf.usermodel.HSSFRow;
16
-import org.apache.poi.hssf.usermodel.HSSFSheet;
17
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
18
-import org.apache.poi.ss.usermodel.*;
19
-import org.apache.poi.ss.util.CellRangeAddress;
20
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
21
-import org.springframework.stereotype.Service;
22
-import org.springframework.web.multipart.MultipartFile;
23
-
24
-import com.github.pagehelper.PageHelper;
25 4
 import com.unis.base.server.dao.TyChubeilyynbaoDao;
26 5
 import com.unis.base.server.entity.TyChubeilyynbao;
27
-import com.unis.base.server.entity.TyHly;
28 6
 import com.unis.base.server.example.TyChubeilyynbaoExample;
29
-import com.unis.base.server.example.TyHlyExample;
30 7
 import com.unis.base.server.example.TyChubeilyynbaoExample.Criteria;
31 8
 import com.unis.base.server.service.CblyBbService;
32 9
 import com.unis.common.utils.ResponseWrapper;
10
+import org.apache.poi.hssf.usermodel.*;
11
+import org.apache.poi.ss.usermodel.*;
12
+import org.apache.poi.ss.util.CellRangeAddress;
13
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
14
+import org.springframework.stereotype.Service;
15
+import org.springframework.web.multipart.MultipartFile;
33 16
 
34
-import aj.org.objectweb.asm.Type;
17
+import javax.annotation.Resource;
18
+import java.io.IOException;
19
+import java.io.InputStream;
20
+import java.util.ArrayList;
21
+import java.util.Date;
22
+import java.util.List;
23
+import java.util.UUID;
35 24
 
36 25
 
37 26
 @Service

+ 1 - 1
base-server/src/main/resources/bootstrap-devmysql.yml

@@ -14,7 +14,7 @@ spring:
14 14
     restart:
15 15
       enabled: false
16 16
   datasource:
17
-    type: com.alibaba.druid.pool.DruidDataSource
17
+#    type: com.alibaba.druid.pool.DruidDataSource
18 18
     url: jdbc:mysql://172.16.0.46:3306/base?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
19 19
 #    url: jdbc:mysql://101.36.160.140:10311/base?useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=GMT%2b8
20 20
     username: root