tzs注册、access和openapi国产数据库适配

amos-boot-data/amos-boot-data-accessapi/pom.xml

@@ -141,6 +141,32 @@
 		  <artifactId>license-sdk</artifactId>
 		  <version>1.0.0</version>
 		</dependency>
+
+
+
+		<!-- druid -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>1.1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<!-- Vastbase G100 -->
+		<dependency>
+			<groupId>cn.com.vastdata</groupId>
+			<artifactId>vastbase</artifactId>
+			<version>1.0.0.1</version>
+		</dependency>
+		<!-- LOG4J -->
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.16</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TaBusinessServiceImpl.java

@@ -112,7 +112,7 @@ public class TaBusinessServiceImpl extends BaseService<TaAccessConfigModel, TaAc
 			//法定代表人姓名
 			result.put("legalPeople",data.get("lerep"));
 			//行业小类编码
-			result.put("",data.get("hydm"));
+			result.put("industryCode",data.get("hydm"));
 		} else {
 			System.out.println("失败：" + response.getErrorMsg());
 			System.out.println("失败：" + response.getErrorCode());

amos-boot-data/amos-boot-data-accessapi/src/main/resources/application-dev1.properties

+spring.application.name=AMOS-API-ACCESSAPI
+server.servlet.context-path=/accessapi
+server.port=11005
+# jdbc_config
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://172.16.10.213:5432/per_tzs_amos_tzs_biz?currentSchema=per_tzs_amos_data_accessapi
+spring.datasource.username=vbadmin
+spring.datasource.password=Yeejoin@2023
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.maximum-pool-size=15
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+# REDIS (RedisProperties)
+spring.redis.database=1
+spring.redis.host=172.16.10.210
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+#注册中心地址
+eureka.client.service-url.defaultZone =http://172.16.10.210:10001/eureka/
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/swagger-ui.html
+eureka.instance.ip-address=localhost
+eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
+
+##emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.10.210:1883
+emqx.client-user-name=admin
+emqx.client-password=public
+
+##biz custem properties
+biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
\ No newline at end of file

amos-boot-data/amos-boot-data-accessapi/src/main/resources/application.properties

-spring.profiles.active=dev
+spring.profiles.active=dev1
 server.compression.enabled=true
 spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
 

amos-boot-data/amos-boot-data-accessapi/src/main/resources/logback-dev1.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="/opt/log/qa" />
+    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/tzs.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>7</MaxHistory>
+            <!--日志文件大小-->
+            <MaxFileSize>10mb</MaxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.mybatis" level="INFO" />
+    <logger name="java.sql.Connection" level="INFO"/>
+    <logger name="java.sql.Statement" level="INFO"/>
+    <logger name="java.sql.PreparedStatement" level="INFO"/>
+    <logger name="org.springframework" level="INFO"/>
+
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
+    <logger name="org.apache.activemq" level="INFO"/>
+    <logger name="org.typroject" level="INFO"/>
+    <logger name="com.yeejoin" level="INFO"/>
+
+    <!-- 日志输出级别 -->
+    <root level="DEBUG">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file

amos-boot-data/amos-boot-data-accessapi/src/main/resources/mapper/BaseUnitLicenceMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.api.openapi.face.orm.dao.DataDictionaryMapper">
     <select id="getData" resultType="java.lang.String">
-        select `name` FROM cb_data_dictionary WHERE code=#{code} and type="IndustryCode"
+        select cb_data_dictionary.name FROM cb_data_dictionary WHERE code=#{code} and type='IndustryCode'
     </select>
 </mapper>

amos-boot-data/amos-boot-data-openapi/pom.xml

@@ -14,6 +14,31 @@
 
 
 	<dependencies>
+
+		<!-- druid -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>1.1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<!-- Vastbase G100 -->
+		<dependency>
+			<groupId>cn.com.vastdata</groupId>
+			<artifactId>vastbase</artifactId>
+			<version>1.0.0.1</version>
+		</dependency>
+		<!-- LOG4J -->
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.16</version>
+			<scope>compile</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-dev.properties

 spring.application.name=AMOS-API-OPENAPI
 server.servlet.context-path=/openapi
-server.port=11004
+server.port=11001
 # jdbc_config
-spring.datasource.url=jdbc:mysql://172.16.10.90:53306/tzs_amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8\
-  &characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=Yeejoin@2020
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://172.16.10.213:5432/per_tzs_amos_tzs_biz?currentSchema=per_tzs_amos_openapi_cyl
+spring.datasource.username=vbadmin
+spring.datasource.password=Yeejoin@2023
+
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=5
 spring.datasource.hikari.maximum-pool-size=15
@@ -19,7 +19,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 
 # REDIS (RedisProperties)
 spring.redis.database=1
-spring.redis.host=172.16.10.90
+spring.redis.host=172.16.10.210
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
@@ -29,19 +29,19 @@ spring.redis.lettuce.pool.min-idle=0
 spring.redis.expire.time=300
 
 #注册中心地址
-eureka.client.service-url.defaultZone =http://172.16.3.99:10001/eureka/
+eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.10.210:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://172.16.10.210:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/swagger-ui.html
+eureka.instance.status-page-url=http://172.16.10.210:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://172.16.10.210:${server.port}${server.servlet.context-path}/swagger-ui.html
 
 ##emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://36.46.151.113:1883
+emqx.broker=tcp://172.16.10.210:1883
 emqx.client-user-name=super
 emqx.client-password=123456
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -14,7 +14,7 @@
                v.rec_user_id       recUserId,
                v.rec_date          recDate,
                v.is_delete         isDelete,
-               v.block             block,
+               v.block             "block",
                f.field_type        fieldType
         FROM cb_dynamic_form_instance v
                  LEFT JOIN cb_dynamic_form_column f ON f.sequence_nbr = v.form_column_id

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitIcDto.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 /**
@@ -47,4 +49,13 @@ public class RegUnitIcDto  extends BaseDto {
    @ApiModelProperty(value = "经营状态code")
    private String businessStateCode;
 
+   private String area;
+   private String stree;
+   private String community;
+   private String address;
+   private String legalPerson;
+   private String province;
+   private String city;
+   private String district;
+
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitInfoController.java

@@ -102,10 +102,27 @@ public class UnitInfoController extends BaseController {
 		} else {
 			result = Systemctl.regionClient.querySubAgencyTree(parentId).getResult();
 		}
+		despace(result);
 		return ResponseHelper.buildResponse(result);
 	}
 
 	/**
+	 * 去区域树中level多余空格
+	 * @param result
+	 */
+	public void despace(Collection<RegionModel> result){
+		Iterator<RegionModel> iterator = result.iterator();
+		while(iterator.hasNext()) {
+			RegionModel regionModel = iterator.next();
+			regionModel.setLevel(regionModel.getLevel().trim());
+			regionModel.setLevelName(regionModel.getLevelName().trim());
+			if(!ValidationUtil.isEmpty(regionModel.getChildren())) {
+				despace(regionModel.getChildren());
+			}
+		}
+	}
+
+	/**
 	 * 获取管辖单位树
 	 *
 	 * @return

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
+import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -13,7 +13,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +21,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -248,13 +247,6 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 //		}
 		// 2.组织返回数据
 		RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
-		if (USE_UNIT_TYPE_CODE.equals(unitType) || PRODUCT_UNIT_TYPE_CODE.equals(unitType) || FILLING_UNIT_TYPE_CODE.equals(unitType)) {
-			// 本地库有的化 就不去其他系统查询
-			RegUnitIc regUnitIc = regUnitIcService
-					.getOne(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode));
-			regUnitInfoDto.setRegUnitIc(Bean.toModel(regUnitIc, new RegUnitIcDto()));
-			if (regUnitIc == null) {
-				// 2.1 使用单位调用行政许可系统接口进行查询工商信息
 //            MultiValueMap<String, String> headers = new HttpHeaders();
 //            headers.add("product","AMOS_STUDIO_WEB");
 //            headers.add("appKey","AMOS_STUDIO");
@@ -262,8 +254,6 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 //				RequestContext.setToken();
 //				RequestContext.setAppKey();
 //				RequestContext.setProduct();
-				Map<String, Object> resultMap = accessFeignService.getData(unitCode).getResult();
-				
 //            RequestEntity requestEntity = new RequestEntity(
 //                    null, //body部分数据
 //                    headers, //头
@@ -271,12 +261,16 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 //                    URI.create("/accessapi/business/getData"));
 //            ResponseEntity<JSONObject> responseEntity = restTemplate.exchange(requestEntity,JSONObject.class);
 //            JSONObject result = responseEntity.getBody();
-
+		// 2.1 使用单位调用行政许可系统接口进行查询工商信息
+		Map<String, Object> resultMap = accessFeignService.getData(unitCode).getResult();
 		if(!ValidationUtil.isEmpty(resultMap)){
 			// 2.2 工商信息组装
 			String area = String.valueOf(resultMap.get("area"));
 			String city = area.substring(0,area.indexOf("市")+1);
 			String district = area.substring(city.length());
+			if(district.equals("高新区")){
+				district = "雁塔区";
+			}
 			regUnitInfoDto.setCity(city);
 			regUnitInfoDto.setDistrict(district);
 			regUnitInfoDto.setStree(String.valueOf(resultMap.get("street")));
@@ -285,13 +279,35 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			regUnitInfoDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
 			regUnitInfoDto.setName(String.valueOf(resultMap.get("unitName")));
 			regUnitInfoDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
-				}
-			}
+
+			String industryName = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")),"HYXLDM").getName();
+			String approveDate = String.valueOf(resultMap.get("approval_time"));
+			approveDate = approveDate.contains("年")?approveDate.replace("年","-"):approveDate;
+			approveDate = approveDate.contains("月")?approveDate.replace("月","-"):approveDate;
+			approveDate = approveDate.contains("日")?approveDate.replace("日","-"):approveDate;
+			RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+			regUnitIcDto.setUnitCode(regUnitInfoDto.getUnitCode());
+			try {
+				regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate,"yyyy-MM-dd"));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			regUnitIcDto.setUnitName(regUnitInfoDto.getName());
+			regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
+			regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
+			regUnitIcDto.setProvince("陕西省");
+			regUnitIcDto.setCity(regUnitInfoDto.getCity());
+			regUnitIcDto.setDistrict(regUnitInfoDto.getDistrict());
+			regUnitIcDto.setStree(regUnitInfoDto.getStree());
+			regUnitIcDto.setCommunity(regUnitInfoDto.getCommunity());
+			regUnitIcDto.setAddress(regUnitInfoDto.getAddress());
+			regUnitIcDto.setLegalPerson(regUnitInfoDto.getLegalPerson());
+			regUnitIcDto.setIndustryName(industryName);
+			regUnitInfoDto.setRegUnitIc(regUnitIcDto);
 		} else {
-			RegUnitIc regUnitIc = regUnitIcService
-					.getOne(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode));
-			regUnitInfoDto.setRegUnitIc(Bean.toModel(regUnitIc, new RegUnitIcDto()));
+			regUnitInfoDto.setRegUnitIc(new RegUnitIcDto());
 		}
+
 		// 2.3 许可信息组装
 		List<BaseUnitLicence> unitLicences = baseUnitLicenceService
 				.list(new LambdaQueryWrapper<BaseUnitLicence>().eq(BaseUnitLicence::getUnitCode, unitCode));

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/logback-dev.xml

@@ -24,6 +24,11 @@
             <pattern>${LOG_PATTERN}</pattern>
         </encoder>
     </appender>
+<!--    &lt;!&ndash; ELK管理 &ndash;&gt;-->
+<!--    <appender name="ELK" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
+<!--        <destination>172.16.10.210:4560</destination>-->
+<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
+<!--    </appender>-->
     <!--    show parameters for hibernate sql 专为 Hibernate 定制
     <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
     <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
@@ -48,5 +53,6 @@
     <root level="DEBUG">
         <!-- <appender-ref ref="FILE" /> -->
         <appender-ref ref="STDOUT" />
+<!--        <appender-ref ref="ELK" />-->
     </root>
 </configuration>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/logback-dev2.xml

@@ -24,6 +24,11 @@
             <pattern>${LOG_PATTERN}</pattern>
         </encoder>
     </appender>
+    <!-- ELK管理 -->
+    <appender name="ELK" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>172.16.10.210:4560</destination>
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>
     <!--    show parameters for hibernate sql 专为 Hibernate 定制
     <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
     <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
@@ -43,10 +48,11 @@
     <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.typroject" level="INFO"/>
     <logger name="com.yeejoin" level="INFO"/>
-    <logger name="org.apache.http" level="ERROR"/>
+
     <!-- 日志输出级别 -->
     <root level="DEBUG">
         <!-- <appender-ref ref="FILE" /> -->
         <appender-ref ref="STDOUT" />
+<!--        <appender-ref ref="ELK" />-->
     </root>
 </configuration>
\ No newline at end of file