Commit cefb3673 by dupengfei

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
parents caada1fa 0fce2b9e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.founder</groupId> <groupId>com.founder</groupId>
<artifactId>zczlService</artifactId> <artifactId>zczlService</artifactId>
<version>1.ty.1.1-SNAPSHOT_${maven.build.timestamp}</version> <version>1.ty.1.1-SNAPSHOT_${maven.build.timestamp}</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>zczlService</name> <name>zczlService</name>
<description>zczl project for Spring Boot</description> <description>zczl project for Spring Boot</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.4.RELEASE</version> <version>2.0.4.RELEASE</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<log4j2.version>2.17.0</log4j2.version> <log4j2.version>2.17.0</log4j2.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId>
<artifactId>spring-boot-starter-data-redis</artifactId> <version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.BUILD-SNAPSHOT</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId>
<artifactId>spring-boot-starter-web</artifactId> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.mybatis.spring.boot</groupId>
<groupId>org.mybatis.spring.boot</groupId> <artifactId>mybatis-spring-boot-starter</artifactId>
<artifactId>mybatis-spring-boot-starter</artifactId> <version>1.3.2</version>
<version>1.3.2</version> </dependency>
</dependency>
<dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId>
<artifactId>spring-boot-starter-tomcat</artifactId> <scope>provided</scope>
<scope>provided</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-boot-starter-test</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.jdom</groupId>
<groupId>org.jdom</groupId> <artifactId>jdom</artifactId>
<artifactId>jdom</artifactId> <version>1.1</version>
<version>1.1</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.apache.commons</groupId>
<groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId>
<artifactId>commons-lang3</artifactId> <version>3.4</version>
<version>3.4</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>javax.servlet</groupId>
<groupId>javax.servlet</groupId> <artifactId>jstl</artifactId>
<artifactId>jstl</artifactId> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.apache.httpcomponents</groupId>
<groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId>
<artifactId>httpclient</artifactId> </dependency>
</dependency> <dependency>
<dependency> <groupId>net.sf.json-lib</groupId>
<groupId>net.sf.json-lib</groupId> <artifactId>json-lib</artifactId>
<artifactId>json-lib</artifactId> <version>2.4</version>
<version>2.4</version> <classifier>jdk15</classifier>
<classifier>jdk15</classifier> </dependency>
<exclusions>
<exclusion>
<artifactId>commons-lang</artifactId> <!-- 数据库驱动包-->
<groupId>commons-lang</groupId> <dependency>
</exclusion> <groupId>org.oracle</groupId>
</exclusions> <artifactId>ojdbc6</artifactId>
</dependency> <version>10</version>
</dependency>
<!-- alibaba的druid数据库连接池 -->
<!-- 数据库驱动包--> <dependency>
<dependency> <groupId>com.alibaba</groupId>
<groupId>org.oracle</groupId> <artifactId>druid</artifactId>
<artifactId>ojdbc6</artifactId> <version>1.0.11</version>
<version>10</version> </dependency>
</dependency> <dependency>
<!-- alibaba的druid数据库连接池 --> <groupId>com.alibaba</groupId>
<dependency> <artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId> <version>1.2.35</version>
<artifactId>druid</artifactId> </dependency>
<version>1.0.11</version>
</dependency> <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>org.apache.poi</groupId>
<artifactId>fastjson</artifactId> <artifactId>poi</artifactId>
<version>1.2.35</version> <version>3.9</version>
</dependency> </dependency>
<!--word 导出-->
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi --> <dependency>
<dependency> <groupId>org.apache.poi</groupId>
<groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId>
<artifactId>poi</artifactId> <version>3.9</version>
<version>3.9</version> </dependency>
</dependency>
<!--word 导出--> <dependency>
<dependency> <groupId>cn.afterturn</groupId>
<groupId>org.apache.poi</groupId> <artifactId>easypoi-spring-boot-starter</artifactId>
<artifactId>poi-ooxml</artifactId> <version>4.4.0</version>
<version>3.9</version> </dependency>
</dependency>
</dependencies>
<dependency>
<groupId>cn.afterturn</groupId> <build>
<artifactId>easypoi-spring-boot-starter</artifactId> <finalName>zczlservice-0.0.1-SNAPSHOT</finalName>
<version>4.4.0</version> <resources>
<exclusions> <resource>
<exclusion> <directory>${project.basedir}/src/main/resources</directory>
<artifactId>commons-lang3</artifactId> <filtering>true</filtering>
<groupId>org.apache.commons</groupId> <excludes>
</exclusion> <exclude>static/**</exclude>
<exclusion> </excludes>
<artifactId>poi</artifactId> </resource>
<groupId>org.apache.poi</groupId> <resource>
</exclusion> <directory>${project.basedir}/src/main/resources</directory>
<exclusion> <filtering>false</filtering>
<artifactId>poi-ooxml</artifactId> <includes>
<groupId>org.apache.poi</groupId> <include>static/**</include>
</exclusion> </includes>
<exclusion> </resource>
<artifactId>poi-ooxml-schemas</artifactId> </resources>
<groupId>org.apache.poi</groupId> <plugins>
</exclusion> <plugin>
</exclusions> <groupId>org.springframework.boot</groupId>
</dependency> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</dependencies> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<build> <artifactId>maven-surefire-plugin</artifactId>
<finalName>zczlservice-0.0.1-SNAPSHOT</finalName> <configuration>
<resources> <skip>true</skip>
<resource> </configuration>
<directory>${project.basedir}/src/main/resources</directory> </plugin>
<filtering>true</filtering> </plugins>
<excludes> </build>
<exclude>static/**</exclude>
</excludes> <repositories>
</resource> <repository>
<resource> <id>founder</id>
<directory>${project.basedir}/src/main/resources</directory> <url>http://47.92.108.28:8081/nexus/content/groups/public/</url>
<filtering>false</filtering> <releases>
<includes> <enabled>true</enabled>
<include>static/**</include> </releases>
</includes> <snapshots>
</resource> <enabled>true</enabled>
</resources> </snapshots>
<plugins> </repository>
<plugin> <repository>
<groupId>org.springframework.boot</groupId> <id>spring-snapshots</id>
<artifactId>spring-boot-maven-plugin</artifactId> <name>Spring Snapshots</name>
</plugin> <url>https://repo.spring.io/snapshot</url>
</plugins> <snapshots>
</build> <enabled>true</enabled>
</snapshots>
<repositories> </repository>
<repository> <repository>
<id>founder</id> <id>spring-milestones</id>
<url>http://47.92.108.28:8081/nexus/content/groups/public/</url> <name>Spring Milestones</name>
<releases> <url>https://repo.spring.io/milestone</url>
<enabled>true</enabled> <snapshots>
</releases> <enabled>false</enabled>
<snapshots> </snapshots>
<enabled>true</enabled> </repository>
</snapshots> </repositories>
</repository>
<repository> <pluginRepositories>
<id>spring-snapshots</id> <!-- 公司的maven plugin仓库 -->
<name>Spring Snapshots</name> <pluginRepository>
<url>https://repo.spring.io/snapshot</url> <id>founder</id>
<snapshots> <url>http://47.92.108.28:8081/nexus/content/groups/public/</url>
<enabled>true</enabled> <releases>
</snapshots> <enabled>true</enabled>
</repository> </releases>
<repository> <snapshots>
<id>spring-milestones</id> <enabled>true</enabled>
<name>Spring Milestones</name> </snapshots>
<url>https://repo.spring.io/milestone</url> </pluginRepository>
<snapshots> <pluginRepository>
<enabled>false</enabled> <id>spring-snapshots</id>
</snapshots> <name>Spring Snapshots</name>
</repository> <url>https://repo.spring.io/snapshot</url>
</repositories> <snapshots>
<enabled>true</enabled>
<pluginRepositories> </snapshots>
<!-- 公司的maven plugin仓库 --> </pluginRepository>
<pluginRepository> <pluginRepository>
<id>founder</id> <id>spring-milestones</id>
<url>http://47.92.108.28:8081/nexus/content/groups/public/</url> <name>Spring Milestones</name>
<releases> <url>https://repo.spring.io/milestone</url>
<enabled>true</enabled> <snapshots>
</releases> <enabled>false</enabled>
<snapshots> </snapshots>
<enabled>true</enabled> </pluginRepository>
</snapshots> </pluginRepositories>
</pluginRepository>
<pluginRepository> <!-- 上传资源到nexus私服,构建部署项目 -->
<id>spring-snapshots</id> <distributionManagement>
<name>Spring Snapshots</name> <repository>
<url>https://repo.spring.io/snapshot</url> <id>releases</id>
<snapshots> <url>http://47.92.108.28:8081/nexus/content/repositories/releases/</url>
<enabled>true</enabled> </repository>
</snapshots> <snapshotRepository>
</pluginRepository> <id>snapshots</id>
<pluginRepository> <url>http://47.92.108.28:8081/nexus/content/repositories/snapshots/</url>
<id>spring-milestones</id> </snapshotRepository>
<name>Spring Milestones</name> </distributionManagement>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<!-- 上传资源到nexus私服,构建部署项目 -->
<distributionManagement>
<repository>
<id>releases</id>
<url>http://47.92.108.28:8081/nexus/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<url>http://47.92.108.28:8081/nexus/content/repositories/snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project> </project>
...@@ -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);//拿到指定代码类型的所有字典信息
} }
} }
......
...@@ -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);
} }
...@@ -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);
} }
...@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.*; import java.util.*;
...@@ -37,23 +38,23 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -37,23 +38,23 @@ public class IDicItemServiceImpl implements IDicItemService {
} }
//获取符合条件的key //获取符合条件的key
String keys = "zzjgdm_" + ssdw + ":" + code_type + ":*"; String keys = "zzjgdm_" + ssdw + ":" + code_type + ":*";
if(id==null||"".equals(id)){ if (id == null || "".equals(id)) {
id=null; id = null;
} }
if("CODE_UNIT".equals(code_type)){ if ("CODE_UNIT".equals(code_type)) {
if(null!=unitcode && !"".equals(unitcode)){ //单位代码 if (null != unitcode && !"".equals(unitcode)) { //单位代码
keys = "zzjgdm_" + ssdw + ":" + code_type + ":"+id+":*"; keys = "zzjgdm_" + ssdw + ":" + code_type + ":" + id + ":*";
} }
} }
Set<String> set = (Set<String>) redisTemplate.keys(keys); Set<String> set = (Set<String>) redisTemplate.keys(keys);
Iterator<String> iterator = set.iterator(); Iterator<String> iterator = set.iterator();
while(iterator.hasNext()){ while (iterator.hasNext()) {
String str = iterator.next(); String str = iterator.next();
String jsonStr=redisTemplate.opsForValue().get(str); String jsonStr = redisTemplate.opsForValue().get(str);
ZTreeNode node= JSON.parseObject(jsonStr,ZTreeNode.class); ZTreeNode node = JSON.parseObject(jsonStr, ZTreeNode.class);
if(node.getpId()==null||"".equals(node.getpId())||node.isIsParent()){ if (node.getpId() == null || "".equals(node.getpId()) || node.isIsParent()) {
node.setState("closed"); //显示文件夹图标 node.setState("closed"); //显示文件夹图标
}else{ } else {
node.setState(null); //显示叶子图标 node.setState(null); //显示叶子图标
} }
ztreeNodes.add(node); ztreeNodes.add(node);
...@@ -64,20 +65,21 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -64,20 +65,21 @@ public class IDicItemServiceImpl implements IDicItemService {
/** /**
* 查询所有单位下的警员信息 * 查询所有单位下的警员信息
*
* @param startId * @param startId
* @return * @return
*/ */
@Override @Override
public List<ZTreeNode> queryTypeUsercode(String startId,String name,String policeId) { public List<ZTreeNode> queryTypeUsercode(String startId, String name, String policeId) {
List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>(); List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>();
Map m = new HashMap<>(); Map m = new HashMap<>();
m.put("unitcode",startId); m.put("unitcode", startId);
m.put("true_name",name); m.put("true_name", name);
m.put("policeId",policeId); m.put("policeId", policeId);
//拿到对应单位下的警员信息 //拿到对应单位下的警员信息
List<User> users = dicItemDao.queryAllUnitUser(m); List<User> users = dicItemDao.queryAllUnitUser(m);
if(users!=null&&users.size()>0){//封装成node对象 if (users != null && users.size() > 0) {//封装成node对象
for(int i=0;i<users.size();i++){ for (int i = 0; i < users.size(); i++) {
ZTreeNode node = new ZTreeNode(); ZTreeNode node = new ZTreeNode();
User user = users.get(i); User user = users.get(i);
node.setState(null); //显示叶子图标 node.setState(null); //显示叶子图标
...@@ -94,21 +96,25 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -94,21 +96,25 @@ public class IDicItemServiceImpl implements IDicItemService {
/** /**
* 拿到指定类型字典的所有代码值 * 拿到指定类型字典的所有代码值
*
* @param type * @param type
* @return * @return
*/ */
@Override @Override
public List<ZTreeNode> queryAllCode(String type) { public List<ZTreeNode> queryAllCode(String type, String id, String name) {
List<SysDictitem> sysDictitemList = dicItemDao.findCodeAllByType(type); if (StringUtils.hasText(name)) {
id = "";
}
List<SysDictitem> sysDictitemList = dicItemDao.findCodeByPid(type, id, name);
List<ZTreeNode> zTreeNodeList = new ArrayList<>(); List<ZTreeNode> zTreeNodeList = new ArrayList<>();
if(sysDictitemList!=null&&sysDictitemList.size()>0){ if (sysDictitemList != null && sysDictitemList.size() > 0) {
for(int i=0;i<sysDictitemList.size();i++){ for (int i = 0; i < sysDictitemList.size(); i++) {
SysDictitem sysDictitem = sysDictitemList.get(i); SysDictitem sysDictitem = sysDictitemList.get(i);
ZTreeNode node=new ZTreeNode(); ZTreeNode node = new ZTreeNode();
node=parseSysDictitemToNode(node,sysDictitem); node = parseSysDictitemToNode(node, sysDictitem);
if(node.isIsParent()){ if (node.isIsParent()) {
node.setState("closed"); //显示文件夹图标 node.setState("closed"); //显示文件夹图标
}else{ } else {
node.setState(null); //显示叶子图标 node.setState(null); //显示叶子图标
} }
zTreeNodeList.add(node); zTreeNodeList.add(node);
...@@ -119,6 +125,7 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -119,6 +125,7 @@ public class IDicItemServiceImpl implements IDicItemService {
/** /**
* 查询具有相应业务审批权限的警员字典 * 查询具有相应业务审批权限的警员字典
*
* @param startId * @param startId
* @param name * @param name
* @return * @return
...@@ -128,14 +135,14 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -128,14 +135,14 @@ public class IDicItemServiceImpl implements IDicItemService {
List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>(); List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>();
List<User> users = new ArrayList<>(); List<User> users = new ArrayList<>();
//业务类型不为空时,拿到所有具备该业务权限的人的信息 //业务类型不为空时,拿到所有具备该业务权限的人的信息
if(startId!=null&&!"".equals(startId.trim())){ if (startId != null && !"".equals(startId.trim())) {
List<String> userIdList = zczlDao.queryAllUserIdByYwlx(startId); List<String> userIdList = zczlDao.queryAllUserIdByYwlx(startId);
if(userIdList!=null&&userIdList.size()>0){ if (userIdList != null && userIdList.size() > 0) {
users = dicItemDao.queryAllUserByUserIdList(userIdList); users = dicItemDao.queryAllUserByUserIdList(userIdList);
} }
} }
if(users!=null&&users.size()>0){//封装成node对象 if (users != null && users.size() > 0) {//封装成node对象
for(int i=0;i<users.size();i++){ for (int i = 0; i < users.size(); i++) {
ZTreeNode node = new ZTreeNode(); ZTreeNode node = new ZTreeNode();
User user = users.get(i); User user = users.get(i);
node.setState(null); //显示叶子图标 node.setState(null); //显示叶子图标
...@@ -158,59 +165,60 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -158,59 +165,60 @@ public class IDicItemServiceImpl implements IDicItemService {
} }
//String key = "zzjgdm_"+ssdw+":"+node.getCodeType()+":"+node.getpId()+":"+node.getId()+":"+node.getName()+":"+node.getId()+" | "+node.getName(); //String key = "zzjgdm_"+ssdw+":"+node.getCodeType()+":"+node.getpId()+":"+node.getId()+":"+node.getName()+":"+node.getId()+" | "+node.getName();
if(name==null||"".equals(name)){ if (name == null || "".equals(name)) {
name="*"; name = "*";
} }
boolean isFirst = true;//是否第一次进入 boolean isFirst = true;//是否第一次进入
//id这个参数在进入代码框的时候没有 //id这个参数在进入代码框的时候没有
if("CODE_XZUNIT".equals(type)){//警员代码框 if ("CODE_XZUNIT".equals(type)) {//警员代码框
if(startId!=null&&!"".equals(startId.trim())){//所属单位不为空 if (startId != null && !"".equals(startId.trim())) {//所属单位不为空
if(id==null||"".equals(id)){//根节点 if (id == null || "".equals(id)) {//根节点
//通过startId 拿到其父节点的code值 //通过startId 拿到其父节点的code值
id = zczlDao.getParentCode(startId); id = zczlDao.getParentCode(startId);
isFirst = false; isFirst = false;
} }
}else{ } else {
if(id==null||"".equals(id)){//根节点 if (id == null || "".equals(id)) {//根节点
id=null; id = null;
} }
} }
}else{ } else {
if(id==null||"".equals(id)){//根节点 if (id == null || "".equals(id)) {//根节点
id=null; id = null;
} }
} }
//获取符合条件的key //获取符合条件的key
String keys = ssdw + ":" + type + ":"+id+":*:"+name; String keys = ssdw + ":" + type + ":" + id + ":*:" + name;
System.out.println("redis查询keys为:" + keys);
Set<String> set = redisTemplate.keys(keys); Set<String> set = redisTemplate.keys(keys);
Iterator<String> iterator = set.iterator(); Iterator<String> iterator = set.iterator();
while(iterator.hasNext()){ while (iterator.hasNext()) {
String str = iterator.next(); String str = iterator.next();
String jsonStr=redisTemplate.opsForValue().get(str); String jsonStr = redisTemplate.opsForValue().get(str);
jsonStr=jsonStr.replaceAll("\\\\",""); jsonStr = jsonStr.replaceAll("\\\\", "");
if(jsonStr.startsWith("\"")){ if (jsonStr.startsWith("\"")) {
jsonStr=jsonStr.substring(1,jsonStr.length()); jsonStr = jsonStr.substring(1, jsonStr.length());
} }
if(jsonStr.endsWith("\"")){ if (jsonStr.endsWith("\"")) {
jsonStr=jsonStr.substring(0,jsonStr.length()-1); jsonStr = jsonStr.substring(0, jsonStr.length() - 1);
} }
SysDictitem sysDictitem=JSON.parseObject(jsonStr,SysDictitem.class); SysDictitem sysDictitem = JSON.parseObject(jsonStr, SysDictitem.class);
ZTreeNode node=new ZTreeNode(); ZTreeNode node = new ZTreeNode();
node=parseSysDictitemToNode(node,sysDictitem); node = parseSysDictitemToNode(node, sysDictitem);
if(node.isIsParent()){ if (node.isIsParent()) {
node.setState("closed"); //显示文件夹图标 node.setState("closed"); //显示文件夹图标
}else{ } else {
node.setState(null); //显示叶子图标 node.setState(null); //显示叶子图标
} }
if(isFirst){ if (isFirst) {
ztreeNodes.add(node); ztreeNodes.add(node);
}else{ } else {
//本单位才add //本单位才add
if(startId.equals(node.getId())){ if (startId.equals(node.getId())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
} }
...@@ -226,189 +234,197 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -226,189 +234,197 @@ public class IDicItemServiceImpl implements IDicItemService {
} }
//获取符合条件的key //获取符合条件的key
String keys = "zzjgdm_" + ssdw + ":" + code_type + ":*"; String keys = "zzjgdm_" + ssdw + ":" + code_type + ":*";
if("CODE_UNIT".equals(code_type)){ if ("CODE_UNIT".equals(code_type)) {
if(null!=unitcode && !"".equals(unitcode)){ //单位代码 if (null != unitcode && !"".equals(unitcode)) { //单位代码
keys = "zzjgdm_" + ssdw + ":" + code_type + ":*:"+unitcode+"*"; keys = "zzjgdm_" + ssdw + ":" + code_type + ":*:" + unitcode + "*";
} }
} }
Set<String> set = redisTemplate.keys(keys); Set<String> set = redisTemplate.keys(keys);
Iterator<String> iterator = set.iterator(); Iterator<String> iterator = set.iterator();
while(iterator.hasNext()){ while (iterator.hasNext()) {
String str = iterator.next(); String str = iterator.next();
String jsonStr=redisTemplate.opsForValue().get(str); String jsonStr = redisTemplate.opsForValue().get(str);
ZTreeNode node= JSON.parseObject(jsonStr,ZTreeNode.class); ZTreeNode node = JSON.parseObject(jsonStr, ZTreeNode.class);
if("CODE_AJLB".equals(code_type)){ if ("CODE_AJLB".equals(code_type)) {
if(null!=yycj && !"".equals(yycj)){ if (null != yycj && !"".equals(yycj)) {
if("magl".equals(yycj)){ if ("magl".equals(yycj)) {
if(yycj.equals(node.getYycj1())){ if (yycj.equals(node.getYycj1())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else if("gmfnetgl".equals(yycj)){ } else if ("gmfnetgl".equals(yycj)) {
if(yycj.equals(node.getYycj2())){ if (yycj.equals(node.getYycj2())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else if("dqcgl".equals(yycj)){ } else if ("dqcgl".equals(yycj)) {
if(yycj.equals(node.getYycj3())){ if (yycj.equals(node.getYycj3())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else if("sqgl".equals(yycj)){ } else if ("sqgl".equals(yycj)) {
if(yycj.equals(node.getYycj4())){ if (yycj.equals(node.getYycj4())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else if("shgl".equals(yycj)){ } else if ("shgl".equals(yycj)) {
if(yycj.equals(node.getYycj5())){ if (yycj.equals(node.getYycj5())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else if("segl".equals(yycj)){ } else if ("segl".equals(yycj)) {
if(yycj.equals(node.getYycj6())){ if (yycj.equals(node.getYycj6())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else if("kqyxlthaj".equals(yycj)){ } else if ("kqyxlthaj".equals(yycj)) {
if(yycj.equals(node.getYycj7())){ if (yycj.equals(node.getYycj7())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else if("wwajgl".equals(yycj)){ } else if ("wwajgl".equals(yycj)) {
if(yycj.equals(node.getYycj8())){ if (yycj.equals(node.getYycj8())) {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else if("shcegl".equals(yycj)){ } else if ("shcegl".equals(yycj)) {
if(yycj.equals(node.getYycj9())){ //涉黑扫恶中案件类别只显示yycj9=shcegl if (yycj.equals(node.getYycj9())) { //涉黑扫恶中案件类别只显示yycj9=shcegl
ztreeNodes.add(node); ztreeNodes.add(node);
} }
} }
}else{ } else {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
}else{ } else {
ztreeNodes.add(node); ztreeNodes.add(node);
} }
} }
if("shcegl".equals(yycj)){ if ("shcegl".equals(yycj)) {
if("CODE_AJZLB".equals(code_type)) { if ("CODE_AJZLB".equals(code_type)) {
return getTreeJsonDataByScodeEcode(ztreeNodes,"090101", "090110"); //涉黑扫恶中案件主类别只显示090101—090110十个 return getTreeJsonDataByScodeEcode(ztreeNodes, "090101", "090110"); //涉黑扫恶中案件主类别只显示090101—090110十个
}else{ } else {
return getTreeJsonDataByName(ztreeNodes,id); //第一级的pid不是空的,所以调这个方法 return getTreeJsonDataByName(ztreeNodes, id); //第一级的pid不是空的,所以调这个方法
} }
}else{ } else {
return getTreeJsonData(ztreeNodes,id); return getTreeJsonData(ztreeNodes, id);
} }
} }
public List<ZTreeNode> getZtreeNodeByName(String code_type,String id,String startId,String yycj,String unitcode,String name) { @Override
public List<ZTreeNode> getZtreeNodeByName(String code_type, String id, String startId, String yycj, String unitcode, String name) {
List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>(); List<ZTreeNode> ztreeNodes = new ArrayList<ZTreeNode>();
try {
ztreeNodes = queryAllCode(code_type, id, name);
} catch (Exception e) {
}
return ztreeNodes;
/*
if (null != ssdw && !"".equals(ssdw) && ssdw.length() >= 2) { if (null != ssdw && !"".equals(ssdw) && ssdw.length() >= 2) {
ssdw = ssdw.substring(0, 2); ssdw = ssdw.substring(0, 2);
} }
if(name==null||"".equals(name)){ if (name == null || "".equals(name)) {
name="*"; name = "*";
} }
//获取符合条件的key //获取符合条件的key
String keys = ssdw + ":" + code_type + ":*:*:*:*"+name+"*"; String keys = ssdw + ":" + code_type + ":*:*:*:*" + name + "*";
System.out.println("keys:"+keys);
Set<String> set = redisTemplate.keys(keys); Set<String> set = redisTemplate.keys(keys);
Iterator<String> iterator = set.iterator(); Iterator<String> iterator = set.iterator();
while(iterator.hasNext()) { while (iterator.hasNext()) {
String str = iterator.next(); String str = iterator.next();
String jsonStr = redisTemplate.opsForValue().get(str); String jsonStr = redisTemplate.opsForValue().get(str);
jsonStr=jsonStr.replaceAll("\\\\",""); jsonStr = jsonStr.replaceAll("\\\\", "");
if(jsonStr.startsWith("\"")){ if (jsonStr.startsWith("\"")) {
jsonStr=jsonStr.substring(1,jsonStr.length()); jsonStr = jsonStr.substring(1, jsonStr.length());
} }
if(jsonStr.endsWith("\"")){ if (jsonStr.endsWith("\"")) {
jsonStr=jsonStr.substring(0,jsonStr.length()-1); jsonStr = jsonStr.substring(0, jsonStr.length() - 1);
} }
SysDictitem sysDictitem=JSON.parseObject(jsonStr,SysDictitem.class); SysDictitem sysDictitem = JSON.parseObject(jsonStr, SysDictitem.class);
ZTreeNode node=new ZTreeNode(); ZTreeNode node = new ZTreeNode();
node=parseSysDictitemToNode(node,sysDictitem); node = parseSysDictitemToNode(node, sysDictitem);
ztreeNodes.add(node); ztreeNodes.add(node);
} }
return getTreeJsonDataByName(ztreeNodes,id); return getTreeJsonDataByName(ztreeNodes, id);*/
} }
private List<ZTreeNode> getTreeJsonData(List<ZTreeNode> zTreeNoderList,String id) { private List<ZTreeNode> getTreeJsonData(List<ZTreeNode> zTreeNoderList, String id) {
List<ZTreeNode> nodes = new ArrayList<ZTreeNode>(); List<ZTreeNode> nodes = new ArrayList<ZTreeNode>();
for(ZTreeNode aa:zTreeNoderList){ for (ZTreeNode aa : zTreeNoderList) {
if(null!=id && !"".equals(id)){ if (null != id && !"".equals(id)) {
if(null!=aa.getpId() && aa.getpId().equals(id)){ //获得第一级结点 if (null != aa.getpId() && aa.getpId().equals(id)) { //获得第一级结点
nodes.add(aa); nodes.add(aa);
} }
}else{ } else {
if(null==aa.getpId() || "".equals(aa.getpId())){ //根据父节点id获得下面一级的所有结点 if (null == aa.getpId() || "".equals(aa.getpId())) { //根据父节点id获得下面一级的所有结点
nodes.add(aa); nodes.add(aa);
} }
} }
} }
//以下代码是为了区分页面的结点是否有子结点,有的话就显示文件夹图标,没有的话就显示叶子图标 //以下代码是为了区分页面的结点是否有子结点,有的话就显示文件夹图标,没有的话就显示叶子图标
for(ZTreeNode a:nodes){ for (ZTreeNode a : nodes) {
int count=0; int count = 0;
for(ZTreeNode b:zTreeNoderList){ for (ZTreeNode b : zTreeNoderList) {
if(!a.getId().equals(b.getpId())){ if (!a.getId().equals(b.getpId())) {
count++; count++;
}else{ } else {
break; break;
} }
} }
if(count!=zTreeNoderList.size()){ if (count != zTreeNoderList.size()) {
a.setState("closed"); //显示文件夹图标 a.setState("closed"); //显示文件夹图标
}else{ } else {
a.setState(null); //显示叶子图标 a.setState(null); //显示叶子图标
} }
} }
return nodes; return nodes;
} }
private List<ZTreeNode> getTreeJsonDataByName(List<ZTreeNode> zTreeNoderList,String id) { private List<ZTreeNode> getTreeJsonDataByName(List<ZTreeNode> zTreeNoderList, String id) {
List<ZTreeNode> nodes = new ArrayList<ZTreeNode>(); List<ZTreeNode> nodes = new ArrayList<ZTreeNode>();
if(null==id || "".equals(id)){ if (null == id || "".equals(id)) {
for(ZTreeNode aa:zTreeNoderList) { for (ZTreeNode aa : zTreeNoderList) {
int count=0; int count = 0;
for(ZTreeNode bb:zTreeNoderList) { for (ZTreeNode bb : zTreeNoderList) {
if(null==aa.getpId() || "".equals(aa.getpId())){ //获得第一级结点 if (null == aa.getpId() || "".equals(aa.getpId())) { //获得第一级结点
nodes.add(aa); nodes.add(aa);
break; break;
}else{ } else {
if(!aa.getpId().equals(bb.getId())){ //获得第一级结点 if (!aa.getpId().equals(bb.getId())) { //获得第一级结点
count++; count++;
}else{ } else {
break; break;
} }
} }
} }
if(count==zTreeNoderList.size()){ if (count == zTreeNoderList.size()) {
nodes.add(aa); nodes.add(aa);
} }
} }
}else{ } else {
for(ZTreeNode aa:zTreeNoderList){ for (ZTreeNode aa : zTreeNoderList) {
if(null!=aa.getpId() && aa.getpId().equals(id)){ //根据父节点id获得下面一级的所有结点 if (null != aa.getpId() && aa.getpId().equals(id)) { //根据父节点id获得下面一级的所有结点
nodes.add(aa); nodes.add(aa);
} }
} }
} }
//以下代码是为了区分页面的结点是否有子结点,有的话就显示文件夹图标,没有的话就显示叶子图标 //以下代码是为了区分页面的结点是否有子结点,有的话就显示文件夹图标,没有的话就显示叶子图标
for(ZTreeNode a:nodes){ for (ZTreeNode a : nodes) {
int count=0; int count = 0;
for(ZTreeNode b:zTreeNoderList){ for (ZTreeNode b : zTreeNoderList) {
if(!a.getId().equals(b.getpId())){ if (!a.getId().equals(b.getpId())) {
count++; count++;
}else{ } else {
break; break;
} }
} }
if(count!=zTreeNoderList.size()){ if (count != zTreeNoderList.size()) {
a.setState("closed"); //显示文件夹图标 a.setState("closed"); //显示文件夹图标
}else{ } else {
a.setState(null); //显示叶子图标 a.setState(null); //显示叶子图标
} }
} }
return nodes; return nodes;
} }
private List<ZTreeNode> getTreeJsonDataByScodeEcode(List<ZTreeNode> zTreeNoderList,String scode,String ecode) { private List<ZTreeNode> getTreeJsonDataByScodeEcode(List<ZTreeNode> zTreeNoderList, String scode, String ecode) {
List<ZTreeNode> nodes = new ArrayList<ZTreeNode>(); List<ZTreeNode> nodes = new ArrayList<ZTreeNode>();
for (ZTreeNode aa : zTreeNoderList) { for (ZTreeNode aa : zTreeNoderList) {
if (!"".equals(scode) && !"".equals(scode)) { if (!"".equals(scode) && !"".equals(scode)) {
...@@ -421,7 +437,7 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -421,7 +437,7 @@ public class IDicItemServiceImpl implements IDicItemService {
return nodes; return nodes;
} }
public List<ZTreeNode> getAjxzJson(String sql){ public List<ZTreeNode> getAjxzJson(String sql) {
return dicItemDao.findAjxzCountSql(sql); return dicItemDao.findAjxzCountSql(sql);
} }
...@@ -434,19 +450,19 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -434,19 +450,19 @@ public class IDicItemServiceImpl implements IDicItemService {
} }
//将单位代码中不是父节点但是isparent为true的修改为false //将单位代码中不是父节点但是isparent为true的修改为false
public void doUnitCode(){ public void doUnitCode() {
ZTreeNode nodeParam=new ZTreeNode(); ZTreeNode nodeParam = new ZTreeNode();
nodeParam.setIsParent(true); nodeParam.setIsParent(true);
nodeParam.setCodeType("CODE_UNIT"); nodeParam.setCodeType("CODE_UNIT");
List<ZTreeNode> nodes=dicItemDao.findCodes(nodeParam);//找出所有的父节点 List<ZTreeNode> nodes = dicItemDao.findCodes(nodeParam);//找出所有的父节点
for(ZTreeNode node : nodes){ for (ZTreeNode node : nodes) {
nodeParam=new ZTreeNode(); nodeParam = new ZTreeNode();
nodeParam.setpId(node.getId()); nodeParam.setpId(node.getId());
nodeParam.setCodeType(node.getCodeType()); nodeParam.setCodeType(node.getCodeType());
List<ZTreeNode> nodes_tem=dicItemDao.findCodes(nodeParam);//根据父节点找出子节点 List<ZTreeNode> nodes_tem = dicItemDao.findCodes(nodeParam);//根据父节点找出子节点
if(nodes_tem==null||nodes_tem.size()==0){//不是父节点,数据错误。 if (nodes_tem == null || nodes_tem.size() == 0) {//不是父节点,数据错误。
node.setIsParent(false); node.setIsParent(false);
Integer r=dicItemDao.updateNode(node); Integer r = dicItemDao.updateNode(node);
} }
} }
} }
...@@ -457,21 +473,21 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -457,21 +473,21 @@ public class IDicItemServiceImpl implements IDicItemService {
if (null != ssdw && !"".equals(ssdw) && ssdw.length() >= 2) { if (null != ssdw && !"".equals(ssdw) && ssdw.length() >= 2) {
ssdw = ssdw.substring(0, 2); ssdw = ssdw.substring(0, 2);
} }
String keys = ssdw + ":" + codeType + ":*:"+codeId+":*"; String keys = ssdw + ":" + codeType + ":*:" + codeId + ":*";
System.out.println(keys); System.out.println(keys);
Set<String> set = redisTemplate.keys(keys); Set<String> set = redisTemplate.keys(keys);
Iterator<String> iterator = set.iterator(); Iterator<String> iterator = set.iterator();
String codename=""; String codename = "";
if(iterator.hasNext()){ if (iterator.hasNext()) {
String str = iterator.next(); String str = iterator.next();
String jsonStr=redisTemplate.opsForValue().get(str); String jsonStr = redisTemplate.opsForValue().get(str);
ZTreeNode node= JSON.parseObject(jsonStr,ZTreeNode.class); ZTreeNode node = JSON.parseObject(jsonStr, ZTreeNode.class);
codename=node.getName(); codename = node.getName();
} }
return codename; return codename;
} }
private ZTreeNode parseSysDictitemToNode(ZTreeNode node,SysDictitem sysDictitem){ private ZTreeNode parseSysDictitemToNode(ZTreeNode node, SysDictitem sysDictitem) {
node.setIds(sysDictitem.getId()); node.setIds(sysDictitem.getId());
node.setCodeType(sysDictitem.getGroupid()); node.setCodeType(sysDictitem.getGroupid());
node.setName(sysDictitem.getName()); node.setName(sysDictitem.getName());
...@@ -482,8 +498,8 @@ public class IDicItemServiceImpl implements IDicItemService { ...@@ -482,8 +498,8 @@ public class IDicItemServiceImpl implements IDicItemService {
node.setEndcode(sysDictitem.getEndcode()); node.setEndcode(sysDictitem.getEndcode());
String isparent = sysDictitem.getIsparent(); String isparent = sysDictitem.getIsparent();
boolean bool = false; boolean bool = false;
if("true".equals(isparent)){ if ("true".equals(isparent)) {
bool = true; bool = true;
} }
node.setIsParent(bool); node.setIsParent(bool);
node.setStartcode(sysDictitem.getStartcode()); node.setStartcode(sysDictitem.getStartcode());
......
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
...@@ -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
#��������ʹ��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
...@@ -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
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<%@ page language="java" import="java.util.*,com.founder.model.*" pageEncoding="utf-8"%> <%@ page language="java" import="java.util.*,com.founder.model.*" pageEncoding="utf-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<% <%
User user = new User(); User user = new User();
user = (User)session.getAttribute("user"); user = (User) session.getAttribute("user");
//是否联络员 //是否联络员
String sflly = (String)session.getAttribute("sflly"); String sflly = (String) session.getAttribute("sflly");
//用户单位 //用户单位
String unitcode = user.getUnitcode(); String unitcode = user.getUnitcode();
//系统所属单位 //系统所属单位
String ssdw = user.getUnitcode().substring(0,2); String ssdw = user.getUnitcode().substring(0, 2);
//位 //用户单位五六位
String ssw = user.getUnitcode().substring(2,4); String ssw = user.getUnitcode().substring(4, 6);
//用户名 //用户名
String username = user.getUsername(); String username = user.getUsername();
String grade = user.getGrade(); String grade = user.getGrade();
//真实姓名
String truename = user.getTrueName();
//警号
String policeId = user.getPolicemanid();
//证件号码
String identitycard = user.getIdentitycard();
%> %>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
...@@ -39,400 +33,992 @@ ...@@ -39,400 +33,992 @@
<link rel="stylesheet" href="/easyui-window/css/easyui.css"> <link rel="stylesheet" href="/easyui-window/css/easyui.css">
<link rel="stylesheet" href="/easyui-window/css/icon.css"> <link rel="stylesheet" href="/easyui-window/css/icon.css">
<link rel="stylesheet" href="/layer/layer.css"> <link rel="stylesheet" href="/layer/skin/layer.css">
<link rel="stylesheet" href="/common/css/jquery.alert.css"> <link rel="stylesheet" href="/common/css/jquery.alert.css">
</head> </head>
<body style="overflow: auto"> <body style="overflow: auto">
<header class="heade-box"> <header class="heade-box">
<!-- <img src="img/banner.jpg" alt=""> --> <!-- <img src="img/banner.jpg" alt=""> -->
<img src="img/title_zczl.png" class="header-title-img" alt=""> <img src="img/title_zczl.png" class="header-title-img" alt="">
<!-- <div class="user-message"> <!-- <div class="user-message">
欢迎您: 欢迎您:
<span>管理员</span>, <span>管理员</span>,
<span>内蒙古公安厅</span> <span>内蒙古公安厅</span>
</div> --> </div> -->
</header> </header>
<aside class="left-min-menu"> <aside class="left-min-menu">
<ul> <ul>
<li> <li>
<i class="fa fa-handshake-o"></i> <i class="fa fa-handshake-o"></i>
</li> </li>
<li> <li>
<i class="fa fa-tty"></i> <i class="fa fa-tty"></i>
</li> </li>
</ul> </ul>
</aside> </aside>
<aside class="left-menu-box"> <aside class="left-menu-box">
<ul class="left-list"> <ul class="left-list">
<li> <li>
<a id="left_ajgl" class="left-list-ftitle"> <a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-handshake-o" style="font-size:14px;"></i> 侦查指令 <i class="fa fa-handshake-o" style="font-size:14px;"></i> 侦查指令
<span> <span>
<i class="fa fa-sort-up"></i> <i class="fa fa-sort-up"></i>
</span> </span>
</a> </a>
<ul> <ul>
<span class="bot"></span> <span class="bot"></span>
<li class="left-list-ttitle"> <li class="left-list-ttitle">
<a href="/toGetZczlList">我负责的侦查指令</a> <a href="/toGetZczlList">我负责的侦查指令</a>
</li> </li>
<%if("admin".equals(username)||"00".equals(ssw)) { %> <%if ("admin".equals(username) || "00".equals(ssw)) { %>
<li style='background-color: #337ab7' class="left-list-ttitle" id="A010102"> <li style='background-color: #337ab7' class="left-list-ttitle" id="A010102">
<a href="/toGetWfqdzczlList">我发起的侦查指令</a> <a href="/toGetWfqdzczlList">我发起的侦查指令</a>
</li> </li>
<%} %> <%} %>
<%if("admin".equals(username)||"00".equals(ssw)) { %> <%if ("admin".equals(username) || "00".equals(ssw)) { %>
<li class="left-list-ttitle" id="A010101"> <li class="left-list-ttitle" id="A010101">
<a href="/toGetXywspdzczlList">需要我审批的侦查指令</a> <a href="/toGetXywspdzczlList">需要我审批的侦查指令</a>
</li> </li>
<%} %> <%} %>
<%if("1".equals(sflly)||"admin".equals(username)) { %> <%if ("1".equals(sflly) || "admin".equals(username)) { %>
<li class="left-list-ttitle"> <li class="left-list-ttitle">
<a href="/toGetWqqfbdzczlList">我申请发布的侦查指令</a> <a href="/toGetWqqfbdzczlList">我申请发布的侦查指令</a>
</li> </li>
<li class="left-list-ttitle"> <li class="left-list-ttitle">
<a>本辖区接受的侦查指令</a> <a>本辖区接受的侦查指令</a>
</li> </li>
<li class="left-list-ttitle"> <li class="left-list-ttitle">
<a href="/toZczltjList">侦查指令统计</a> <a href="/toZczltjList">侦查指令统计</a>
</li> </li>
<%} %> <%} %>
</ul> </ul>
</li> </li>
<li> <li>
<a id="left_ajgl" class="left-list-ftitle"> <a id="left_ajgl" class="left-list-ftitle">
<i class="fa fa-tty" style="font-size:14px;"></i> 信息管理 <i class="fa fa-tty" style="font-size:14px;"></i> 信息管理
<span> <span>
<i class="fa fa-sort-up"></i> <i class="fa fa-sort-up"></i>
</span> </span>
</a> </a>
<ul> <ul>
<span class="bot"></span> <span class="bot"></span>
<li class="left-list-ttitle"> <li class="left-list-ttitle">
<a href="/toGetLlyxxList">联络员查询</a> <a href="/toGetLlyxxList">联络员查询</a>
</li> </li>
<li class="left-list-ttitle" id="A010103"> <li class="left-list-ttitle" id="A010103">
<a href="/toGetUserxxList">联络员管理</a> <a href="/toGetUserxxList">联络员管理</a>
</li> </li>
<li class="left-list-ttitle" id="A010104"> <li class="left-list-ttitle" id="A010104">
<a href="/toGetSpUserList">审批权限管理</a> <a href="/toGetSpUserList">审批权限管理</a>
</li> </li>
</ul> </ul>
</li> </li>
</ul> </ul>
<!-- <dl class="call"> <!-- <dl class="call">
<dt>30天内辖区工作提醒</dt> <dt>30天内辖区工作提醒</dt>
<dd>已通过立案信息审核</dd> <dd>已通过立案信息审核</dd>
<dd>已通过立案信息审核</dd> <dd>已通过立案信息审核</dd>
</dl> --> </dl> -->
</aside> </aside>
<article class="main-cen-box"> <article class="main-cen-box">
<div class="cxtj"> <div class="cxtj">
<form name="zczlForm" action="" method="post" enctype="multipart/form-data"> <form name="zczlForm" action="" method="post" enctype="multipart/form-data">
<input type="hidden" name="zczlbh" value="${tbYwZczl.zczlbh}"> <input type="hidden" name="zczlbh" value="${tbYwZczl.zczlbh}">
<fieldset> <fieldset>
<c:choose> <c:choose>
<c:when test="${not empty tbYwZczl }"> <c:when test="${not empty tbYwZczl }">
<legend>修改侦查指令</legend> <legend>修改侦查指令</legend>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<legend>下达侦查指令</legend> <legend>下达侦查指令</legend>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<table> <table>
<tbody> <tbody>
<tr> <input type="text" id="xxly" value="${param.xxly}" style="display: none">
<td colspan="6" style="height:20px;"></td> <input type="text" id="XgxxBh" value="${param.xgxxXxzjbh}" style="display: none">
</tr> <tr>
<tr> <td colspan="6" style="height:20px;"></td>
<td class="ar" width="13.3%">业务编号:</td> </tr>
<td width="20%"> <tr>
<td class="ar" width="13.3%">业务编号:</td>
<td width="20%">
<span class="textbox"> <span class="textbox">
<input type="text" name="ywbh" id="ywbh" value="${tbYwZczl.ywbh}"> <input type="text" name="ywbh" id="ywbh">
</span> </span>
</td> </td>
<td class="ar necessary" width="13.3%">业务名称:</td <td class="ar necessary" width="13.3%">业务名称:</td>
> <td width="20%">
<td width="20%">
<span class="textbox"> <span class="textbox">
<input type="text" name="ywmc" id="ywmc" value="${tbYwZczl.ywmc}"> <input type="text" name="ywmc" id="ywmc">
</span> </span>
</td> </td>
<td class="ar necessary" width="13.3%">回报期限:</td> <td class="ar necessary" width="13.3%">回报期限:</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input id="hbqx" name="hbqx" class="Wdate" value="${tbYwZczl.hbqx}" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({minDate:'sysdate',dateFmt:'yyyy-MM-dd'})"/> <input id="hbqx" name="hbqx" class="Wdate" value="${tbYwZczl.hbqx}" type="text"
onkeypress="return checkDateFmt();"
onFocus="WdatePicker({minDate:'sysdate',dateFmt:'yyyy-MM-dd'})"/>
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="ar necessary" width="13.3%">业务类型:</td> <td class="ar necessary" width="13.3%">业务类型:</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input type="text" id="ywlx" name="ywlx" value="${tbYwZczl.ywlx}" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_YWLXDM',method:'get',fit:true,textField : 'text', valueField : 'id'"/> <input type="text" id="ywlx" name="ywlx" value="${tbYwZczl.ywlx}"
class="val easyui-combobox"
data-options="url: '/queryTypeCode?type=CODE_YWLXDM',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%">审批人:</td> <td class="ar" width="13.3%">审批人:</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input type="hidden" id="hiddenZpsprjh" value="${tbYwZczl.zdsprjh}"> <input type="hidden" id="hiddenZpsprjh" value="${tbYwZczl.zdsprjh}">
<input type="text" id="zdsprjh" name="zdsprjh" value="" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_SPJY&startId=${tbYwZczl.ywlx}',method:'get',fit:true,textField : 'text', valueField : 'id'"/> <input type="text" id="zdsprjh" name="zdsprjh" value=""
class="val easyui-combotree"
data-options="url: '/queryTypeCode?type=CODE_SPJY&startId=${tbYwZczl.ywlx}',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span> </span>
</td> </td>
<td class="ar necessary" width="13.3%">侦查指令类型:</td> <td class="ar necessary" width="13.3%">侦查指令类型:</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input type="text" id="zllx" name="zllx" value="${tbYwZczl.zllx}" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_ZLLXDM',method:'get',fit:true,textField : 'text', valueField : 'id'"/> <input type="text" id="zllx" name="zllx" value="${tbYwZczl.zllx}"
class="val easyui-combotree"
data-options="url: '/queryTypeCode?type=CODE_ZLLXDM',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%"></td> </tr>
<td width="20%"></td> <%-- <tr class="DNA_TITLE" style="display: none">--%>
</tr> <%-- <td class="ar necessary" width="13.3%">指纹比中信息编号:</td>--%>
<tr> <%-- <td colspan="3">--%>
<td class="ar necessary">接受单位:</td> <%-- <span style="width: 30%" class="textbox">--%>
<td colspan="3"> <%-- <input type="text" name="xgxxXxzjbh" value="${tbYwZczl.xgxxXxzjbh}"--%>
<%-- data-options="prompt:'请输入指纹比中信息编号并点击提取'" id="xgxxXxzjbh">--%>
<%-- </span>--%>
<%-- <a class="ALLTQ DNA KQYAJT XSZDH ZTRY btn_a btn_search posa" onclick="doSearch()"--%>
<%-- style="margin-right:20px;">提取</a>--%>
<%-- <a class="TOXQ DNA KQYAJT XSZDH ZTRY btn_a btn_search posa baseMessage" onclick="doDnaDetail()"--%>
<%-- style="margin-right:20px;">查看详情</a>--%>
<%-- <a class="DNA btn_a btn_search posa" onclick="doMoreDnaDetail()"--%>
<%-- style="margin-right:20px;">更多相关指纹信息</a>--%>
<%-- <a class="DNA_DNA btn_a btn_search posa" onclick="doMoreDna_DNADetail()"--%>
<%-- style="margin-right:20px;">更多相关DNA信息</a>--%>
<%-- </td>--%>
<%-- </tr>--%>
<tr class="XSZDH">
<td class="ar" width="13.3%"> 检举人姓名:</td>
<td width="20%">
<input type="text" readonly="readonly" id="jjrXm" name="jjrXm"/>
</td>
<td class="ar" width="13.3%">检举人身份证号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="jjrSfzh" name="jjrSfzh"/>
</td>
</tr>
<tr class="KQYAJ">
<td class="ar" width="13.3%"> 系列案件名称:</td>
<td width="20%">
<input type="text" readonly="readonly" id="cbmc" name="cbmc"/>
</td>
<td class="ar" width="13.3%">涉案/已破:</td>
<td width="20%">
<input type="text" readonly="readonly" id="cbzGlajCount" name="cbzGlajCount"/>
</td>
</tr>
<tr class="KQYAJ">
<td class="ar" width="13.3%">串并依据:</td>
<td width="20%">
<input type="text" readonly="readonly" id="cblx" name="cblx"/>
</td>
<td class="ar" width="13.3%">跨区域类型:</td>
<td width="20%">
<input type="text" readonly="readonly" id="cbajKd" name="cbajKd"/>
</td>
</tr>
<tr class="DNA zw">
<td class="ar" width="13.3%">捺印指纹编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="barcode" name="barcode"/>
</td>
<td class="ar" width="13.3%">人员编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="barcodeRybh" name="barcodeRybh"/>
</td>
</tr>
<tr class="DNA zw">
<td class="ar" width="13.3%">姓名:</td>
<td width="20%">
<input type="text" readonly="readonly" id="name_dna" name="name_dna"/>
</td>
<td class="ar" width="13.3%">证件号码:</td>
<td width="20%">
<input type="text" readonly="readonly" id="idnumber" name="idnumber"/>
</td>
<td class="ar" width="13.3%">出生日期:</td>
<td width="20%">
<input type="text" readonly="readonly" id="birthdate" name="birthdate"/>
</td>
</tr>
<tr class="DNA zw">
<td class="ar" width="13.3%">现场指纹编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="barcode_A" name="barcode_A"/>
</td>
<td class="ar" width="13.3%">案事件编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="asjbh_A" name="asjbh_A"/>
</td>
<td class="ar" width="13.3%">现堪编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="kybh" name="kybh"/>
</td>
</tr>
<tr class="DNA_DNA">
<td class="ar" width="13.3%">DNA编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="dna_xxzjbh" name="barcode"/>
</td>
<td class="ar" width="13.3%">人员编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="bzry_rybh" name="barcodeRybh"/>
</td>
</tr>
<tr class="DNA_DNA">
<td class="ar" width="13.3%">姓名:</td>
<td width="20%">
<input type="text" readonly="readonly" id="bzry_xm" name="name_dna"/>
</td>
<td class="ar" width="13.3%">证件号码:</td>
<td width="20%">
<input type="text" readonly="readonly" id="bzry_sfzh" name="idnumber"/>
</td>
<td class="ar" width="13.3%">出生日期:</td>
<td width="20%">
<input type="text" readonly="readonly" id="bzry_csrq" name="birthdate"/>
</td>
</tr>
<tr class="DNA_DNA">
<td class="ar" width="13.3%">DNA库案件编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="bzaj_ajbh" name="barcode_A"/>
</td>
<td class="ar" width="13.3%">现勘编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="bzaj_xkbh" name="asjbh_A"/>
</td>
</tr>
<tr class="ZTRY">
<td class="ar" width="13.3%">悬赏编号:</td>
<td width="20%">
<input type="text" readonly="readonly" id="ztry_bgbh" name="barcode"/>
</td>
<td class="ar" width="13.3%">在逃人员姓名:</td>
<td width="20%">
<input type="text" readonly="readonly" id="ztry_xm" name="barcodeRybh"/>
</td>
<td class="ar" width="13.3%">在逃人员证件号码:</td>
<td width="20%">
<input type="text" readonly="readonly" id="ztry_zjhm" name="barcodeRybh"/>
</td>
</tr>
<tr>
<td class="ar necessary">接受单位:</td>
<td colspan="3">
<span class="textbox textbox-3"> <span class="textbox textbox-3">
<%if("65".equals(ssdw)) { %> <input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm"
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_DZXZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id'"/> class="val easyui-openCombotree" multiple
<%} else if("14".equals(ssdw)&&grade.equals("S")) { %> data-options="url: '/queryTypeCode?type=CODE_XZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id', cascadeCheck:false,minonly:false,multiple:true"/>
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<%} else if("62".equals(ssdw)) { %>
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT_XDZL',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<%}else{%>
<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" multiple data-options="url: '/queryTypeCode?type=CODE_XZUNIT',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
<% } %>
<%--<input type="text" id="zljsdwdm" value="${tbYwZczl.zljsdwdm}" name="zljsdwdm" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_XZUNIT&rootId=650100000000',method:'get',fit:true,textField : 'text', valueField : 'id'"/>
--%>
</span> </span>
</td> </td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td class="ar necessary">指令事由:</td> <td class="ar necessary">指令事由:</td>
<td colspan="5"> <td colspan="5">
<textarea rows="5" id="zlsy" name="zlsy" value="${tbYwZczl.zlsy}">${tbYwZczl.zlsy}</textarea> <textarea rows="5" id="zlsy" name="zlsy"
</td> value="${tbYwZczl.zlsy}">${tbYwZczl.zlsy}</textarea>
</tr> </td>
<tr> </tr>
<td class="ar necessary">工作要求:</td> <tr>
<td colspan="5"> <td class="ar necessary">工作要求:</td>
<textarea rows="5" id="gzyq" name="gzyq" value="${tbYwZczl.gzyq}">${tbYwZczl.gzyq}</textarea> <td colspan="5">
</td> <textarea rows="5" id="gzyq" name="gzyq"
</tr> value="${tbYwZczl.gzyq}">${tbYwZczl.gzyq}</textarea>
<tr> </td>
<td class="ar"></td> </tr>
<td> <tr>
<jsp:include page="xdzl_file.jsp"></jsp:include> <td class="ar"></td>
</td> <td>
<td></td><td></td><td></td><td></td> <jsp:include page="xdzl_file.jsp"></jsp:include>
</tr> </td>
<!-- <tr> <td></td>
<td colspan="6" style="text-align:center;"> <td></td>
<span id="arrow_span0" onclick="tjzs(0)"></span> <td></td>
<span id="arrow_span1" onclick="tjzs(1)"></span> <td></td>
</td> </tr>
</tr> --> <!-- <tr>
<tr> <td colspan="6" style="text-align:center;">
<td colspan="6" style="text-align:center;"> <span id="arrow_span0" onclick="tjzs(0)"></span>
<c:choose> <span id="arrow_span1" onclick="tjzs(1)"></span>
<c:when test="${not empty tbYwZczl }"> </td>
<a class="btn_a btn_search" onclick="doEditZczl('3')">修改</a> </tr> -->
<a class="btn_a btn_add" onclick="doEditZczl('2')">修改并提交审批</a> <tr>
</c:when> <td colspan="6" style="text-align:center;">
<c:otherwise> <c:choose>
<a class="btn_a btn_search" onclick="doAddZczl('3')">保存</a> <c:when test="${not empty tbYwZczl }">
<a class="btn_a btn_add" onclick="doAddZczl('2')">保存并提交审批</a> <a class="btn_a btn_search" onclick="doEditZczl('3')">修改</a>
</c:otherwise> <a class="btn_a btn_add" onclick="doEditZczl('2')">修改并提交审批</a>
</c:choose> </c:when>
<a class="btn_a btn_empty" onclick="back()">返回</a> <c:otherwise>
</td> <a class="btn_a btn_search" onclick="doAddZczl('3')">保存</a>
</tr> <a class="btn_a btn_add" onclick="doAddZczl('2')">保存并提交审批</a>
</tbody> </c:otherwise>
</table> </c:choose>
</fieldset> <a class="btn_a btn_empty" onclick="back()">返回</a>
</form> </td>
</div> </tr>
</article> </tbody>
<script src="js/jquery.min.js" type="text/javascript"></script> </table>
<script src="js/base.js" type="text/javascript"></script> </fieldset>
<script src="/layer/layer.js" type="text/javascript"></script> </form>
<!--- 代码框--> </div>
<script type="text/javascript" src="/easyui-window/js/jquery.min.js"></script> </article>
<script type="text/javascript" src="/easyui-window/js/jquery.easyui.min.js"></script> <script src="js/jquery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="/easyui-window/js/function.js"></script> <script src="js/base.js" type="text/javascript"></script>
<script type="text/javascript" src="/easyui-window/js/easyui-lang-zh_CN.js"></script> <script src="/layer/layer.js" type="text/javascript"></script>
<!--- 日期时间--> <!--- 代码框-->
<script type="text/javascript" src="/common/datepicker/WdatePicker.js"></script> <script type="text/javascript" src="/easyui-window/js/jquery.min.js"></script>
<script type="text/javascript" src="/common/datepicker/calendar.js"></script> <script type="text/javascript" src="/easyui-window/js/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/easyui-window/js/jquery.easyui.my.js"></script>
<script src="/common/js/jquery.alert.js"></script> <script type="text/javascript" src="/easyui-window/js/function.js"></script>
<script id="scripturlid" src="/common/js/checkurl.js?url=${perurl}" type="text/javascript"></script> <script type="text/javascript" src="/easyui-window/js/easyui-lang-zh_CN.js"></script>
<%--添加水印--%>
<script type="text/javascript" src="/common/js/common.js"></script>
<script type="text/javascript" src="/common/js/watermark.js"></script>
<script type="text/javascript" src="/js/ajax.js"></script>
<script>
getIPs(function(ip){
watermark.load({ watermark_txt: "<%=truename%>"+" "+"<%=identitycard%>"+" "+"<%=unitcode%>"+" "+"<%=policeId%>"+" "+ip});
});
</script>
<script> <!--- 日期时间-->
openCombotree('ywlx'); <script type="text/javascript" src="/common/datepicker/WdatePicker.js"></script>
openCombotree('zllx'); <script type="text/javascript" src="/common/datepicker/calendar.js"></script>
openCombotree('zljsdwdm');
</script> <script src="/common/js/jquery.alert.js"></script>
<script id="scripturlid" src="/common/js/checkurl.js?url=${perurl}" type="text/javascript"></script>
</body> </body>
</html> </html>
<script type="text/javascript"> <script type="text/javascript">
var ztptUrl = "${ztptUrl}";
$(document).ready(function () {
if ("${flag}" == "1") {//添加成功
layer.alert("保存成功!", "提示", function (res) {
if (res) {
layer.closeAll();
var url = "/toGetWfqdzczlList";
window.open(url, "_self");
}
});
} else if ("${flag}" == "0") {
layer.alert("保存失败!", "提示", function (res) {
if (res) {
layer.closeAll();
var url = "/toGetWfqdzczlList";
window.open(url, "_self");
}
});
} else if ("${flag}" == "3") {
layer.alert("修改失败!", "提示", function (res) {
if (res) {
layer.closeAll();
var url = "/toGetWfqdzczlList";
window.open(url, "_self");
}
});
} else if ("${flag}" == "4") {
layer.alert("修改成功!", "提示", function (res) {
if (res) {
layer.closeAll();
var url = "/toGetWfqdzczlList";
window.open(url, "_self");
}
});
}
$(document).ready(function(){ $('#ywlx').openCombotree({
var hiddenZpsprjh = $("#hiddenZpsprjh").val(); onChange: function (n, o) {
$('#zdsprjh').combotree('setValue',hiddenZpsprjh); $(".KQYAJ").hide();
$('#ywlx').combotree({ $(".DNA").hide();
onChange: function (n,o) { $(".XSZDH").hide();
debugger $(".ZTRY").hide();
$(".DNA_DNA").hide();
//控制类案中的代码值 //控制类案中的代码值
$('#zdsprjh').combobox('clear'); $('#zdsprjh').combobox('clear');
//$('#zdsprjh').combobox('setValue','');
//$('#zdsprjh').combobox('selected',false);
// "selected":true
$('#zdsprjh').combobox({ $('#zdsprjh').combobox({
url: "/queryTypeCode?type=CODE_SPJY&startId="+n url: "/queryTypeCode?type=CODE_SPJY&startId=" + n
});
$('#zllx').openCombotree('clear');
$('#zllx').openCombotree({
url: "/queryTypeCode?type=CODE_ZLLXDM&startId=" + n
}); });
}
});
$('#zljsdwdm').openCombotree({
onChange: function (n, o) {
var ywlx = $("#ywlx").openCombotree("getValue");
if (ywlx != null && ywlx != "") {
if (ywlx == '3') {
if ($("input[name='zljsdwdm']").length > 1) {
layer.alert("刑事技术比中业务只能选择一个接受单位,请重新选择!", "提示");
$("#zljsdwdm").openCombotree("setValue", "");
}
}
} else {
layer.alert("请先选择业务类型!", "提示");
$("#zljsdwdm").openCombotree("setValue", "");
}
} }
}); });
if("${flag}" == "1"){//添加成功 $('#zllx').openCombotree({
layer.alert("保存成功!","提示",function(res){ onChange: function (n, o) {
if(res){ $(".KQYAJ").find("input").val("");
layer.closeAll(); $(".DNA").find("input").val("");
var url="/toGetWfqdzczlList"; $(".XSZDH").find("input").val("");
window.open(url,"_self"); $(".DNA_DNA").find("input").val("");
$(".ZTRY").find("input").val("");
$(".KQYAJ").hide();
$(".DNA").hide();
$(".XSZDH").hide();
$(".DNA_DNA").hide();
$(".ZTRY").hide();
$("#xgxxXxzjbh").val("");
var zllx = $("#zllx").openCombotree("getValue");
var ywlx = $("#ywlx").openCombotree("getValue");
if (zllx == "5001") {
$(".DNA_TITLE").show();
$(".ALLTQ").show();
$(".DNA_TITLE").find("td").eq(0).text("指纹比中信息编号:");
} else if (zllx == "5002") {
$(".DNA_TITLE").show();
$(".ALLTQ").show();
$(".DNA_TITLE").find("td").eq(0).text("DNA比中信息编号:");
} else if (zllx == "6001") {
$(".DNA_TITLE").show();
$(".ALLTQ").show();
$(".DNA_TITLE").find("td").eq(0).text("线索转递函编号:");
} else if (zllx == "6002") {
$(".DNA_TITLE").show();
$(".ALLTQ").show();
$(".DNA_TITLE").find("td").eq(0).text("在逃线索编号:");
} else if (zllx == "6003") {
$(".DNA_TITLE").show();
$(".baseMessage").show();
$(".DNA_TITLE").find("td").eq(0).text("可疑人员线索编号:");
} else if (zllx == "6004") {
$(".DNA_TITLE").show();
$(".baseMessage").show();
$(".DNA_TITLE").find("td").eq(0).text("可疑号码线索编号:");
} else if (zllx == "6005") {
$(".DNA_TITLE").show();
$(".baseMessage").show();
$(".DNA_TITLE").find("td").eq(0).text("可疑车辆线索编号:");
} else if (zllx == "6006") {
$(".DNA_TITLE").show();
$(".baseMessage").show();
$(".DNA_TITLE").find("td").eq(0).text("可疑非机动车线索编号:");
} else if (zllx == "6007") {
$(".DNA_TITLE").show();
$(".baseMessage").show();
$(".DNA_TITLE").find("td").eq(0).text("可疑服务标识号线索编号:");
} else if (zllx == "7001") {
$(".DNA_TITLE").show();
$(".baseMessage").show();
$(".DNA_TITLE").find("td").eq(0).text("漏洞比堵编号:");
} else if (ywlx == "0") {
$(".DNA_TITLE").find("td").eq(0).text("跨区域系列案件编号:");
$("#xgxxXxzjbh").attr("value", $("#XgxxBh").val());
$("input[name='xgxxXxzjbh']").val($("#XgxxBh").val());
$(".DNA_TITLE").show();
$(".ALLTQ").show();
$(".KQYAJT").show();
} else {
$(".DNA_TITLE").hide();
} }
}
});
$(".ZTRY").hide();
$(".DNA").hide();
$(".KQYAJ").hide();
$(".XSZDH").hide();
$(".DNA_DNA").hide();
var zllx = $("#zllx").openCombotree("getValue");
var xxly = $("#xxly").val();
//5001为指纹类型(该模式为从指纹跳转过来时)
if (xxly == "5001") {
$("#ywlx").openCombotree({
url: "/queryTypeCode?type=CODE_YWLXDM&startId=4"
})
$("#ywlx").openCombotree("setValue", "4");
$('#zllx').openCombotree({
url: "/queryTypeCode?type=CODE_ZLLXDM&startId=" + xxly
}); });
}else if("${flag}" == "0"){ $("#zllx").openCombotree("setValue", xxly);
layer.alert("保存失败!","提示",function(res){ $("#xgxxXxzjbh").attr("value", $("#XgxxBh").val());
if(res){ $("input[name='xgxxXxzjbh']").val($("#XgxxBh").val());
layer.closeAll();
var url="/toGetWfqdzczlList"; $("input[name='ywmc']").val('指纹比中侦查指令');
window.open(url,"_self"); $("input[name='ywbh']").val($("#XgxxBh").val());
}
$(".DNA_TITLE").show();
doSearch();
} else if (xxly == "5002") { //DNA比中
$("#ywlx").openCombotree({
url: "/queryTypeCode?type=CODE_YWLXDM&startId=4"
})
$("#ywlx").openCombotree("setValue", "4");
$('#zllx').openCombotree({
url: "/queryTypeCode?type=CODE_ZLLXDM&startId=" + xxly
}); });
}else if("${flag}" == "3"){ $("#zllx").openCombotree("setValue", xxly);
layer.alert("修改失败!","提示",function(res){ $("#xgxxXxzjbh").attr("value", $("#XgxxBh").val());
if(res){ $("input[name='xgxxXxzjbh']").val($("#XgxxBh").val());
layer.closeAll();
var url="/toGetWfqdzczlList"; $("input[name='ywmc']").val('DNA比中侦查指令');
window.open(url,"_self"); $("input[name='ywbh']").val($("#XgxxBh").val());
}
$(".DNA_TITLE").show();
doSearch();
} else if (xxly == "6001") { //线索转递函
$("#ywlx").openCombotree("setValue", "5");
$('#zllx').openCombotree({
url: "/queryTypeCode?type=CODE_ZLLXDM&startId=" + xxly
}); });
}else if("${flag}" == "4"){ $("#zllx").openCombotree("setValue", xxly);
layer.alert("修改成功!","提示",function(res){ $("#xgxxXxzjbh").attr("value", $("#XgxxBh").val());
if(res){ $("input[name='xgxxXxzjbh']").val($("#XgxxBh").val());
layer.closeAll(); $(".DNA_TITLE").show();
var url="/toGetWfqdzczlList"; doSearch();
window.open(url,"_self"); } else if (xxly == "6002") { //在逃人员线索
} $("#ywlx").openCombotree({
url: "/queryTypeCode?type=CODE_YWLXDM&startId=5"
})
$("#ywlx").openCombotree("setValue", "5");
$('#zllx').openCombotree({
url: "/queryTypeCode?type=CODE_ZLLXDM&startId=" + xxly
});
$("#zllx").openCombotree("setValue", xxly);
$("#xgxxXxzjbh").attr("value", $("#XgxxBh").val());
$("input[name='xgxxXxzjbh']").val($("#XgxxBh").val());
$("input[name='ywmc']").val('在逃人员线索研判侦查指令');
$("input[name='ywbh']").val($("#XgxxBh").val());
$(".DNA_TITLE").show();
$(".ZTRY").show();
doSearch();
} else if (xxly == "6003" || xxly == "6004" || xxly == "6005" || xxly == "6006" || xxly == "6007") { //可疑线索流程
$("#ywlx").openCombotree("setValue", "5");
$('#zllx').openCombotree({
url: "/queryTypeCode?type=CODE_ZLLXDM&startId=5"
});
$("#zllx").openCombotree("setValue", xxly);
$("#xgxxXxzjbh").attr("value", $("#XgxxBh").val());
$("input[name='xgxxXxzjbh']").val($("#XgxxBh").val());
$("input[name='ywmc']").val('可疑线索侦查指令');
$("input[name='ywbh']").val($("#XgxxBh").val());
$(".DNA_TITLE").show();
$(".baseMessage").show();
} else if (xxly == "7001") { //漏洞比堵
$("#ywlx").openCombotree("setValue", "6");
$('#zllx').openCombotree({
url: "/queryTypeCode?type=CODE_ZLLXDM&startId=6"
}); });
$("#zllx").openCombotree("setValue", xxly);
$("#xgxxXxzjbh").attr("value", $("#XgxxBh").val());
$("input[name='xgxxXxzjbh']").val($("#XgxxBh").val());
$(".DNA_TITLE").show();
$(".baseMessage").show();
} else if (xxly == "0") {
$(".KQYAJT").show();
$("#ywlx").openCombotree("setValue", "0");
} }
/*//修改模式的初始化
if(xxly == "5001" || xxly == "0" ||xxly == "5001"){
$(".DNA_TITLE").show();
doSearch();//调取指纹接口,给页面上指纹信息赋值
}*/
var hiddenZpsprjh = $("#hiddenZpsprjh").val();
$('#zdsprjh').openCombotree('setValue', hiddenZpsprjh);
//刑事技术比中跳转 //刑事技术比中跳转
if("${param.type}" == "1"){ if ("${param.type}" == "1") {
var zwbh = "${param.bzzybh}"; var zwbh = "${param.bzzybh}";
var sfzh = "${param.bzrZjhm}"; var sfzh = "${param.bzrZjhm}";
var sjly = "${param.sjly}"; var sjly = "${param.sjly}";
if(sfzh!=null&&sfzh!=""){ if (sfzh != null && sfzh != "") {
sfzh = "(身份证号:"+sfzh+")" sfzh = "(身份证号:" + sfzh + ")"
} }
var xcbh = null; var xcbh = null;
var sjlyxx = null; var sjlyxx = null;
if(sjly=='DNABZ'){ if (sjly == 'DNABZ') {
xcbh = "物证编号"; xcbh = "物证编号";
sjlyxx = "DNA"; sjlyxx = "DNA";
}else{ } else {
xcbh = "现场指纹编号"; xcbh = "现场指纹编号";
sjlyxx = "指纹"; sjlyxx = "指纹";
} }
document.getElementById("zlsy").value = xcbh+"为"+zwbh+"的人员"+sfzh+"已被刑事技术比中,请及时核查该人员和现场"+sjlyxx+",做好串并案和案件认定工作。核查结果请通过此指令进行反馈。"; document.getElementById("zlsy").value = xcbh + "为" + zwbh + "的人员" + sfzh + "已被刑事技术比中,请及时核查该人员和现场" + sjlyxx + ",做好串并案和案件认定工作。核查结果请通过此指令进行反馈。";
document.getElementById("ywmc").value = "刑事技术比中人员核查"; document.getElementById("ywmc").value = "刑事技术比中人员核查";
document.getElementById("ywbh").value = zwbh; document.getElementById("ywbh").value = zwbh;
document.getElementById("ywbh").readOnly=true; document.getElementById("ywbh").readOnly = true;
document.getElementById("gzyq").value = "请尽快核实反馈,反馈时限为七天。"; document.getElementById("gzyq").value = "请尽快核实反馈,反馈时限为七天。";
} }
}); });
//提取DNA信息
function doSearch() {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
var zllx = $("#zllx").openCombotree("getValue");
var ywlx = $("#ywlx").openCombotree("getValue");
if (zllx == "5002") {
var asjZbUrl = "${asjZbUrl}";
$.ajax({
url: asjZbUrl + "/getDnabzxxByXxzjbh?xxzjbh=" + xgxxXxzjbh,
type: "POST",
xhrFields: {
withCredentials: true
},
success: function (data) {
console.log(data);
if (JSON.stringify(data) != "{}") {
$(".DNA_DNA").show();
var person = data.dnabzxx;
$("#dna_xxzjbh").val(person.xxzjbh);
$("#bzry_rybh").val(person.bzry_rybh);
$("#bzry_xm").val(person.bzry_xm);
$("#bzry_sfzh").val(person.bzry_sfzh);
if (person.bzry_csrq != null) {
person.bzry_csrq = person.bzry_csrq.substring(0, 10)
}
$("#bzry_csrq").val(person.bzry_csrq);
function back(){ $("#bzaj_ajbh").val(person.bzaj_ajbh);
var url="/toGetWfqdzczlList"; $("#bzaj_xkbh").val(person.bzaj_xkbh);
window.open(url,"_self"); } else {
layer.alert("指纹比中信息编号有误!", "提示");
return;
}
}
})
} else if (zllx == "5001") {
var asjZbUrl = "${asjZbUrl}";
$.ajax({
url: asjZbUrl + "/getXsjsbdxx?xxzjbh=" + xgxxXxzjbh,
type: "POST",
xhrFields: {
withCredentials: true
},
success: function (data) {
console.log(data);
if (JSON.stringify(data) != "{}") {
$(".DNA").show();
var person = data.person;
$("#barcode").val(person.barcode);
$("#barcodeRybh").val("R" + person.barcode);
$("#name_dna").val(person.name);
$("#idnumber").val(person.idnumber);
if (person.birthdate != null) {
person.birthdate = person.birthdate.substring(0, 10)
}
$("#birthdate").val(person.birthdate);
var asjxx = data.casexx;
$("#barcode_A").val(asjxx.barcode);
$("#asjbh_A").val(asjxx.asjbh);
$("#kybh").val(asjxx.kybh);
} else {
layer.alert("指纹比中信息编号有误!", "提示");
return;
}
}
})
} else if (zllx == "6001") {
var zcptUrl = "${zcptUrl}";
$.ajax({
url: zcptUrl + "/getXszdhDetail?xxzjbh=" + xgxxXxzjbh,
type: "POST",
xhrFields: {
withCredentials: true
},
success: function (data) {
if (JSON.stringify(data) != "{}") {
$(".XSZDH").show();
var person = data.data;
$("#jjrXm").val(person.jjrXm);
$("#jjrSfzh").val(person.jjrSfzh);
} else {
layer.alert("线索转递函编号有误!", "提示");
return;
}
}
})
} else if (zllx == "6002") {
$.ajax({
url: "/getZtryDetail?xxzjbh=" + xgxxXxzjbh,
type: "POST",
success: function (data) {
if (data != null) {
$(".ZTRY").show();
$("#ztry_bgbh").val(data.BGBH);
$("#ztry_xm").val(data.XM);
$("#ztry_zjhm").val(data.ZJHM);
} else {
layer.alert("线索编号有误!", "提示");
return;
}
}
})
} else if (ywlx == "0") {
$.ajax({
url: "/getCbzxx?xxzjbh=" + xgxxXxzjbh,
type: "POST",
success: function (data) {
$(".KQYAJ").show();
if (JSON.stringify(data) != "{}") {
var data = data.data;
$("#cbmc").val(data.cbmc);
$("#cbzGlajCount").val(data.cbzGlajCount + "/" + data.rn);
$("#cblx").val(data.cblx);
$("#cbajKd").val(data.cbajKd);
} else {
layer.alert("系列案件编号有误!", "提示");
return;
}
}
})
} }
// }
function doAddZczl(flag) {
if($("#ywmc").val()=="" || $("#ywmc").val()==null){ //根据 指令类型 zllx xgxxXxzjbh跳转各个功能模块详情页面
layer.alert("业务名称必填!","提示"); function doDnaDetail() {
var zllx = $("#zllx").openCombotree("getValue");
var ywlx = $("#ywlx").openCombotree("getValue");
if (zllx == '5001') {
var barcodeRybh = $("#barcodeRybh").val();
var barcode_A = $("#barcode_A").val();
var asjZbUrl = "${asjZbUrl}";
window.open(asjZbUrl + "/getXsjsbdxq?nyzwbh=" + barcodeRybh + "&xczwbh=" + barcode_A);
} else if (zllx == '6001') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
var zcptUrl = "${zcptUrl}";
window.open(zcptUrl + "/getXszdhxx?xxzjbh=" + xgxxXxzjbh);
} else if (zllx == '6002') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
window.open(ztptUrl + "/toSpYpbg?xxzjbh=" + xgxxXxzjbh);
} else if (zllx == '6003') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
window.open(ztptUrl + "/getKyxsry?xxzjbh=" + xgxxXxzjbh + "&flag=0");
} else if (zllx == '6004') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
window.open(ztptUrl + "/getKyxshm?xxzjbh=" + xgxxXxzjbh + "&flag=0");
} else if (zllx == '6005') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
window.open(ztptUrl + "/getKyxsjdc?xxzjbh=" + xgxxXxzjbh + "&flag=0");
} else if (zllx == '6006') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
window.open(ztptUrl + "/getKyxsfjdc?xxzjbh=" + xgxxXxzjbh + "&flag=0");
} else if (zllx == '6007') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
window.open(ztptUrl + "/getKyxsfwbsh?xxzjbh=" + xgxxXxzjbh + "&flag=0");
} else if (zllx == '7001') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
var mainUrl = "${mainUrl}";
var caijiUrl = "${caijiUrl}";
var detailUrl = mainUrl + "?title=漏洞必堵&url=" + caijiUrl + "/jwzh-anjian/html/ajyp/ldbdDetail.html?1=1&xxzjbh=" + xgxxXxzjbh + '&asjbh=';
window.open(detailUrl);
} else if (ywlx == '0') {
var xgxxXxzjbh = $("#xgxxXxzjbh").val();
var asjCbUrl = "${asjCbUrl}";
window.open(asjCbUrl + "/toBjcba?xxzjbh=" + xgxxXxzjbh);
}
}
//跳转当前信息主键编号 关联人员所有的指纹信息
function doMoreDnaDetail() {
window.open("${asjZbUrl}" + "/getZwbzxxListByZjhm?zjhm=" + $("#idnumber ").val());
}
//跳转当前信息主键编号 关联人员所有的DNA信息
function doMoreDna_DNADetail() {
window.open("${asjZbUrl}" + "/getDnabzxxByZjhm?zjhm=" + $("#bzry_sfzh ").val());
}
function back() {
var url = "/toGetWfqdzczlList";
window.open(url, "_self");
}
//新增时跳转的方法
function doAddZczl(flag) {
if ($("#ywmc").val() == "" || $("#ywmc").val() == null) {
layer.alert("业务名称必填!", "提示");
return;
}
if ($("#hbqx").val() == "" || $("#hbqx").val() == null) {
layer.alert("回报期限必填!", "提示");
return;
}
var ywlx = $("#ywlx").openCombotree("getValue");
if (ywlx == '') {
layer.alert("业务类型必填!", "提示");
return;
}
var zllx = $("#zllx").openCombotree("getValue");
if (zllx == '') {
layer.alert("指令类型必填!", "提示");
return;
}
if (zllx == "5001") {
if ($("#xgxxXxzjbh").val() == "" || $("#xgxxXxzjbh").val() == null) {
layer.alert("DNA比重信息编号不能为空!", "提示");
return; return;
} }
if($("#hbqx").val()=="" || $("#hbqx").val()==null){ if ($("#barcode").val() == "" || $("#barcode").val() == null) {
layer.alert("回报期限必填!","提示"); layer.alert("请先提取指纹比中信息或检查编号!", "提示");
return; return;
} }
var ywlx= $("#ywlx").combotree("getValue"); } else if (zllx == "6001") {
if(ywlx==''){ if ($("#xgxxXxzjbh").val() == "" || $("#xgxxXxzjbh").val() == null) {
layer.alert("业务类型必填!","提示"); layer.alert("线索转递函编号不能为空!", "提示");
return; return;
} }
var zllx= $("#zllx").combotree("getValue"); if ($("#jjrXm").val() == "" || $("#jjrXm").val() == null) {
if(zllx==''){ layer.alert("请先提取线索转递函信息或检查编号!", "提示");
layer.alert("指令类型必填!","提示");
return; return;
} }
var zljsdwdm= $("#zljsdwdm").combotree("getValue"); } else if (zllx == "6002") {
if(zljsdwdm==''){ if ($("#xgxxXxzjbh").val() == "" || $("#xgxxXxzjbh").val() == null) {
layer.alert("接受单位必填!","提示"); layer.alert("线索编号不能为空!", "提示");
return; return;
} }
//多选单位拼接单位信息 if ($("#ztry_bgbh").val() == "" || $("#ztry_bgbh").val() == null) {
var tempCount = 1; layer.alert("请先提取线索信息或检查编号!", "提示");
$("input[name='zljsdwdm']").each( return;
function(){ }
if(tempCount==1){
zljsdwdm = $(this).val(); }
}else{ if (ywlx == "0") {
zljsdwdm = zljsdwdm+','+$(this).val(); if ($("#xgxxXxzjbh").val() == "" || $("#xgxxXxzjbh").val() == null) {
} layer.alert("跨区域系列案件编号不能为空!", "提示");
tempCount++;
}
)
if($("#zlsy").val()=="" || $("#zlsy").val()==null){
layer.alert("指令事由必填!","提示");
return; return;
}if($("#gzyq").val()=="" || $("#gzyq").val()==null){ }
layer.alert("工作要求必填!","提示"); if ($("#cbmc").val() == "" || $("#cbmc").val() == null) {
layer.alert("请先提取跨区域系列案件信息或检查编号!", "提示");
return; return;
} }
}
var zljsdwdm = $("#zljsdwdm").openCombotree("getValue");
if (zljsdwdm == '') {
layer.alert("接受单位必填!", "提示");
return;
}
//多选单位拼接单位信息
var tempCount = 1;
$("input[name='zljsdwdm']").each(
function () {
if (tempCount == 1) {
zljsdwdm = $(this).val();
} else {
zljsdwdm = zljsdwdm + ',' + $(this).val();
}
tempCount++;
}
)
if ($("#zlsy").val() == "" || $("#zlsy").val() == null) {
layer.alert("指令事由必填!", "提示");
return;
}
if ($("#gzyq").val() == "" || $("#gzyq").val() == null) {
layer.alert("工作要求必填!", "提示");
return;
}
//判断指令是否重复下达
if ($("#xgxxXxzjbh").val() != null && $("#xgxxXxzjbh").val() != "") {
$.ajax({
url: "/doQueryZt",
data: {"xxzjbh": $("#xgxxXxzjbh").val(), "zllx": zllx},
type: "POST",
success: function (data) {
if (data == "1") {
layer.alert("该编号(" + $("#xgxxXxzjbh").val() + ")已经下达过侦查指令,请勿重复下达!", "提示");
return;
} else {
//判断单位是否存在联络员
$.ajax({
url: '/queryLlys?unitcodes=' + zljsdwdm + "&ywlx=" + ywlx,
type: "post",
success: function (data) {
layer.close(index);
debugger
if (data == '1') {
//存在联络员
var index = layer.load(1, {
content: '数据加载中...',
shade: [0.35, '#fff'],
success: function (layero) {
/*layero.css('padding-left', '30px');*/
layero.find('.layui-layer-content').css({
'padding-top': '40px',
'width': '70px',
'background-position-x': '16px'
});
}
});
document.zczlForm.action = "/doAddZczlxx?flag=" + flag;
document.zczlForm.submit();
} else {
//操作失败-存在单位没有联络员
layer.alert(data + "单位不存在该类型联络员,不能进行指令下发!", "提示", function (res) {
if (res) {
layer.closeAll();
}
});
}
}
});
}
}
})
} else {
//判断单位是否存在联络员 //判断单位是否存在联络员
$.ajax({ $.ajax({
url:'/queryLlys?unitcodes='+zljsdwdm, url: '/queryLlys?unitcodes=' + zljsdwdm + "&ywlx=" + ywlx,
type:"post", type: "post",
success:function (data) { success: function (data) {
layer.close(index); layer.close(index);
debugger debugger
if(data=='1'){ if (data == '1') {
//存在联络员 //存在联络员
var index = layer.load(1, { var index = layer.load(1, {
content: '数据加载中...', content: '数据加载中...',
shade: [0.35,'#fff'], shade: [0.35, '#fff'],
success: function(layero) { success: function (layero) {
/*layero.css('padding-left', '30px');*/ /*layero.css('padding-left', '30px');*/
layero.find('.layui-layer-content').css({ layero.find('.layui-layer-content').css({
'padding-top': '40px', 'padding-top': '40px',
...@@ -441,68 +1027,98 @@ ...@@ -441,68 +1027,98 @@
}); });
} }
}); });
document.zczlForm.action = "/doAddZczlxx?flag="+flag; document.zczlForm.action = "/doAddZczlxx?flag=" + flag;
document.zczlForm.submit(); document.zczlForm.submit();
}else{ } else {
//操作失败-存在单位没有联络员 //操作失败-存在单位没有联络员
layer.alert(data+"不存在联络员,不能进行指令下发!","提示",function(res){ layer.alert(data + "单位不存在该类型的联络员,不能进行指令下发!", "提示", function (res) {
if(res){ if (res) {
layer.closeAll(); layer.closeAll();
} }
}); });
} }
} }
}); });
}
}
} //修改时跳转的方法
function doEditZczl(flag) { function doEditZczl(flag) {
if($("#ywmc").val()=="" || $("#ywmc").val()==null){ if ($("#ywmc").val() == "" || $("#ywmc").val() == null) {
layer.alert("业务名称必填!","提示"); layer.alert("业务名称必填!", "提示");
return; return;
} }
if($("#hbqx").val()=="" || $("#hbqx").val()==null){ if ($("#hbqx").val() == "" || $("#hbqx").val() == null) {
layer.alert("回报期限必填!","提示"); layer.alert("回报期限必填!", "提示");
return; return;
} }
var ywlx= $("#ywlx").combotree("getValue"); var ywlx = $("#ywlx").openCombotree("getValue");
if(ywlx==''){ if (ywlx == '') {
layer.alert("业务类型必填!","提示"); layer.alert("业务类型必填!", "提示");
return; return;
} }
var zllx= $("#zllx").combotree("getValue"); var zllx = $("#zllx").openCombotree("getValue");
if(zllx==''){ if (zllx == '') {
layer.alert("指令类型必填!","提示"); layer.alert("指令类型必填!", "提示");
return; return;
} }
var zljsdwdm= $("#zljsdwdm").combotree("getValue"); var zljsdwdm = $("#zljsdwdm").openCombotree("getValue");
if(zljsdwdm==''){ if (zljsdwdm == '') {
layer.alert("接受单位必填!","提示"); layer.alert("接受单位必填!", "提示");
return; return;
} }
if($("#zlsy").val()=="" || $("#zlsy").val()==null){ if ($("#zlsy").val() == "" || $("#zlsy").val() == null) {
layer.alert("指令事由必填!","提示"); layer.alert("指令事由必填!", "提示");
return; return;
}if($("#gzyq").val()=="" || $("#gzyq").val()==null){ }
layer.alert("工作要求必填!","提示"); if ($("#gzyq").val() == "" || $("#gzyq").val() == null) {
layer.alert("工作要求必填!", "提示");
return; return;
} }
if (zllx == "5001") {
if ($("#xgxxXxzjbh").val() == "" || $("#xgxxXxzjbh").val() == null) {
layer.alert("DNA比重信息编号不能为空!", "提示");
return;
}
if ($("#barcode").val() == "" || $("#barcode").val() == null) {
layer.alert("请先提取指纹比中信息!", "提示");
return;
}
} else if (zllx == "6001") {
if ($("#xgxxXxzjbh").val() == "" || $("#xgxxXxzjbh").val() == null) {
layer.alert("线索转递函编号不能为空!", "提示");
return;
}
if ($("#jjrXm").val() == "" || $("#jjrXm").val() == null) {
layer.alert("请先提取线索转递函信息!", "提示");
return;
}
}
if (ywlx == "0") {
if ($("#xgxxXxzjbh").val() == "" || $("#xgxxXxzjbh").val() == null) {
layer.alert("跨区域系列案件编号不能为空!", "提示");
return;
}
if ($("#cbmc").val() == "" || $("#cbmc").val() == null) {
layer.alert("请先提取跨区域系列案件信息!", "提示");
return;
}
}
//判断单位是否存在联络员 //判断单位是否存在联络员
$.ajax({ $.ajax({
url:'/queryLlys?unitcodes='+zljsdwdm, url: '/queryLlys?unitcodes=' + zljsdwdm + "&ywlx=" + ywlx,
type:"post", type: "post",
success:function (data) { success: function (data) {
layer.close(index); layer.close(index);
debugger debugger
if(data=='1'){ if (data == '1') {
//存在联络员 //存在联络员
var index = layer.load(1, { var index = layer.load(1, {
content: '数据加载中...', content: '数据加载中...',
shade: [0.35,'#fff'], shade: [0.35, '#fff'],
success: function(layero) { success: function (layero) {
/*layero.css('padding-left', '30px');*/ /*layero.css('padding-left', '30px');*/
layero.find('.layui-layer-content').css({ layero.find('.layui-layer-content').css({
'padding-top': '40px', 'padding-top': '40px',
...@@ -512,12 +1128,12 @@ ...@@ -512,12 +1128,12 @@
} }
}); });
var delFjXxzjbh = $("#delFjXxzjbh").val(); var delFjXxzjbh = $("#delFjXxzjbh").val();
document.zczlForm.action = "/doEditZczlxx?flag="+flag+"&delFjXxzjbh="+delFjXxzjbh; document.zczlForm.action = "/doEditZczlxx?flag=" + flag + "&delFjXxzjbh=" + delFjXxzjbh;
document.zczlForm.submit(); document.zczlForm.submit();
}else{ } else {
//操作失败-存在单位没有联络员 //操作失败-存在单位没有联络员
layer.alert(data+"不存在联络员,不能进行指令下发!","提示",function(res){ layer.alert(data + "单位不存在该类型联络员,不能进行指令下发!", "提示", function (res) {
if(res){ if (res) {
layer.closeAll(); layer.closeAll();
} }
}); });
......
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