Răsfoiți Sursa

feat: 实现查询所有不动产口径描述接口

weijianghai 1 an în urmă
părinte
comite
73a84780a6

+ 28 - 0
pom.xml

@@ -87,8 +87,36 @@
             <artifactId>poi-ooxml</artifactId>
             <version>5.2.5</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-csv -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+            <version>1.10.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-exec -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+            <version>1.3</version>
+        </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>1.25.0</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.checkerframework</groupId>
+                <artifactId>checker-qual</artifactId>
+                <version>3.33.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <finalName>finance-api</finalName>
         <plugins>

+ 29 - 0
src/main/java/com/nokia/financeapi/controller/house/HouseCaliberDescriptionController.java

@@ -0,0 +1,29 @@
+package com.nokia.financeapi.controller.house;
+
+import com.nokia.financeapi.common.R;
+import com.nokia.financeapi.pojo.po.house.HouseCaliberDescriptionPo;
+import com.nokia.financeapi.service.house.HouseCaliberDescriptionService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.LinkedHashMap;
+
+@Tag(name = "不动产口径描述")
+@RestController
+@RequestMapping("/house-car/house/api/caliber-description")
+public class HouseCaliberDescriptionController {
+    private final HouseCaliberDescriptionService houseCaliberDescriptionService;
+
+    public HouseCaliberDescriptionController(HouseCaliberDescriptionService houseCaliberDescriptionService) {
+        this.houseCaliberDescriptionService = houseCaliberDescriptionService;
+    }
+
+    @Operation(summary = "查询所有不动产口径描述")
+    @PostMapping("/all")
+    public R<LinkedHashMap<String, HouseCaliberDescriptionPo>> all() {
+        return houseCaliberDescriptionService.all();
+    }
+}

+ 18 - 0
src/main/java/com/nokia/financeapi/dao/house/HouseCaliberDescriptionDao.java

@@ -0,0 +1,18 @@
+package com.nokia.financeapi.dao.house;
+
+import com.nokia.financeapi.pojo.po.house.HouseCaliberDescriptionPo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface HouseCaliberDescriptionDao {
+    /**
+     * 查询所有不动产口径描述
+     */
+    @Select("""
+select * from house.caliber_description order by second_menu, third_menu, tab_name
+""")
+    List<HouseCaliberDescriptionPo> all();
+}

+ 20 - 0
src/main/java/com/nokia/financeapi/pojo/po/house/HouseCaliberDescriptionPo.java

@@ -0,0 +1,20 @@
+package com.nokia.financeapi.pojo.po.house;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class HouseCaliberDescriptionPo {
+    @Schema(description = "页签id", example = "bao-gao")
+    private String tabId;
+    @Schema(description = "页签名称", example = "不动产运营报告")
+    private String tabName;
+    @Schema(description = "二级菜单名称", example = "不动产运营报告")
+    private String secondMenu;
+    @Schema(description = "三级菜单名称", example = "不动产运营报告")
+    private String thirdMenu;
+    @Schema(description = "口径描述", example = "口径描述")
+    private String description;
+}

+ 27 - 0
src/main/java/com/nokia/financeapi/service/house/HouseCaliberDescriptionService.java

@@ -0,0 +1,27 @@
+package com.nokia.financeapi.service.house;
+
+import com.nokia.financeapi.common.R;
+import com.nokia.financeapi.dao.house.HouseCaliberDescriptionDao;
+import com.nokia.financeapi.pojo.po.house.HouseCaliberDescriptionPo;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+@Service
+public class HouseCaliberDescriptionService {
+    private final HouseCaliberDescriptionDao houseCaliberDescriptionDao;
+
+    public HouseCaliberDescriptionService(HouseCaliberDescriptionDao houseCaliberDescriptionDao) {
+        this.houseCaliberDescriptionDao = houseCaliberDescriptionDao;
+    }
+
+    public R<LinkedHashMap<String, HouseCaliberDescriptionPo>> all() {
+        List<HouseCaliberDescriptionPo> list = houseCaliberDescriptionDao.all();
+        LinkedHashMap<String, HouseCaliberDescriptionPo> map = new LinkedHashMap<>();
+        for (HouseCaliberDescriptionPo t : list) {
+            map.put(t.getTabId(), t);
+        }
+        return R.ok(map);
+    }
+}

+ 0 - 16
src/main/resources/application-dev.properties

@@ -1,16 +0,0 @@
-server.port=39100
-logging.level.com.nokia=debug
-spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://192.168.154.130:5432/financialdb
-spring.datasource.username=postgres
-spring.datasource.password=Test!234
-# minio配置
-minio.endpoint=http://192.168.10.7:19000/
-minio.bucket=house-car
-minio.accessKey=house-car
-minio.secretKey=EGqIq7zKZwfasMQ5eLIoLId631vmLaal
-minio.expiry=15
-# 一房产一局址页面url
-pages.house.siteUrl=house-car/house/dist/index.html#/administrative/overview
-house.import-data.wxys=data/import-data/house/wxys/
-house.import-data.czys=data/import-data/house/czys/

+ 37 - 0
src/main/resources/application-dev.yml

