Skip to content

Z
zczlService
Commit cefb3673 by dupengfei
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	pom.xml
parents caada1fa 0fce2b9e
Showing with 107 additions and 89 deletions
pom.xml
......@@ -26,7 +26,6 @@
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
......@@ -75,12 +74,6 @@
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
<exclusions>
<exclusion>
<artifactId>commons-lang</artifactId>
<groupId>commons-lang</groupId>
</exclusion>
</exclusions>
</dependency>
......@@ -119,24 +112,6 @@
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-spring-boot-starter</artifactId>
<version>4.4.0</version>
<exclusions>
<exclusion>
<artifactId>commons-lang3</artifactId>
<groupId>org.apache.commons</groupId>
</exclusion>
<exclusion>
<artifactId>poi</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
<exclusion>
<artifactId>poi-ooxml</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
<exclusion>
<artifactId>poi-ooxml-schemas</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
......@@ -164,6 +139,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
......
src/main/java/com/founder/redis/controller/DictController.java
......@@ -7,6 +7,7 @@ import com.founder.redis.service.IDicItemService;
import com.founder.redis.service.impl.ImportCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -40,7 +41,7 @@ public class DictController {
ZTreeNodeList = dicItemService.queryTypeCode(type,id,startId,yycj,name);
ZTreeNodeList=Sort(ZTreeNodeList);
}else{
ZTreeNodeList = dicItemService.queryAllCode(type);//拿到指定代码类型的所有字典信息
ZTreeNodeList = dicItemService.queryAllCode(type,id,name);//拿到指定代码类型的所有字典信息
}
}
......
src/main/java/com/founder/redis/dao/IDictitemDao.java
......@@ -34,4 +34,6 @@ public interface IDictitemDao {
String getNameByCode(HashMap<String, String> codeMap);
List<User> queryAllUserByUserIdList(List<String> userIdList);
List<SysDictitem> findCodeByPid(@Param("type") String type, @Param("id") String id, @Param("name") String name);
}
src/main/java/com/founder/redis/service/IDicItemService.java
......@@ -57,7 +57,7 @@ public interface IDicItemService {
List<ZTreeNode> queryTypeUsercode(String startId,String name,String policeId);
List<ZTreeNode> queryAllCode(String type);
List<ZTreeNode> queryAllCode(String type,String id,String name);
List<ZTreeNode> queryTypeSpUsercode(String startId, String name);
}
src/main/resources/application-dev.properties
spring.datasource.url=jdbc:oracle:thin:@47.92.129.99:1560:ORCL
spring.datasource.url=jdbc:oracle:thin:@47.92.129.99:1560:orcl
spring.datasource.username=XZXT
spring.datasource.password=XzPwd#11022
spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
......@@ -13,36 +13,32 @@ logging.level.org.spring.springboot.dao=debug
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=0
# Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=47.92.225.109
spring.redis.host=127.0.0.1
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=3001
spring.redis.port=6379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=123
spring.redis.password=12345678
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.pool.max-active=8
spring.redis.jedis.pool.max-idle=8
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.pool.max-wait=-1
spring.redis.jedis.pool.max-wait=500ms
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
spring.redis.pool.max-idle=8
# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
spring.redis.pool.min-idle=5
spring.redis.jedis.pool.min-idle=5
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
ssdw=15
zhyyPath=http://zhyy.xzxt.nm:7001
qxUrl=http://www.xzxt.bt:9044
domain=.zcpt.bt.xj
zhyyPath=http://zhyy.xzxt.bt
ssdw=150000000000
zczlUrl=http://10.86.64.16:9022
asjZbUrl=http://107.0.34.228:9047
qxUrl=http://qx.xzxt.nm:9044
domain=.xzxt.nm
#�ۺ�Ӧ��
asjCbUrl=http://107.0.34.228:8006
zcptUrl=http://192.168.0.108:9100
#���ָ��
zczlUrl=http://localhost:9022
#�������
asjZbUrl = http://192.168.0.100:9100
#��������
asjCbUrl = http://localhost:9013
#���ƽ̨
zcptUrl = http://192.168.0.108:9100
#����ƽ̨
ztptUrl = http://192.168.0.108:9100
\ No newline at end of file
ztptUrl=http://107.0.34.228:8006
#采集系统 登陆 退出 域名，各省份部署时自行修改配置
mainUrl=http://www.xzxt.bt
caijiUrl=http://anjian.xzxt.bt:9022
\ No newline at end of file
src/main/resources/application-pro.properties
......@@ -2,34 +2,32 @@ spring.datasource.url=jdbc:oracle:thin:@10.86.64.17:1521:BTXZ
spring.datasource.username=XZXT
spring.datasource.password=XZXT
spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
logging.level.com.founder = debug
logging.level.com.founder=debug
logging.level.org.springframework=info
logging.level.org.spring.springboot.dao=debug
#redis config
#\u65B0\u7586
spring.redis.database=1
#spring.redis.host=107.0.34.229
#spring.redis.port=20219
#spring.redis.password=
spring.redis.host=10.20.47.137
#\u5185\u8499
#redis.host=10.100.17.124
spring.redis.port=6379
spring.redis.password=xzxt#65
spring.jmx.enabled= false
#Ȩ��
qxUrl=http://qx.xzxt.bt:9044
domain=.xzxt.bt
#�ۺ�Ӧ��
zhyyPath=http://zhyy.xzxt.bt:7001
ssdw=66
#���ָ��
qxUrl=http://www.xzxt.bt:9044
domain=.zcpt.bt.xj
zhyyPath=http://zhyy.xzxt.bt
ssdw=660000000000
zczlUrl=http://10.86.64.16:9022
#�������
#asjZbUrl = http://192.168.0.100:9100
#��������
#asjCbUrl = http://localhost:9013
#���ƽ̨
#zcptUrl = http://192.168.0.108:9100
#����ƽ̨
#ztptUrl = http://192.168.0.108:9100
\ No newline at end of file
asjZbUrl=http://107.0.34.228:9047
asjCbUrl=http://107.0.34.228:8006
zcptUrl=http://192.168.0.108:9100
ztptUrl=http://107.0.34.228:8006
#采集系统 登陆 退出 域名，各省份部署时自行修改配置
mainUrl=http://www.xzxt.bt
caijiUrl=http://anjian.xzxt.bt:9022
\ No newline at end of file
src/main/resources/application.properties
#��������ʹ��dev����ʽ����ʹ��prod
spring.profiles.active=dev
server.port=9046
# ҳ��Ĭ��ǰ׺Ŀ¼
#开发环境使用dev，正式环境使用prod
spring.profiles.active=pro
server.port=9022
# 页面默认前缀目录
spring.mvc.view.prefix=/WEB-INF/jsp/
# ��Ӧҳ��Ĭ�Ϻ�׺
# 响应页面默认后缀
spring.mvc.view.suffix=.jsp
mybatis.mapperLocations=mapper/*.xml
server.servlet.session.timeout=1800
spring.cache.type=redis
# �ϴ��ļ��ܵ����ֵ
# 上传文件总的最大值
spring.servlet.multipart.max-request-size=200MB
# �����ļ������ֵ
# 单个文件的最大值
spring.servlet.multipart.max-file-size=200MB
src/main/resources/mapper/DictitemSqlMap.xml
......@@ -17,9 +17,9 @@
</select>
<select id="findXalbdmbcmsCountSql" parameterType="java.lang.String" resultType="com.founder.model.ZTreeNode">
SELECT distinct code id,id ids,name text,pId,description
FROM SYS_XALB_MAP_XALBDESC where scbz = '0'
CONNECT BY PRIOR code = pId
SELECT distinct code id, id ids, name text, pId, description
FROM SYS_XALB_MAP_XALBDESC
where scbz = '0' CONNECT BY PRIOR code = pId
START WITH pId = #{value}
order siblings by id
</select>
......@@ -46,19 +46,20 @@
startcode,
endcode
from SYS_DICTITEM
where 1=1
and scbz = '0'
where scbz = '0'
<if test="value != null">
and groupid=#{value}
</if>
order by code asc
</select>
<select id="selectAllUser" resultType="com.founder.model.User" parameterType="String" >
select unitcode,true_name as trueName,policemanid from sys_user where scbz='0'
<select id="selectAllUser" resultType="com.founder.model.User" parameterType="String">
select unitcode, true_name as trueName, policemanid
from sys_user
where scbz = '0'
</select>
<select id="queryAllUnitUser" resultType="com.founder.model.User" parameterType="java.util.Map" >
<select id="queryAllUnitUser" resultType="com.founder.model.User" parameterType="java.util.Map">
select
ID as id,
TRUE_NAME as trueName,
......@@ -74,7 +75,7 @@
<if test="code!=null and code!=''">and code = #{code}</if>
</select>
<select id="queryAllUserByUserIdList" resultType="com.founder.model.User" parameterType="java.util.List" >
<select id="queryAllUserByUserIdList" resultType="com.founder.model.User" parameterType="java.util.List">
select
ID as id,
TRUE_NAME as trueName,
......@@ -87,4 +88,41 @@
</foreach>
</select>
<select id="findCodeByPid" resultType="com.founder.model.SysDictitem">
select id,
isparent,
groupid,
code ,
name,
groupname,
pid,
description,
yycj1,
yycj2,
yycj3,
yycj4,
yycj5,
yycj6,
yycj7,
yycj8,
yycj9,
startcode,
endcode
from SYS_DICTITEM
where scbz = '0'
<if test="type != null">
and groupid=#{type}
</if>
<if test="name != null and name != ''">
and name like '%${name}%'
</if>
<if test="id == null">
and pid is null
</if>
<if test="id != null and id != ''">
and pid = #{id}
</if>
order by code
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment