Skip to content

Z
zczlService
Commit cefb3673 by dupengfei
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	pom.xml
parents caada1fa 0fce2b9e
Showing with 157 additions and 121 deletions
src/main/java/com/founder/redis/controller/DictController.java
...@@ -7,6 +7,7 @@ import com.founder.redis.service.IDicItemService; ...@@ -7,6 +7,7 @@ import com.founder.redis.service.IDicItemService;
import com.founder.redis.service.impl.ImportCode; import com.founder.redis.service.impl.ImportCode;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
...@@ -40,7 +41,7 @@ public class DictController { ...@@ -40,7 +41,7 @@ public class DictController {
ZTreeNodeList = dicItemService.queryTypeCode(type,id,startId,yycj,name); ZTreeNodeList = dicItemService.queryTypeCode(type,id,startId,yycj,name);
ZTreeNodeList=Sort(ZTreeNodeList); ZTreeNodeList=Sort(ZTreeNodeList);
}else{ }else{
ZTreeNodeList = dicItemService.queryAllCode(type);//拿到指定代码类型的所有字典信息 ZTreeNodeList = dicItemService.queryAllCode(type,id,name);//拿到指定代码类型的所有字典信息
} }
} }
......
src/main/java/com/founder/redis/dao/IDictitemDao.java
...@@ -17,21 +17,23 @@ public interface IDictitemDao { ...@@ -17,21 +17,23 @@ public interface IDictitemDao {
List<ZTreeNode> findAjxzCountSql(@Param(value = "sqlStr") String sqlStr); List<ZTreeNode> findAjxzCountSql(@Param(value = "sqlStr") String sqlStr);
List<ZTreeNode> findAjxzSql(String value); List<ZTreeNode> findAjxzSql(String value);
List<ZTreeNode> findXalbdmbcmsCountSql(String value); List<ZTreeNode> findXalbdmbcmsCountSql(String value);
List<SysDictitem> findCodeAllByType(String value); List<SysDictitem> findCodeAllByType(String value);
List<User> selectAllUser(); List<User> selectAllUser();
List<ZTreeNode> findCodes(ZTreeNode node); List<ZTreeNode> findCodes(ZTreeNode node);
int updateNode(ZTreeNode node); int updateNode(ZTreeNode node);
List<User> queryAllUnitUser(Map m); List<User> queryAllUnitUser(Map m);
String getNameByCode(HashMap<String, String> codeMap); String getNameByCode(HashMap<String, String> codeMap);
List<User> queryAllUserByUserIdList(List<String> userIdList); 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 { ...@@ -57,7 +57,7 @@ public interface IDicItemService {
List<ZTreeNode> queryTypeUsercode(String startId,String name,String policeId); 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); 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.username=XZXT
spring.datasource.password=XzPwd#11022 spring.datasource.password=XzPwd#11022
spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
...@@ -13,36 +13,32 @@ logging.level.org.spring.springboot.dao=debug ...@@ -13,36 +13,32 @@ logging.level.org.spring.springboot.dao=debug
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=0 spring.redis.database=0
# Redis\u670D\u52A1\u5668\u5730\u5740 # 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 # 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 # 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 # \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 # \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 # \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 # \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 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
ssdw=15 qxUrl=http://www.xzxt.bt:9044
zhyyPath=http://zhyy.xzxt.nm:7001 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 asjCbUrl=http://107.0.34.228:8006
domain=.xzxt.nm
#�ۺ�Ӧ��
zcptUrl=http://192.168.0.108:9100
#���ָ�� ztptUrl=http://107.0.34.228:8006
zczlUrl=http://localhost:9022 #采集系统 登陆 退出 域名，各省份部署时自行修改配置
#������� mainUrl=http://www.xzxt.bt
asjZbUrl = http://192.168.0.100:9100 caijiUrl=http://anjian.xzxt.bt:9022
#�������� \ No newline at end of file
asjCbUrl = http://localhost:9013
#���ƽ̨
zcptUrl = http://192.168.0.108:9100
#����ƽ̨
ztptUrl = http://192.168.0.108:9100
\ 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 ...@@ -2,34 +2,32 @@ spring.datasource.url=jdbc:oracle:thin:@10.86.64.17:1521:BTXZ
spring.datasource.username=XZXT spring.datasource.username=XZXT
spring.datasource.password=XZXT spring.datasource.password=XZXT
spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver 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.springframework=info
logging.level.org.spring.springboot.dao=debug logging.level.org.spring.springboot.dao=debug
#redis config #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 spring.redis.host=10.20.47.137
#\u5185\u8499
#redis.host=10.100.17.124
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=xzxt#65 spring.redis.password=xzxt#65
spring.jmx.enabled= false spring.jmx.enabled= false
#Ȩ�� qxUrl=http://www.xzxt.bt:9044
qxUrl=http://qx.xzxt.bt:9044 domain=.zcpt.bt.xj
domain=.xzxt.bt zhyyPath=http://zhyy.xzxt.bt
#�ۺ�Ӧ�� ssdw=660000000000
zhyyPath=http://zhyy.xzxt.bt:7001
ssdw=66
#���ָ��
zczlUrl=http://10.86.64.16:9022 zczlUrl=http://10.86.64.16:9022
#������� asjZbUrl=http://107.0.34.228:9047
#asjZbUrl = http://192.168.0.100:9100
#�������� asjCbUrl=http://107.0.34.228:8006
#asjCbUrl = http://localhost:9013
#���ƽ̨ zcptUrl=http://192.168.0.108:9100
#zcptUrl = http://192.168.0.108:9100
#����ƽ̨ ztptUrl=http://107.0.34.228:8006
#ztptUrl = http://192.168.0.108:9100 #采集系统 登陆 退出 域名，各省份部署时自行修改配置
\ No newline at end of file mainUrl=http://www.xzxt.bt
caijiUrl=http://anjian.xzxt.bt:9022
\ No newline at end of file
src/main/resources/application.properties
#��������ʹ��dev����ʽ����ʹ��prod #开发环境使用dev，正式环境使用prod
spring.profiles.active=dev spring.profiles.active=pro
server.port=9046 server.port=9022
# ҳ��Ĭ��ǰ׺Ŀ¼ # 页面默认前缀目录
spring.mvc.view.prefix=/WEB-INF/jsp/ spring.mvc.view.prefix=/WEB-INF/jsp/
# ��Ӧҳ��Ĭ�Ϻ�׺ # 响应页面默认后缀
spring.mvc.view.suffix=.jsp spring.mvc.view.suffix=.jsp
mybatis.mapperLocations=mapper/*.xml mybatis.mapperLocations=mapper/*.xml
server.servlet.session.timeout=1800 server.servlet.session.timeout=1800
spring.cache.type=redis spring.cache.type=redis
# �ϴ��ļ��ܵ����ֵ # 上传文件总的最大值
spring.servlet.multipart.max-request-size=200MB spring.servlet.multipart.max-request-size=200MB
# �����ļ������ֵ # 单个文件的最大值
spring.servlet.multipart.max-file-size=200MB spring.servlet.multipart.max-file-size=200MB
src/main/resources/mapper/DictitemSqlMap.xml
...@@ -8,83 +8,121 @@ ...@@ -8,83 +8,121 @@
<select id="findAjxzSql" parameterType="java.lang.String" resultType="com.founder.model.ZTreeNode"> <select id="findAjxzSql" parameterType="java.lang.String" resultType="com.founder.model.ZTreeNode">
SELECT distinct code id, SELECT distinct code id,
id ids, id ids,
name text, name text,
pid6 pid6
FROM SYS_AJLB_MAP_AJXZ FROM SYS_AJLB_MAP_AJXZ
where scbz = '0' where scbz = '0'
and pid6 = #{value} and pid6 = #{value}
</select> </select>
<select id="findXalbdmbcmsCountSql" parameterType="java.lang.String" resultType="com.founder.model.ZTreeNode"> <select id="findXalbdmbcmsCountSql" parameterType="java.lang.String" resultType="com.founder.model.ZTreeNode">
SELECT distinct code id,id ids,name text,pId,description SELECT distinct code id, id ids, name text, pId, description
FROM SYS_XALB_MAP_XALBDESC where scbz = '0' FROM SYS_XALB_MAP_XALBDESC
CONNECT BY PRIOR code = pId where scbz = '0' CONNECT BY PRIOR code = pId
START WITH pId = #{value} START WITH pId = #{value}
order siblings by id order siblings by id
</select> </select>
<select id="findCodeAllByType" parameterType="java.lang.String" resultType="com.founder.model.SysDictitem"> <select id="findCodeAllByType" parameterType="java.lang.String" resultType="com.founder.model.SysDictitem">
select distinct select distinct
id, id,
isparent, isparent,
groupid, groupid,
code , code ,
name, name,
groupname, groupname,
pid, pid,
description, description,
yycj1, yycj1,
yycj2, yycj2,
yycj3, yycj3,
yycj4, yycj4,
yycj5, yycj5,
yycj6, yycj6,
yycj7, yycj7,
yycj8, yycj8,
yycj9, yycj9,
startcode, startcode,
endcode endcode
from SYS_DICTITEM from SYS_DICTITEM
where 1=1 where scbz = '0'
and scbz = '0' <if test="value != null">
<if test="value != null"> and groupid=#{value}
and groupid=#{value} </if>
</if> order by code asc
order by code asc </select>
</select>
<select id="selectAllUser" resultType="com.founder.model.User" parameterType="String" > <select id="selectAllUser" resultType="com.founder.model.User" parameterType="String">
select unitcode,true_name as trueName,policemanid from sys_user where scbz='0' select unitcode, true_name as trueName, policemanid
from sys_user
where scbz = '0'
</select> </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 select
ID as id, ID as id,
TRUE_NAME as trueName, TRUE_NAME as trueName,
POLICEMANID as policemanid POLICEMANID as policemanid
from sys_user where scbz='0' and UNITCODE = #{unitcode } and OPEN_FLAG='1' from sys_user where scbz='0' and UNITCODE = #{unitcode } and OPEN_FLAG='1'
<if test="true_name!=null and true_name!=''">and TRUE_NAME like '%'||#{true_name, jdbcType=VARCHAR}||'%'</if> <if test="true_name!=null and true_name!=''">and TRUE_NAME like '%'||#{true_name, jdbcType=VARCHAR}||'%'</if>
<if test="policeId!=null and policeId!=''">and policemanid <![CDATA[<>]]> #{policeId, jdbcType=VARCHAR}</if> <if test="policeId!=null and policeId!=''">and policemanid <![CDATA[<>]]> #{policeId, jdbcType=VARCHAR}</if>
</select> </select>
<select id="getNameByCode" parameterType="java.util.Map" resultType="java.lang.String">
select name from SYS_DICTITEM where scbz='0'
<if test="groupid!=null and groupid!=''">and groupid = #{groupid}</if>
<if test="code!=null and code!=''">and code = #{code}</if>
</select>
<select id="getNameByCode" parameterType="java.util.Map" resultType="java.lang.String"> <select id="queryAllUserByUserIdList" resultType="com.founder.model.User" parameterType="java.util.List">
select name from SYS_DICTITEM where scbz='0' select
<if test="groupid!=null and groupid!=''">and groupid = #{groupid}</if> ID as id,
<if test="code!=null and code!=''">and code = #{code}</if> TRUE_NAME as trueName,
</select> POLICEMANID as policemanid
from sys_user where scbz='0' and OPEN_FLAG='1'
and id in
<foreach collection="list" item="userId" index="index"
open="(" close=")" separator=",">
#{userId, jdbcType=VARCHAR}
</foreach>
</select>
<select id="queryAllUserByUserIdList" resultType="com.founder.model.User" parameterType="java.util.List" > <select id="findCodeByPid" resultType="com.founder.model.SysDictitem">
select select id,
ID as id, isparent,
TRUE_NAME as trueName, groupid,
POLICEMANID as policemanid code ,
from sys_user where scbz='0' and OPEN_FLAG='1' name,
and id in groupname,
<foreach collection="list" item="userId" index="index" pid,
open="(" close=")" separator=","> description,
#{userId, jdbcType=VARCHAR} yycj1,
</foreach> yycj2,
</select> 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> </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