@@ -0,0 +1,37 @@
+server:
+  port: 39100
+spring:
+  datasource:
+#    username: postgres
+#    password: Test!234
+#    driver-class-name: org.postgresql.Driver
+#    url: jdbc:postgresql://192.168.65.128:5432/financialdb
+    username: finance
+    password: Finance@unicom23
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://172.16.107.5:5432/financialdb
+logging:
+  level:
+    com:
+      nokia: debug
+minio:
+  accessKey: house-car
+  bucket: house-car
+  endpoint: http://192.168.10.7:19000/
+  expiry: 15
+  secretKey: EGqIq7zKZwfasMQ5eLIoLId631vmLaal
+data-import:
+  copy-script-path: scripts/copy.sh
+  db-host: 127.0.0.1
+  db-port: 5432
+  db-username: postgres
+  db-password: Test!234
+  db-name: financialdb
+  wei-zhang: data/data-import/car/wei-zhang/
+house:
+  import-data:
+    czys: data/import-data/house/czys/
+    wxys: data/import-data/house/wxys/
+pages:
+  house:
+    siteUrl: house-car/house/dist/index.html#/administrative/overview

+ 0 - 20
src/main/resources/application-prod.properties

@@ -1,20 +0,0 @@
-server.port=39100
-logging.level.com.nokia=info
-spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://172.16.107.5:5432/financialdb
-spring.datasource.username=finance
-spring.datasource.password=Finance@unicom23
-# minio配置
-minio.endpoint=http://172.16.107.4:39000/
-minio.bucket=house-car
-minio.accessKey=house-car
-minio.secretKey=pfhJVM9CUitr2rv1iGA0WQbCr4XdGJ2rmB7mgUaG
-minio.expiry=15
-# 关闭接口文档
-springdoc.api-docs.enabled=false
-springdoc.swagger-ui.enabled=false
-knife4j.production=true
-# 一房产一局址页面url
-pages.house.siteUrl=house-car/house/dist/index.html#/administrative/overview
-house.import-data.wxys=/data/import-data/house/wxys/
-house.import-data.czys=/data/import-data/house/czys/

+ 40 - 0
src/main/resources/application-prod.yml

@@ -0,0 +1,40 @@
+server:
+  port: 39100
+spring:
+  datasource:
+    username: finance
+    password: Finance@unicom23
+    driver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://172.16.107.5:5432/financialdb
+springdoc:
+  api-docs:
+    enabled: false
+  swagger-ui:
+    enabled: false
+knife4j:
+  production: true
+logging:
+  level:
+    com:
+      nokia: info
+minio:
+  accessKey: house-car
+  bucket: house-car
+  endpoint: http://172.16.107.4:39000/
+  expiry: 15
+  secretKey: pfhJVM9CUitr2rv1iGA0WQbCr4XdGJ2rmB7mgUaG
+pages:
+  house:
+    siteUrl: house-car/house/dist/index.html#/administrative/overview
+house:
+  import-data:
+    czys: /data/import-data/house/czys/
+    wxys: /data/import-data/house/wxys/
+data-import:
+  copy-script-path: copy.sh
+  db-host: 172.16.107.5
+  db-port: 5432
+  db-username: finance
+  db-password: Finance@unicom23
+  db-name: financialdb
+  wei-zhang: /data/data-import/car/wei-zhang/

+ 0 - 16
src/main/resources/application-test.properties

@@ -1,16 +0,0 @@
-server.port=12130
-logging.level.com.nokia=debug
-spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://192.168.50.3:15432/finance
-spring.datasource.username=postgres
-spring.datasource.password=NFQCgBA6YhNvgAqG6THw
-# minio配置
-minio.endpoint=http://192.168.10.7:19000/
-minio.bucket=house-car
-minio.accessKey=house-car
-minio.secretKey=EGqIq7zKZwfasMQ5eLIoLId631vmLaal
-minio.expiry=15
-# 一房产一局址页面url
-pages.house.siteUrl=house-car/house/dist/index.html#/administrative/overview
-house.import-data.wxys=data/import-data/house/wxys/
-house.import-data.czys=data/import-data/house/czys/

+ 25 - 0
src/main/resources/application-test.yml

@@ -0,0 +1,25 @@
+server:
+  port: 12130
+spring:
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: NFQCgBA6YhNvgAqG6THw
+    url: jdbc:postgresql://192.168.50.3:15432/finance
+    username: postgres
+logging:
+  level:
+    com:
+      nokia: debug
+minio:
+  accessKey: house-car
+  bucket: house-car
+  endpoint: http://192.168.10.7:19000/
+  expiry: 15
+  secretKey: EGqIq7zKZwfasMQ5eLIoLId631vmLaal
+pages:
+  house:
+    siteUrl: house-car/house/dist/index.html#/administrative/overview
+house:
+  import-data:
+    czys: data/import-data/house/czys/
+    wxys: data/import-data/house/wxys/

+ 0 - 2
src/main/resources/application.properties

@@ -1,2 +0,0 @@
-
-server.servlet.session.cookie.secure=true

+ 5 - 0
src/main/resources/application.yml

@@ -0,0 +1,5 @@
+server:
+  servlet:
+    session:
+      cookie:
+        secure: true

+ 6 - 6
src/main/resources/logback-spring.xml

@@ -13,9 +13,9 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
             <fileNamePattern>${PATH}/trace.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>60</maxHistory>
+            <!-- each file should be at most 100MB, keep 180 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>180</maxHistory>
             <totalSizeCap>20GB</totalSizeCap>
         </rollingPolicy>
         <encoder>
@@ -28,9 +28,9 @@
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
             <fileNamePattern>${PATH}/error.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
-            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>60</maxHistory>
+            <!-- each file should be at most 100MB, keep 180 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>180</maxHistory>
             <totalSizeCap>20GB</totalSizeCap>
         </rollingPolicy>
         <encoder>