Commit 9b39526a by wang_jiaxing

人员核查和车辆核查部分接入真实数据,将数据源切换注解转到service层

parent 74f0c33a
...@@ -256,6 +256,22 @@ ...@@ -256,6 +256,22 @@
<artifactId>log4j-to-slf4j</artifactId> <artifactId>log4j-to-slf4j</artifactId>
<version>${log4j2.version}</version> <version>${log4j2.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>3.1.11</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>3.1.11</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>3.1.11</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -340,31 +356,4 @@ ...@@ -340,31 +356,4 @@
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>aliyun-repos</id>
<url>https://maven.aliyun.com/mvn/view</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>aliyun-repos-guide</id>
<url>https://maven.aliyun.com/mvn/guide</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>aliyun-plugin</id>
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>
...@@ -40,7 +40,6 @@ public interface AjdaDao { ...@@ -40,7 +40,6 @@ public interface AjdaDao {
List<TbXwCh> queryChListByAsjbh(TbXwCh parameterObject); List<TbXwCh> queryChListByAsjbh(TbXwCh parameterObject);
@DS("db1")
List<TbXxfwXxdl> gettbXxfwXxdlListByParam(TbXxfwXxdl parameterObject); List<TbXxfwXxdl> gettbXxfwXxdlListByParam(TbXxfwXxdl parameterObject);
int getZcrzxxCountByParam(TbXwZcrz param); int getZcrzxxCountByParam(TbXwZcrz param);
......
package org.springblade.founder.ajda.service; package org.springblade.founder.ajda.service;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springblade.founder.ajda.model.*; import org.springblade.founder.ajda.model.*;
import java.util.List; import java.util.List;
...@@ -48,6 +49,7 @@ public interface IAjdaService { ...@@ -48,6 +49,7 @@ public interface IAjdaService {
List<TbXwCh> queryChListByAsjbh(String asjbh); List<TbXwCh> queryChListByAsjbh(String asjbh);
// 获取采比反消息 // 获取采比反消息
@DS("db1")
List<TbXxfwXxdl> queryXxdlListByasjbhAndXxlx(String asjbh, String s); List<TbXxfwXxdl> queryXxdlListByasjbhAndXxlx(String asjbh, String s);
//根据参数查询分页侦查日志 //根据参数查询分页侦查日志
......
package org.springblade.founder.asj.dao; package org.springblade.founder.asj.dao;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springblade.founder.asj.entity.AsjQueryParam; import org.springblade.founder.asj.entity.AsjQueryParam;
...@@ -11,7 +10,6 @@ import java.util.List; ...@@ -11,7 +10,6 @@ import java.util.List;
@Mapper @Mapper
@Repository @Repository
@DS("xzxt_hn")
public interface HnJbAsjXsMapper { public interface HnJbAsjXsMapper {
/** /**
* getAsjbhListZjhm 获取案件编号集合 * getAsjbhListZjhm 获取案件编号集合
......
...@@ -11,7 +11,6 @@ import java.util.List; ...@@ -11,7 +11,6 @@ import java.util.List;
@Mapper @Mapper
@Repository @Repository
@DS("xzxt_qg")
public interface QgJbAsjXsMapper { public interface QgJbAsjXsMapper {
/** /**
* getAsjbhListZjhm 获取案件编号集合 * getAsjbhListZjhm 获取案件编号集合
......
...@@ -8,6 +8,5 @@ import org.springframework.stereotype.Repository; ...@@ -8,6 +8,5 @@ import org.springframework.stereotype.Repository;
@Mapper @Mapper
@Repository @Repository
@DS("xzxt_hn")
public interface TbXwKyxsHmMapper extends BaseMapper<TbXwKyxsHm> { public interface TbXwKyxsHmMapper extends BaseMapper<TbXwKyxsHm> {
} }
...@@ -8,6 +8,5 @@ import org.springframework.stereotype.Repository; ...@@ -8,6 +8,5 @@ import org.springframework.stereotype.Repository;
@Mapper @Mapper
@Repository @Repository
@DS("xzxt_hn")
public interface TbXwKyxsJdcMapper extends BaseMapper<TbXwKyxsJdc> { public interface TbXwKyxsJdcMapper extends BaseMapper<TbXwKyxsJdc> {
} }
...@@ -8,6 +8,5 @@ import org.springframework.stereotype.Repository; ...@@ -8,6 +8,5 @@ import org.springframework.stereotype.Repository;
@Mapper @Mapper
@Repository @Repository
@DS("xzxt_hn")
public interface TbXwKyxsRyMapper extends BaseMapper<TbXwKyxsRy> { public interface TbXwKyxsRyMapper extends BaseMapper<TbXwKyxsRy> {
} }
package org.springblade.founder.asj.service;
import org.springblade.founder.asj.entity.AsjQueryParam;
import org.springblade.founder.asj.entity.JbAsjXs;
import java.util.List;
public interface HnJbAsjXsService {
List<String> getAsjbhListZjhm(String zjhm);
List<String> getAsjbhListBsh(String bsh);
List<JbAsjXs> getAsjListByParam(AsjQueryParam asjQueryParam);
JbAsjXs getRyxbByZjhm(String asjbh, String zjhm);
}
package org.springblade.founder.asj.service;
import org.springblade.founder.asj.entity.AsjQueryParam;
import org.springblade.founder.asj.entity.JbAsjXs;
import java.util.List;
public interface QgJbAsjXsService {
List<String> getAsjbhListZjhm(String zjhm, List<String> qsAsjbhList);
List<String> getAsjbhListBsh(String bsh, List<String> qsAsjbhList);
List<JbAsjXs> getAsjListByParam(AsjQueryParam asjQueryParam);
}
package org.springblade.founder.asj.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springblade.founder.asj.dao.HnJbAsjXsMapper;
import org.springblade.founder.asj.entity.AsjQueryParam;
import org.springblade.founder.asj.entity.JbAsjXs;
import org.springblade.founder.asj.service.HnJbAsjXsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@DS("xzxt_hn")
public class HnJbAsjXsServiceImpl implements HnJbAsjXsService {
@Autowired
private HnJbAsjXsMapper hnJbAsjXsMapper;
@Override
public List<String> getAsjbhListZjhm(String zjhm) {
return hnJbAsjXsMapper.getAsjbhListZjhm(zjhm);
}
@Override
public List<String> getAsjbhListBsh(String bsh) {
return hnJbAsjXsMapper.getAsjbhListBsh(bsh);
}
@Override
public List<JbAsjXs> getAsjListByParam(AsjQueryParam asjQueryParam) {
return hnJbAsjXsMapper.getAsjListByParam(asjQueryParam);
}
@Override
public JbAsjXs getRyxbByZjhm(String asjbh, String zjhm) {
return hnJbAsjXsMapper.getRyxbByZjhm(asjbh, zjhm);
}
}
package org.springblade.founder.asj.service.impl; package org.springblade.founder.asj.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
...@@ -7,8 +8,10 @@ import org.apache.commons.lang.StringUtils; ...@@ -7,8 +8,10 @@ import org.apache.commons.lang.StringUtils;
import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.asj.dao.*; import org.springblade.founder.asj.dao.*;
import org.springblade.founder.asj.entity.*; import org.springblade.founder.asj.entity.*;
import org.springblade.founder.asj.service.HnJbAsjXsService;
import org.springblade.founder.asj.service.KyxsService; import org.springblade.founder.asj.service.KyxsService;
import org.springblade.founder.asj.service.QgAsjQueryService; import org.springblade.founder.asj.service.QgAsjQueryService;
import org.springblade.founder.asj.service.QgJbAsjXsService;
import org.springblade.founder.entity.QgckryBean; import org.springblade.founder.entity.QgckryBean;
import org.springblade.founder.utils.QgryckUtils; import org.springblade.founder.utils.QgryckUtils;
import org.springblade.founder.utils.SysXxzjbhService; import org.springblade.founder.utils.SysXxzjbhService;
...@@ -26,7 +29,6 @@ import java.io.ByteArrayInputStream; ...@@ -26,7 +29,6 @@ import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -34,6 +36,7 @@ import java.util.concurrent.ExecutorService; ...@@ -34,6 +36,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.FutureTask; import java.util.concurrent.FutureTask;
@Service @Service
@DS("xzxt_hn")
public class KyxsServiceImpl implements KyxsService { public class KyxsServiceImpl implements KyxsService {
@Autowired @Autowired
...@@ -45,9 +48,9 @@ public class KyxsServiceImpl implements KyxsService { ...@@ -45,9 +48,9 @@ public class KyxsServiceImpl implements KyxsService {
@Autowired @Autowired
private TbXwKyxsTxMapper tbXwKyxsTxMapper; private TbXwKyxsTxMapper tbXwKyxsTxMapper;
@Autowired @Autowired
private HnJbAsjXsMapper hnJbAsjXsMapper; private HnJbAsjXsService hnJbAsjXsService;
@Autowired @Autowired
private QgJbAsjXsMapper qgJbAsjXsMapper; private QgJbAsjXsService qgJbAsjXsService;
@Autowired @Autowired
private QgAsjQueryService qgAsjQueryService; private QgAsjQueryService qgAsjQueryService;
...@@ -134,8 +137,8 @@ public class KyxsServiceImpl implements KyxsService { ...@@ -134,8 +137,8 @@ public class KyxsServiceImpl implements KyxsService {
List<TbXwKyxsRy> ryList = tbXwKyxsRyMapper.selectList(ryQueryWrapper); List<TbXwKyxsRy> ryList = tbXwKyxsRyMapper.selectList(ryQueryWrapper);
if (ryList != null) { if (ryList != null) {
for (TbXwKyxsRy ry : ryList) { for (TbXwKyxsRy ry : ryList) {
List<String> hnAsjbhList = hnJbAsjXsMapper.getAsjbhListZjhm(ry.getKyxsryZjhm()); List<String> hnAsjbhList = hnJbAsjXsService.getAsjbhListZjhm(ry.getKyxsryZjhm());
List<String> qgAsjbhList = qgJbAsjXsMapper.getAsjbhListZjhm(ry.getKyxsryZjhm(), hnAsjbhList); List<String> qgAsjbhList = qgJbAsjXsService.getAsjbhListZjhm(ry.getKyxsryZjhm(), hnAsjbhList);
ry.setQgAsjbhList(qgAsjbhList); ry.setQgAsjbhList(qgAsjbhList);
ry.setQsAsjbhList(hnAsjbhList); ry.setQsAsjbhList(hnAsjbhList);
} }
...@@ -153,10 +156,10 @@ public class KyxsServiceImpl implements KyxsService { ...@@ -153,10 +156,10 @@ public class KyxsServiceImpl implements KyxsService {
List<TbXwKyxsHm> hmList = tbXwKyxsHmMapper.selectList(hmQueryWrapper); List<TbXwKyxsHm> hmList = tbXwKyxsHmMapper.selectList(hmQueryWrapper);
if (hmList != null) { if (hmList != null) {
for (TbXwKyxsHm hm : hmList) { for (TbXwKyxsHm hm : hmList) {
List<String> hnAsjbhList = hnJbAsjXsMapper.getAsjbhListBsh(hm.getKyxshmYdhm()); List<String> hnAsjbhList = hnJbAsjXsService.getAsjbhListBsh(hm.getKyxshmYdhm());
hm.setQsAsjbhList(hnAsjbhList); hm.setQsAsjbhList(hnAsjbhList);
//本地测试 //本地测试
List<String> qgAsjbhList = qgJbAsjXsMapper.getAsjbhListBsh(hm.getKyxshmYdhm(), hnAsjbhList); List<String> qgAsjbhList = qgJbAsjXsService.getAsjbhListBsh(hm.getKyxshmYdhm(), hnAsjbhList);
hm.setQgAsjbhList(qgAsjbhList); hm.setQgAsjbhList(qgAsjbhList);
//公安网使用 //公安网使用
// List<TbXszCbypQgaj> qgajList = qgAsjQueryService.getQgAsjByBsh(hm.getKyxshmYdhm()); // List<TbXszCbypQgaj> qgajList = qgAsjQueryService.getQgAsjByBsh(hm.getKyxshmYdhm());
...@@ -184,10 +187,10 @@ public class KyxsServiceImpl implements KyxsService { ...@@ -184,10 +187,10 @@ public class KyxsServiceImpl implements KyxsService {
List<TbXwKyxsJdc> jdcList = tbXwKyxsJdcMapper.selectList(jdcQueryWrapper); List<TbXwKyxsJdc> jdcList = tbXwKyxsJdcMapper.selectList(jdcQueryWrapper);
if (jdcList != null) { if (jdcList != null) {
for (TbXwKyxsJdc jdc : jdcList) { for (TbXwKyxsJdc jdc : jdcList) {
List<String> hnAsjbhList = hnJbAsjXsMapper.getAsjbhListBsh(jdc.getKyxsjdcCphm()); List<String> hnAsjbhList = hnJbAsjXsService.getAsjbhListBsh(jdc.getKyxsjdcCphm());
jdc.setQsAsjbhList(hnAsjbhList); jdc.setQsAsjbhList(hnAsjbhList);
//本地测试 //本地测试
List<String> qgAsjbhList = qgJbAsjXsMapper.getAsjbhListBsh(jdc.getKyxsjdcCphm(), hnAsjbhList); List<String> qgAsjbhList = qgJbAsjXsService.getAsjbhListBsh(jdc.getKyxsjdcCphm(), hnAsjbhList);
jdc.setQgAsjbhList(qgAsjbhList); jdc.setQgAsjbhList(qgAsjbhList);
//公安网使用 //公安网使用
// List<TbXszCbypQgaj> qgajList = qgAsjQueryService.getQgAsjByBsh(jdc.getKyxsjdcCphm()); // List<TbXszCbypQgaj> qgajList = qgAsjQueryService.getQgAsjByBsh(jdc.getKyxsjdcCphm());
...@@ -273,8 +276,8 @@ public class KyxsServiceImpl implements KyxsService { ...@@ -273,8 +276,8 @@ public class KyxsServiceImpl implements KyxsService {
QgckryBean qgry = qgryckUtils.getQgckAllxxXml(tbXwKyxsRy.getKyxsryZjhm()); QgckryBean qgry = qgryckUtils.getQgckAllxxXml(tbXwKyxsRy.getKyxsryZjhm());
tbXwKyxsRy.setJbxx(qgry); tbXwKyxsRy.setJbxx(qgry);
} }
hnAsjbhList = hnJbAsjXsMapper.getAsjbhListZjhm(tbXwKyxsRy.getKyxsryZjhm()); hnAsjbhList = hnJbAsjXsService.getAsjbhListZjhm(tbXwKyxsRy.getKyxsryZjhm());
qgAsjbhList = qgJbAsjXsMapper.getAsjbhListZjhm(tbXwKyxsRy.getKyxsryZjhm(), hnAsjbhList); qgAsjbhList = qgJbAsjXsService.getAsjbhListZjhm(tbXwKyxsRy.getKyxsryZjhm(), hnAsjbhList);
tbXwKyxsRy.setQgAsjbhList(qgAsjbhList); tbXwKyxsRy.setQgAsjbhList(qgAsjbhList);
tbXwKyxsRy.setQsAsjbhList(hnAsjbhList); tbXwKyxsRy.setQsAsjbhList(hnAsjbhList);
return tbXwKyxsRy; return tbXwKyxsRy;
...@@ -283,8 +286,8 @@ public class KyxsServiceImpl implements KyxsService { ...@@ -283,8 +286,8 @@ public class KyxsServiceImpl implements KyxsService {
kyxsHm.setXxzjbh(xxzjbh); kyxsHm.setXxzjbh(xxzjbh);
kyxsHm.setXxscPdbz("0"); kyxsHm.setXxscPdbz("0");
TbXwKyxsHm tbXwKyxsHm = tbXwKyxsHmMapper.selectOne(new QueryWrapper<>(kyxsHm)); TbXwKyxsHm tbXwKyxsHm = tbXwKyxsHmMapper.selectOne(new QueryWrapper<>(kyxsHm));
hnAsjbhList = hnJbAsjXsMapper.getAsjbhListBsh(tbXwKyxsHm.getKyxshmYdhm()); hnAsjbhList = hnJbAsjXsService.getAsjbhListBsh(tbXwKyxsHm.getKyxshmYdhm());
qgAsjbhList = qgJbAsjXsMapper.getAsjbhListBsh(tbXwKyxsHm.getKyxshmYdhm(), hnAsjbhList); qgAsjbhList = qgJbAsjXsService.getAsjbhListBsh(tbXwKyxsHm.getKyxshmYdhm(), hnAsjbhList);
tbXwKyxsHm.setQgAsjbhList(qgAsjbhList); tbXwKyxsHm.setQgAsjbhList(qgAsjbhList);
tbXwKyxsHm.setQsAsjbhList(hnAsjbhList); tbXwKyxsHm.setQsAsjbhList(hnAsjbhList);
return tbXwKyxsHm; return tbXwKyxsHm;
...@@ -293,8 +296,8 @@ public class KyxsServiceImpl implements KyxsService { ...@@ -293,8 +296,8 @@ public class KyxsServiceImpl implements KyxsService {
kyxsJdc.setXxzjbh(xxzjbh); kyxsJdc.setXxzjbh(xxzjbh);
kyxsJdc.setXxscPdbz("0"); kyxsJdc.setXxscPdbz("0");
TbXwKyxsJdc tbXwKyxsJdc = tbXwKyxsJdcMapper.selectOne(new QueryWrapper<>(kyxsJdc)); TbXwKyxsJdc tbXwKyxsJdc = tbXwKyxsJdcMapper.selectOne(new QueryWrapper<>(kyxsJdc));
hnAsjbhList = hnJbAsjXsMapper.getAsjbhListBsh(tbXwKyxsJdc.getKyxsjdcCphm()); hnAsjbhList = hnJbAsjXsService.getAsjbhListBsh(tbXwKyxsJdc.getKyxsjdcCphm());
qgAsjbhList = qgJbAsjXsMapper.getAsjbhListBsh(tbXwKyxsJdc.getKyxsjdcCphm(), hnAsjbhList); qgAsjbhList = qgJbAsjXsService.getAsjbhListBsh(tbXwKyxsJdc.getKyxsjdcCphm(), hnAsjbhList);
tbXwKyxsJdc.setQgAsjbhList(qgAsjbhList); tbXwKyxsJdc.setQgAsjbhList(qgAsjbhList);
tbXwKyxsJdc.setQsAsjbhList(hnAsjbhList); tbXwKyxsJdc.setQsAsjbhList(hnAsjbhList);
return tbXwKyxsJdc; return tbXwKyxsJdc;
...@@ -309,16 +312,16 @@ public class KyxsServiceImpl implements KyxsService { ...@@ -309,16 +312,16 @@ public class KyxsServiceImpl implements KyxsService {
public Map<String, Object> getAsjListByAsjbhs(AsjQueryParam asjQueryParam) { public Map<String, Object> getAsjListByAsjbhs(AsjQueryParam asjQueryParam) {
Utils.setPageParams(asjQueryParam); Utils.setPageParams(asjQueryParam);
if ("qg".equals(asjQueryParam.getType())) { if ("qg".equals(asjQueryParam.getType())) {
List<JbAsjXs> rows = qgJbAsjXsMapper.getAsjListByParam(asjQueryParam); List<JbAsjXs> rows = qgJbAsjXsService.getAsjListByParam(asjQueryParam);
HashMap<String, Object> resultMap = new HashMap<>(); HashMap<String, Object> resultMap = new HashMap<>();
resultMap.put("rows", rows); resultMap.put("rows", rows);
resultMap.put("total", asjQueryParam.getAsjbhList().size()); resultMap.put("total", asjQueryParam.getAsjbhList().size());
return resultMap; return resultMap;
} else { } else {
List<JbAsjXs> rows = hnJbAsjXsMapper.getAsjListByParam(asjQueryParam); List<JbAsjXs> rows = hnJbAsjXsService.getAsjListByParam(asjQueryParam);
if (StringUtils.isNotEmpty(asjQueryParam.getZjhm())) { if (StringUtils.isNotEmpty(asjQueryParam.getZjhm())) {
for (JbAsjXs jbasj : rows) { for (JbAsjXs jbasj : rows) {
JbAsjXs ry = hnJbAsjXsMapper.getRyxbByZjhm(jbasj.getAsjbh(), asjQueryParam.getZjhm()); JbAsjXs ry = hnJbAsjXsService.getRyxbByZjhm(jbasj.getAsjbh(), asjQueryParam.getZjhm());
jbasj.setJzxyrbh(ry.getJzxyrbh()); jbasj.setJzxyrbh(ry.getJzxyrbh());
jbasj.setZhrq(ry.getZhrq()); jbasj.setZhrq(ry.getZhrq());
jbasj.setRydazt(ry.getRydazt()); jbasj.setRydazt(ry.getRydazt());
......
package org.springblade.founder.asj.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springblade.founder.asj.dao.QgJbAsjXsMapper;
import org.springblade.founder.asj.entity.AsjQueryParam;
import org.springblade.founder.asj.entity.JbAsjXs;
import org.springblade.founder.asj.service.QgJbAsjXsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@DS("xzxt_qg")
public class QgJbAsjXsServiceImpl implements QgJbAsjXsService {
@Autowired
private QgJbAsjXsMapper qgJbAsjXsMapper;
@Override
public List<String> getAsjbhListZjhm(String zjhm, List<String> qsAsjbhList) {
return qgJbAsjXsMapper.getAsjbhListZjhm(zjhm, qsAsjbhList);
}
@Override
public List<String> getAsjbhListBsh(String bsh, List<String> qsAsjbhList) {
return qgJbAsjXsMapper.getAsjbhListBsh(bsh, qsAsjbhList);
}
@Override
public List<JbAsjXs> getAsjListByParam(AsjQueryParam asjQueryParam) {
return qgJbAsjXsMapper.getAsjListByParam(asjQueryParam);
}
}
...@@ -3,20 +3,17 @@ package org.springblade.founder.dzbl.service.impl; ...@@ -3,20 +3,17 @@ package org.springblade.founder.dzbl.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.asj.dao.HnJbAsjXsMapper; import org.springblade.founder.asj.service.HnJbAsjXsService;
import org.springblade.founder.asj.dao.QgJbAsjXsMapper; import org.springblade.founder.asj.service.QgJbAsjXsService;
import org.springblade.founder.dzbl.entity.TbStAppDzbl; import org.springblade.founder.dzbl.entity.TbStAppDzbl;
import org.springblade.founder.dzbl.entity.TbStAppDzblBsh; import org.springblade.founder.dzbl.entity.TbStAppDzblBsh;
import org.springblade.founder.dzbl.entity.ZcyEntity; import org.springblade.founder.dzbl.entity.ZcyEntity;
import org.springblade.founder.dzbl.mapper.TbStAppDzblBshMapper; import org.springblade.founder.dzbl.mapper.TbStAppDzblBshMapper;
import org.springblade.founder.dzbl.mapper.TbStAppDzblMapper; import org.springblade.founder.dzbl.mapper.TbStAppDzblMapper;
import org.springblade.founder.dzbl.service.TbStAppDzblService; import org.springblade.founder.dzbl.service.TbStAppDzblService;
import org.springblade.founder.ryythcj.service.TbStAppRyxxService;
import org.springblade.founder.utils.SysXxzjbhService; import org.springblade.founder.utils.SysXxzjbhService;
import org.springblade.founder.utils.Utils; import org.springblade.founder.utils.Utils;
import org.springblade.founder.utils.mapper.UnitcodeUnitMapper;
import org.springblade.founder.utils.service.UnitcodeUnitService; import org.springblade.founder.utils.service.UnitcodeUnitService;
import org.springblade.founder.utils.service.impl.UnitcodeUnitServiceImpl;
import org.springblade.modules.system.entity.XzxtUser; import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -38,9 +35,9 @@ public class TbStAppDzblServiceImpl implements TbStAppDzblService { ...@@ -38,9 +35,9 @@ public class TbStAppDzblServiceImpl implements TbStAppDzblService {
@Autowired @Autowired
private HnJbAsjXsMapper hnJbAsjXsMapper; private HnJbAsjXsService hnJbAsjXsService;
@Autowired @Autowired
private QgJbAsjXsMapper qgJbAsjXsMapper; private QgJbAsjXsService qgJbAsjXsService;
@Autowired @Autowired
private SysXxzjbhService xxzjbhService; private SysXxzjbhService xxzjbhService;
...@@ -91,8 +88,8 @@ public class TbStAppDzblServiceImpl implements TbStAppDzblService { ...@@ -91,8 +88,8 @@ public class TbStAppDzblServiceImpl implements TbStAppDzblService {
@Override @Override
public TbStAppDzbl getDzblByXxzjbh(String xxzjbh) { public TbStAppDzbl getDzblByXxzjbh(String xxzjbh) {
TbStAppDzbl dzbl = tbStAppDzblMapper.selectByxxzjbh(xxzjbh); TbStAppDzbl dzbl = tbStAppDzblMapper.selectByxxzjbh(xxzjbh);
List<String> hnAsjbhList = hnJbAsjXsMapper.getAsjbhListZjhm(dzbl.getSfzh()); List<String> hnAsjbhList = hnJbAsjXsService.getAsjbhListZjhm(dzbl.getSfzh());
List<String> qgAsjbhList = qgJbAsjXsMapper.getAsjbhListZjhm(dzbl.getSfzh(), hnAsjbhList); List<String> qgAsjbhList = qgJbAsjXsService.getAsjbhListZjhm(dzbl.getSfzh(), hnAsjbhList);
dzbl.setQsAjList(hnAsjbhList); dzbl.setQsAjList(hnAsjbhList);
dzbl.setQsAjCount(hnAsjbhList.size()); dzbl.setQsAjCount(hnAsjbhList.size());
dzbl.setQgAjList(qgAsjbhList); dzbl.setQgAjList(qgAsjbhList);
......
...@@ -2,8 +2,8 @@ package org.springblade.founder.qgccj.service.impl; ...@@ -2,8 +2,8 @@ package org.springblade.founder.qgccj.service.impl;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.asj.dao.HnJbAsjXsMapper; import org.springblade.founder.asj.service.HnJbAsjXsService;
import org.springblade.founder.asj.dao.QgJbAsjXsMapper; import org.springblade.founder.asj.service.QgJbAsjXsService;
import org.springblade.founder.bzptbz.service.SysDictitemService; import org.springblade.founder.bzptbz.service.SysDictitemService;
import org.springblade.founder.qgccj.VO.UserVO; import org.springblade.founder.qgccj.VO.UserVO;
import org.springblade.founder.qgccj.entity.TbGlAsjRyQgccj; import org.springblade.founder.qgccj.entity.TbGlAsjRyQgccj;
...@@ -14,7 +14,6 @@ import org.springblade.founder.qgccj.service.TbGlAsjRyService; ...@@ -14,7 +14,6 @@ import org.springblade.founder.qgccj.service.TbGlAsjRyService;
import org.springblade.founder.qgccj.service.TbStRyService; import org.springblade.founder.qgccj.service.TbStRyService;
import org.springblade.founder.qgccj.service.TbXwZbfzxyrQgccjService; import org.springblade.founder.qgccj.service.TbXwZbfzxyrQgccjService;
import org.springblade.founder.qgccj.util.BeanCopyUtil; import org.springblade.founder.qgccj.util.BeanCopyUtil;
import org.springblade.founder.socketio.entity.TbFwXxdl;
import org.springblade.founder.socketio.entity.TbXxfwXxdl; import org.springblade.founder.socketio.entity.TbXxfwXxdl;
import org.springblade.founder.socketio.service.IMessageService; import org.springblade.founder.socketio.service.IMessageService;
import org.springblade.founder.utils.SysXxzjbhService; import org.springblade.founder.utils.SysXxzjbhService;
...@@ -50,9 +49,9 @@ public class TbXwZbfzxyrServiceQgccjImpl implements TbXwZbfzxyrQgccjService { ...@@ -50,9 +49,9 @@ public class TbXwZbfzxyrServiceQgccjImpl implements TbXwZbfzxyrQgccjService {
@Autowired @Autowired
private IMessageService messageService; private IMessageService messageService;
@Autowired @Autowired
private HnJbAsjXsMapper hnJbAsjXsMapper; private HnJbAsjXsService hnJbAsjXsService;
@Autowired @Autowired
private QgJbAsjXsMapper qgJbAsjXsMapper; private QgJbAsjXsService qgJbAsjXsService;
/** /**
* 通过ID查询单条数据 * 通过ID查询单条数据
...@@ -138,8 +137,8 @@ public class TbXwZbfzxyrServiceQgccjImpl implements TbXwZbfzxyrQgccjService { ...@@ -138,8 +137,8 @@ public class TbXwZbfzxyrServiceQgccjImpl implements TbXwZbfzxyrQgccjService {
} }
private TbXxfwXxdl getXyrLbfXxdl(String xm, String sfzh, String asjbh) { private TbXxfwXxdl getXyrLbfXxdl(String xm, String sfzh, String asjbh) {
List<String> hnAsjbhList = hnJbAsjXsMapper.getAsjbhListZjhm(sfzh); List<String> hnAsjbhList = hnJbAsjXsService.getAsjbhListZjhm(sfzh);
List<String> qgAsjbhList = qgJbAsjXsMapper.getAsjbhListZjhm(sfzh, hnAsjbhList); List<String> qgAsjbhList = qgJbAsjXsService.getAsjbhListZjhm(sfzh, hnAsjbhList);
hnAsjbhList.remove(asjbh); hnAsjbhList.remove(asjbh);
qgAsjbhList.remove(asjbh); qgAsjbhList.remove(asjbh);
if (hnAsjbhList.size() == 0 && qgAsjbhList.size() == 0) { if (hnAsjbhList.size() == 0 && qgAsjbhList.size() == 0) {
......
...@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springblade.core.secure.utils.SecureUtil; import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.founder.asj.dao.HnJbAsjXsMapper; import org.springblade.founder.asj.service.HnJbAsjXsService;
import org.springblade.founder.asj.dao.QgJbAsjXsMapper; import org.springblade.founder.asj.service.QgJbAsjXsService;
import org.springblade.founder.entity.QgckryBean; import org.springblade.founder.entity.QgckryBean;
import org.springblade.founder.ryythcj.entity.TbStAppRyxx; import org.springblade.founder.ryythcj.entity.TbStAppRyxx;
import org.springblade.founder.ryythcj.entity.TbStAppRyzpfj; import org.springblade.founder.ryythcj.entity.TbStAppRyzpfj;
...@@ -36,9 +36,9 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService { ...@@ -36,9 +36,9 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService {
@Autowired @Autowired
private TbStAppRyzpfjMapper tbStAppRyzpfjMapper; private TbStAppRyzpfjMapper tbStAppRyzpfjMapper;
@Autowired @Autowired
private HnJbAsjXsMapper hnJbAsjXsMapper; private HnJbAsjXsService hnJbAsjXsService;
@Autowired @Autowired
private QgJbAsjXsMapper qgJbAsjXsMapper; private QgJbAsjXsService qgJbAsjXsService;
@Autowired @Autowired
private SysXxzjbhService xxzjbhService; private SysXxzjbhService xxzjbhService;
...@@ -117,8 +117,8 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService { ...@@ -117,8 +117,8 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService {
@Override @Override
public TbStAppRyxx getYrxxByXxzjbh(String xxzjbh) { public TbStAppRyxx getYrxxByXxzjbh(String xxzjbh) {
TbStAppRyxx ryxx = tbStAppRyxxMapper.selectByXxzjbh(xxzjbh); TbStAppRyxx ryxx = tbStAppRyxxMapper.selectByXxzjbh(xxzjbh);
List<String> hnAsjbhList = hnJbAsjXsMapper.getAsjbhListZjhm(ryxx.getZjhm()); List<String> hnAsjbhList = hnJbAsjXsService.getAsjbhListZjhm(ryxx.getZjhm());
List<String> qgAsjbhList = qgJbAsjXsMapper.getAsjbhListZjhm(ryxx.getZjhm(), hnAsjbhList); List<String> qgAsjbhList = qgJbAsjXsService.getAsjbhListZjhm(ryxx.getZjhm(), hnAsjbhList);
ryxx.setQsAsjbhList(hnAsjbhList); ryxx.setQsAsjbhList(hnAsjbhList);
ryxx.setQgAsjbhList(qgAsjbhList); ryxx.setQgAsjbhList(qgAsjbhList);
return ryxx; return ryxx;
...@@ -159,22 +159,16 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService { ...@@ -159,22 +159,16 @@ public class TbStAppRyxxServiceImpl implements TbStAppRyxxService {
@Override @Override
public TbStAppRyxx tqQgryxx(String zjhm) throws ParseException { public TbStAppRyxx tqQgryxx(String zjhm) throws ParseException {
if(StringUtils.isNotEmpty(zjhm)){ if(StringUtils.isNotEmpty(zjhm)){
QueryWrapper<TbStAppRyxx> queryWrapper = new QueryWrapper<>(); if (zjhm.equals("150105********7822")){
queryWrapper.eq("xxsc_pdbz", "0"); QgckryBean qgckryBean = new QgckryBean();
queryWrapper.eq("sfzh", zjhm); qgckryBean.setXm("测试人员");
TbStAppRyxx one = tbStAppRyxxMapper.selectOne(queryWrapper); qgckryBean.setXb("1");
if (one != null && StringUtils.isNotEmpty(one.getXxzjbh())){ qgckryBean.setMz("01");
QueryWrapper<TbStAppRyzpfj> ryzpfjQueryWrapper = new QueryWrapper<>(); qgckryBean.setCsrq("2000-01-01");
ryzpfjQueryWrapper.eq("xxsc_pdbz", "0"); qgckryBean.setZzxz("内蒙古呼和浩特市");
ryzpfjQueryWrapper.eq("glxx_xxzjbh", one.getXxzjbh()); qgckryBean.setSfzh("150105********7822");
List<TbStAppRyzpfj> zpList = tbStAppRyzpfjMapper.selectList(ryzpfjQueryWrapper); qgckryBean.setXp("data:image/png;base64,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");
for (TbStAppRyzpfj ryzpfj : zpList) { return new TbStAppRyxx(qgckryBean);
if ("3".equals(ryzpfj.getZplx())){
one.setZp(ryzpfj.getZpDzwjnr());
}
}
one.setZpList(zpList);
return one;
} }
QgryckUtils qgryckUtils = new QgryckUtils(); QgryckUtils qgryckUtils = new QgryckUtils();
QgckryBean qgry = qgryckUtils.getQgckAllxxXml(zjhm); QgckryBean qgry = qgryckUtils.getQgckAllxxXml(zjhm);
......
...@@ -13,18 +13,17 @@ import java.util.List; ...@@ -13,18 +13,17 @@ import java.util.List;
@Mapper @Mapper
public interface MessgeMapper { public interface MessgeMapper {
@DS("xzxt_hn")
List<SysNewUser> getUsers(SysNewUser param); List<SysNewUser> getUsers(SysNewUser param);
@DS("db1")
int messageInsert(TbXxfwXxdl tbXxfwXxdl); int messageInsert(TbXxfwXxdl tbXxfwXxdl);
@DS("db1")
int getXxWdTotalCount(TbXxfwXxdl tbXxfwXxdl); int getXxWdTotalCount(TbXxfwXxdl tbXxfwXxdl);
@DS("db1")
List<TbXxfwXxdl> getXxWdlList(TbXxfwXxdl tbXxfwXxdl); List<TbXxfwXxdl> getXxWdlList(TbXxfwXxdl tbXxfwXxdl);
@DS("db1")
int updateXxztById(String xxid); int updateXxztById(String xxid);
@DS("db1")
int updateXxztAll(TbXxfwXxdl tbXxfwXxdl); int updateXxztAll(TbXxfwXxdl tbXxfwXxdl);
@DS("db1")
TbXxfwXxdl getXxById(String xxid); TbXxfwXxdl getXxById(String xxid);
} }
...@@ -119,4 +119,32 @@ public class DateUtil { ...@@ -119,4 +119,32 @@ public class DateUtil {
Date time=cal.getTime(); Date time=cal.getTime();
return new SimpleDateFormat("yyyy-MM-dd").format(time)+" 00:00:00"; return new SimpleDateFormat("yyyy-MM-dd").format(time)+" 00:00:00";
} }
public static String format(Date date, String pattern) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat(pattern);
return sdf.format(date);
}
public static String patternDateToNewPatternDate(String dateStr, String pattern, String newPattern) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat(pattern);
Date parse = sdf.parse(dateStr);
sdf.applyPattern(newPattern);
return sdf.format(parse);
}
public static String getSj(String dateStr) throws ParseException {
String sj = null;
switch (dateStr.length()){
case 8:
sj = DateUtil.patternDateToNewPatternDate(dateStr, "yyyyMMdd", "yyyy-MM-dd");
break;
case 12:
sj = DateUtil.patternDateToNewPatternDate(dateStr, "yyyyMMddHHmm", "yyyy-MM-dd HH:mm");
break;
case 14:
sj = DateUtil.patternDateToNewPatternDate(dateStr, "yyyyMMddHHmmss", "yyyy-MM-dd HH:mm:ss");
break;
}
return sj;
}
} }
package org.springblade.founder.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.cxf.jaxrs.client.WebClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 科信接口查询工具类
*/
@Slf4j
@Service
public class KtInterfaceUtils {
public static final String SYRK = "00445";//实有人口信息查询
public static final String ZZRK = "00446";//暂住人口信息查询
public static final String BZDZ = "00447";//标准地址信息查询
public static final String SYDW = "00448";//实有单位信息查询
public static final String WBSWRY = "00449";//网吧上网人员信息查询
public static final String RYSWXX = "00450";//人员上网吧信息查询
public static final String LDZSRY = "00451";//旅店住宿人员信息查询
public static final String RYZDXX = "00452";//人员旅店住宿人员信息查询
public static final String LZZSRY = "00453";//旅租住宿人员信息查询
public static final String HBCX = "00454";//航班出行查询
public static final String HBDP = "00455";//航班订票查询
public static final String HCDP = "00456";//火车订票查询
public static final String GKCX = "00457";//港口出行查询
public static final String KYCX = "00458";//客运出行查询
public static final String CPCX = "00459";//车牌查车主查询
public static final String RCCL = "00460";//人查车辆查询
public static final String CLWZ_JDSCFXX = "00461";//车辆违章信息(决定书处罚信息)查询
public static final String FLWZ_FXCXX = "00462";//车辆违章信息(非现场记录信息)查询
public static final String CLJGKKXX = "00463";//车辆经过卡口过车信息查询
public static final String CLJGKKZHGCXX = "00464";//车辆经卡口最后过车信息查询
public static final String KKXX = "00465";//卡口编号过车信息查询
public static final String THGX_SFZH = "00466";//身份证号码返同户关系信息查询
public static final String THGX_HH = "00467";//户号返同户关系信息查询
public static final String HYGX = "00468";//婚姻关系查询
private static String ktUrl;
@Value("${ktUrl}")
private void setKtUrl(String ktUrl) {
KtInterfaceUtils.ktUrl = ktUrl;
}
public static String getDateByJsonParam(String pathNum, String param) {
try {
System.out.println(param);
WebClient client = WebClient.create(ktUrl); //请求地址
client.header("apikey", "AZNB46000000000000032"); //刑总三期APIKEY
client.accept(String.valueOf(MediaType.APPLICATION_JSON)).path("S-460000000000-ZNB-22-" + pathNum).query("param", param);
String rets = client.get(String.class);
System.out.println(rets);
client.close();
return rets;
} catch (Exception e) {
JSONObject json = new JSONObject();
json.put("result", "fail");
json.put("errorcode", "201");
json.put("errordescription", e.getMessage());
return json.toString();
}
}
public static List<Map<String, String>> getMapByJson(String json) throws Exception {
List<Map<String, String>> resultList = new ArrayList<>();
JSONObject jsonObject = JSON.parseObject(json);
Object result = jsonObject.get("result");
if ("fail".equals(result.toString())) {
throw new Exception(jsonObject.get("errordescription").toString());
}
JSONArray datas = jsonObject.getJSONArray("datas");
JSONArray fields = jsonObject.getJSONArray("fields");
if (datas == null || datas.size() == 0) {
return null;
}
for (int i = 0; i < datas.size(); i++) {
JSONArray data = datas.getJSONArray(i);
HashMap<String, String> resultMap = new HashMap<>();
for (int j = 0; j < fields.size(); j++) {
resultMap.put(fields.get(j).toString(), data.get(j).toString());
}
resultList.add(resultMap);
}
return resultList;
}
}
package org.springblade.founder.ydjwhc.entity;
import lombok.Data;
import java.util.Map;
@Data
public class Cpxx {
private String cphm;//车牌号码
private String clys;//车辆颜色
private String clysdm;//车辆颜色代码
private String cllx;//车辆类型
private String clpp;//车辆品牌
private String clzt;//车辆状态代码
private String clztdm;//车辆状态
private String hpzl;//号牌种类
private String syxz;//使用性质
private String gcjkfl;//国产进口
public Cpxx(Map<String, String> map) {
this.cphm = map.get("JDCHPHM");
this.clpp = map.get("ZWPPMC");
this.cllx = map.get("DIC_JDCCLLXDM");
this.hpzl = map.get("DIC_JDCHPZLDM");
this.syxz = map.get("DICJDCSYXZDM");
this.gcjkfl = map.get("DIC_JDCGCJKFLDM");
this.clztdm = map.get("JDCZTDM");
this.clzt= map.get("DIC_JDCZTDM");
this.clysdm = map.get("JDCCSYSDM");
this.clys = map.get("DIC_JDCCSYSDM");
}
public Cpxx() {
}
}
package org.springblade.founder.ydjwhc.entity; package org.springblade.founder.ydjwhc.entity;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang.StringUtils;
import org.springblade.founder.entity.QgckryBean; import org.springblade.founder.entity.QgckryBean;
import java.util.HashMap; import java.util.Map;
@Data @Data
public class RySmxx { public class RySmxx {
private String xm; private String xm;//姓名
private String xb; private String xb;//性别代码
private String xbStr; private String xbStr;//性别
private String mz; private String mz;//民族代码
private String mzStr; private String mzStr;//民族
private String csrq; private String csrq;//出生日期
private String zz; private String zz;//住址
private String sfzh; private String sfzh;//身份证号
private String zp; private String zp;//照片
private String sjhm; private String sjhm;//手机号码
private String zt;
private String cphm;
private String clys;
private String cllx;//CODE_CLLX
private String clpp;
private String clzt;
public RySmxx() { public RySmxx() {
} }
public RySmxx(HashMap<String, String> map, QgckryBean qgry) { public RySmxx(QgckryBean qgry) {
if (qgry != null) { if (qgry != null) {
this.xm = qgry.getXm(); this.xm = qgry.getXm();
this.xb = qgry.getXb(); this.xb = qgry.getXb();
...@@ -44,14 +38,9 @@ public class RySmxx { ...@@ -44,14 +38,9 @@ public class RySmxx {
this.mz = "01"; this.mz = "01";
this.csrq = "2000-01-01"; this.csrq = "2000-01-01";
this.zz = "内蒙古呼和浩特市"; this.zz = "内蒙古呼和浩特市";
this.sfzh = map.get(""); this.sfzh = "150105********7822";
this.zp = null; this.zp = "data:image/png;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAkGBwgHBgkIBwgKCgkLDRYPDQwMDRsUFRAWIB0iIiAdHx8kKDQsJCYxJx8fLT0tMTU3Ojo6Iys/RD84QzQ5Ojf/2wBDAQoKCg0MDRoPDxo3JR8lNzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzf/wAARCAC5AJYDASIAAhEBAxEB/8QAHAAAAQUBAQEAAAAAAAAAAAAAAAMEBQYHAgEI/8QAPBAAAQMDAgQDBgQEBAcAAAAAAQACAwQFESExBhJBURMicQcUMkJhgZGhscEVM0PRUnLh8CMkJTRTc3T/xAAZAQEAAwEBAAAAAAAAAAAAAAAAAQMEAgX/xAAfEQEBAAICAwEBAQAAAAAAAAAAAQIRAyESMUETUUL/2gAMAwEAAhEDEQA/ANxQhCAQhCAQhMrvdaKz0bqq4TNiibpk9Sgek43UZcOILTbgDV18DM5wOcE6eix7jH2qVNeJaW1B0FOTgP2cQs0qrjLM8l8jna9TuidPpCt9o/DdLE6T3wykH4Y25JUQ/wBsFiBHLT1Dvrovnx1Q54IJOOyS5nDXJ7onUfS9N7UeGpzgzTR6kZdH/Yqy26/Wu5Rh9HXQSAjOjgCvkdk7mjc/Qp9SXOeBwMMrmafKcIjUfXbXBzQ5pBB1BHVerA+EvadXUVWyO4PMtOSGBrjo0aft+i2yz3mhvNKKi3ztlYTg43BQsSCEIRAQhCAQhCAQhCAQhCCOvt4pbHb5K2tdiNuwG5P0XztxtxjX8RVcolmPuzXHw4m7NH+8K7e3K8MMtPbopnc0YzJHjQZ2KySngfPIQ1p17KLXchu7mfowFKMopHFuh11BVqtvDbnxB0mhVhorJTQNHM3ONVVlyyLseG1RaeyPc0uLSRjsnEViEnMwPA06/otEZTwgYETfwXbaWnH9FuT9FX+yz8GWVFokY0+Ugg4OUyfb548+U6dMLXJLZA7IwQM53UfLZYSQeXOOpUzmc3gZaWSM6bKx8GcVVPDt2gqGPcYgcSN/xN6hTF04fa9pdG0cx1yAqdX0UlLKQRsVbjnKqz47i+srPcqe7W6CtpXh0crQdDnB6hPVjPsM4jDJJrJUyHEnngB2B6hbMrFVmghCEQEIQgEIQgF4TgEr1Mr1P7tZ66caGOB7h9mlB84e0K4m8cVVswwWNkLG47DRSHCNoYYjPK3XoFB09O6qrHvIyXOySr9aoxDTNZjGFTyZdaauLHvZy1jQAGjASrIHPOyIxzHZSNOwADmwst7aoatpTtghK+6noPyUo2NpGmiUEYxjCjRtEGnONk2lgI3U7IGtaSQEwnc1w0Ca0RElg2IyFVeKbWHO8Rg0dv6q4TNwoq6R+LEWn7LvDLVc5zcUXhurlsnEFHWMyBHK0n6jOq+poZGyxMkYcte0OHoV8y19Ly5cBqNV9C8IVBquGbbM45Lqduc/QYWzG7YeTHSYQhC6VhCEIBCEIBRHFxxwxdP/AJnj8lLqG4waXcMXIN38Aome2H2elDAHkaqz07MtGAo+0QB7WNA33U25rYsAYx1J6LLm24enrGdk8hYeyjBdIWuIiaZMdRsnkV9giwZ6WUM6vaM4VfhVnnEmzIGADp3S4ceVFFV0NcwPppMj0wnnhRj6qfGnkjZmuOmN/omM0D/sn9zucFAwnwnSv6Nb1UIbtcqjaiZE07DVxTwPJ7IwjIcmk8Rc3uuZ6mujcS6Jzx1HKUvTTNlbzBpGd2uGoUeOje1ZudMADgELV/ZlK6Xg+ka/eIuZt0B/1VCvMAEXMButA9nEJh4Wgz873uH44/ZaOJl5ppaEIQrmcIQhAIQhAJrdacVdtqqcj+ZE5v4hOlXeI+In2ydsFNGySQjLg/P4aKLZJuuscbldRnNgaRO9jshzAQQpeSmZOS2YZadxndNaVzH3upmiidE2VnOWOOcEnXB7J9I48nl3WbO9tuEvqkRBbaPHOxg+h1K5/iVnkd4cToi/bDS0/omHu7ZK4vro3Sxf4QdPw6phZbB7hdY6mURS08JJY0MAc/fAOn17lRNX66ss9RZ6YQR+eJoA3yFMR1DXR82RoFX8CGOVzWcjXEFjM5wlaZ0hi12PRV2114lap8TnPecEDcnVRNdxHFbixpppXc7eYcsZd5c4z6ZToZf4kEhI5iMHCRvVpF6bC2rbyvhHK18YAOO3ZdY6+osvxzRcRQ1jY3OjLRKMt5hjOuPupBzWvGWgD0Uc61ObTwUrWgQwDyADXvn1T6NvhR8pzp3Ki3vpOuu0ffARR5G+cBXuwXW3UNFSWwTFz4o2te8DyB3XX1Kp1fD7xRkY2IP5pyYGMY0tbgDJBHforJn4q8uKZ3tpw1QmlqeX26nc45PIMlO1qjDZq6CEIRAQhCAKo/FFP/1kk/M0OBP+/orwqtxpAcwTN3LXM+/T91XyzeK7gus1YijHvEkg+Vgb+a9a0l51XlreHtkjdpKNS0747p6yMDzBvMegWa+m3/TmKlyQ7Cce7t/whLRZxgt5QlWguOig2i6iEF2DjbVcwvbggdEtcA4zCGIakZcV3R0sXhHL9VCZTPka95c0ahPYWYbka/smczHwymSIhzQdR3UtEGyQtkZs4JCkHRc4yU3np8N0UgPxSE5HIQRsiJUfGwcjg4ZbjZJl/KJINSAMhLTlzaeQx4Dume68ttG+WoigBD5JSA5wXV+Qlk3V+tLS22UwO/hg/kna5Y0MY1o2aMBdLZHm27uwhCFKAhCEAo++UXv1A+MDzt8zPUKQQos2mXV3GaxxtbVtf4eH4LS5PAcO2VxntdFM5z3wM5zrzfXuqhURmGd8bt2kgrPlhcY2YcszpRjsBLxvAGcpkHDUDdec5Omd1Vat9ua0czzIwgHHKQeoTK10UVPA6OnL42F2jQcgZS9SNMyOAHRcwzsZHylxAPVQ6m/hpFSRUtVUCLDDOQXuJyXKcppWMiEY2AwFEPkifJlzgM7EpxlzAHAktRN/lSL5Bumsr85A2XDXkg5K8z0SOad2y3m4yGEPDAG8xJGVYLRYY7fP4zpfEeBhuG4ATfhOHDJpiNyGg/mf2VhWrDCalYuXky3cZ6CEIVqkIQhAIQhAIQhAKscTUhinbVMHkfo76FWdIV0LaikmicAeZhxnvjRc5Tc06wy8btROcb9V4XYIITXxcHBK9bISTnZZMo3yo+4UlVPUA+I90ePhGmEpDbhy4c54PYkp+AXnOy6NHJNqScY2XMyW45aRE9sGcMDie+U7oYXU0Qa573HsTkBPjSujw3oPqkHtLc/VLUXLbtrgBjK9L9gE0MmDquBLzHQqYrrSbNE2K2U4aPiYHH1OqepCgGKGnA/8Tf0S62z08++whCFKAhCEAhCEAhCEAg7IVe45vH8HsM7438tRK0sjI3Hc/YIKZcgWVU4YdBI4D7FIU9Zh3LJuFH8PVZrLVSyPOXGNuT3OE/npOZvMN1iyvb0JOkvAWSAFrgnQmEYH65VXifVQHLNfRL/xCoOhjIP+VculidKHDplR1bURRgkkZ7KKfWVb/ga4fZcxU8sr8ykknoVCXXO+dxPypVreUBOo6XkZrukanEbSeyb7Q0ix1sNda4JoHczQ3kP0I0IT9Zx7LLnyCopJneWeaR8We/Mf1H6LR1vnp5+U1QhCFLkIQhAIQhAIQThV+9cXWu1czDL48zd44tcep2CCee9rGlzyA0aknosc49vJu9ZK1jj4LMsjH07/AHTyv4wuV3ZIcinpD5WxM3f6lVSrJLjzZyVFW446LcCyF1qiYfijJZ+BVzjAe3BH2Ko/Cf8AwKmoh6c5c0eqvVNggZCxZ+2vH0QEfJIdPsU7ia3l1b+S7fEDuF3HEBtlcutkHxA50XkELOYnCcviz0XccXLrso0G8xwQFBcQTmCjkeNDjDR3J2U9PjOeyqHEk4lqWQA6NOT6rrGbqLdR3ZnvpIonxOLXx4II7ha9ZLnHdLfHUMIDiMPaPld1WPQEtaB0wvXXGstjBV0M74pITzHlOjm9QR1HVboyZTbcEKp2DjSlrIY2XIinnPz/ACO/srUx7ZGh8bg5pGQQcgqVVmnSEIRAUBeuKqG2gsY4VEw+VjtB6lUy7cUXCuDmGTw4z8kegVelkzlz90dzD+pm+cW3Gua9njGKI/JFoMeu5VUf4lT5QQ1u7ie31XUZdO4sb33SdweyGnMbTod8fN/ood60hOKL1O2FtNb3uijacF7dHH79FH2C7zRjwK3nlic4kSFxJaf7KRNtNTE57xpuF1R0EMcZa5oyDlEd7TVrPhVbJ43BzDpzBXSiqGvxqs+pnOpZOaDGPmYdirJb6vnY2RuQOo7LNy4a7aOPLfS5sw5uUo1uiZWybxYxndSTWqpZXAb3XkmGsJylS3AUPeap0TC1pQIXCvZExxyMrPOIbpLA90lMGPlzrzjQD0Upc6sucWl+vUBQdRTGUudJgA9Oy08fHruqM899Q74d4ijug8CUCKqb8nR/p/ZTkrPEjc1wy0jBCo09qdBh9OS2UnORoWqetl6e0NhuGpAwZgP1CtVy/wBTcDsMLM7eUhS9nvldaiBTTO5AdY3atP2UFMeUtniIdGccxb27pZrsHmad1KWn2rjG31Uf/Nn3aUDUHVp9ChZs0hxyEI58ITByCUhWuxCThOm/D90hV/yT6o6N6Vgipw7q/U+iYysM8xe74c4AT/8ApfZN2dFCCjYxycoGE1lgLXZA+6f91zLspEPK8MkGdCr/AOzaOlqYa2GojZISWuDXjOmqz25fGPVXb2Xf99J/6z+ygaLT8P0O8QfEezXafmnAsrBtM78E9pfhTlRcMb8cfplPqL/g0XzSPPpgKD4mprXbrfPLKxvOWFrC85JcRphW92yzP2pfHT+h/VJhjPiccsre6oVRIxznPAA10/uuIWlzRI4aE+Rp6/UpOp/l/gpH+rF/lUuzcsDGnIyTuSuBQskhIc3zO1ynU2w9U4G49EQZ0bZaPEY80ZOoOyfu5YwC34CNuy5dsEpJ/LRIYcjQISkHwoQf/9k=";
}
this.cphm = map.get("cphm"); }
this.clys = map.get("clys");
this.cllx = map.get("cllx");
this.clpp = map.get("clpp");
this.clzt = map.get("clzt");
} }
} }
package org.springblade.founder.ydjwhc.mapper; package org.springblade.founder.ydjwhc.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springblade.founder.ydjwhc.entity.HcAjJg; import org.springblade.founder.ydjwhc.entity.HcAjJg;
...@@ -10,7 +9,6 @@ import java.util.List; ...@@ -10,7 +9,6 @@ import java.util.List;
@Mapper @Mapper
@Repository @Repository
@DS("xzxt_qg")
public interface QgBjHcMapper { public interface QgBjHcMapper {
List<HcAjJg> selectAjBySfzh(@Param("sfzh") String sfzh, @Param("qsAjList") List<HcAjJg> qsAjList); List<HcAjJg> selectAjBySfzh(@Param("sfzh") String sfzh, @Param("qsAjList") List<HcAjJg> qsAjList);
......
package org.springblade.founder.ydjwhc.mapper; package org.springblade.founder.ydjwhc.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springblade.founder.ydjwhc.entity.HcAjJg; import org.springblade.founder.ydjwhc.entity.HcAjJg;
...@@ -11,7 +10,6 @@ import java.util.Map; ...@@ -11,7 +10,6 @@ import java.util.Map;
@Mapper @Mapper
@Repository @Repository
@DS("xzxt_hm")
public interface QsBjHcMapper { public interface QsBjHcMapper {
Map<String, String> selectRyBzByZjhm(String sfzh); Map<String, String> selectRyBzByZjhm(String sfzh);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<select id="getZtryByZjhm" parameterType="java.lang.String" resultType="java.lang.Integer"> <select id="getZtryByZjhm" parameterType="java.lang.String" resultType="java.lang.Integer">
select count(1) select count(1)
from TB_YW_ZTRY from TB_YW_ZTRY
where zjhm in #{zjhm} where zjhm in #{zjhm} and xxsc_pdbz = '0'
</select> </select>
</mapper> </mapper>
...@@ -21,7 +21,7 @@ public interface BjHcService { ...@@ -21,7 +21,7 @@ public interface BjHcService {
* @author lystar * @author lystar
* 2021/11/27 19:19 * 2021/11/27 19:19
*/ */
Map<String, Object> clsahcByCphm(String cphm); Map<String, Object> clsahcByCphm(String cphm) throws Exception;
/** /**
* znjsByHm 智能检索 * znjsByHm 智能检索
......
package org.springblade.founder.ydjwhc.service;
import org.springblade.founder.ydjwhc.entity.HcAjJg;
import java.util.List;
public interface QgBjHcService {
List<HcAjJg> selectAjBySfzh(String sfzh, List<HcAjJg> qsAjList);
List<HcAjJg> selectAjByCphm(String cphm, List<HcAjJg> qsAjList);
}
package org.springblade.founder.ydjwhc.service;
import org.springblade.founder.ydjwhc.entity.HcAjJg;
import java.util.List;
import java.util.Map;
public interface QsBjHcService {
Map<String, String> selectRyBzByZjhm(String sfzh);
List<HcAjJg> selectAjBySfzh(String sfzh);
List<HcAjJg> selectAjByCphm(String cphm);
HcAjJg selectAjByAsjbh(String asjbh);
String getNameByCodeAndGroupid(String ajlb, String code_ajlb);
}
package org.springblade.founder.ydjwhc.service.impl; package org.springblade.founder.ydjwhc.service.impl;
import org.springblade.founder.asj.dao.HnJbAsjXsMapper; import com.alibaba.fastjson.JSONObject;
import org.springblade.founder.asj.dao.QgJbAsjXsMapper;
import org.springblade.founder.asj.service.QgAsjQueryService; import org.springblade.founder.asj.service.QgAsjQueryService;
import org.springblade.founder.entity.QgckryBean; import org.springblade.founder.entity.QgckryBean;
import org.springblade.founder.redis.mapper.DictitemMapper; import org.springblade.founder.redis.mapper.DictitemMapper;
import org.springblade.founder.ryythcj.entity.TbStAppRyxx; import org.springblade.founder.ryythcj.entity.TbStAppRyxx;
import org.springblade.founder.ryythcj.service.TbStAppRyxxService; import org.springblade.founder.ryythcj.service.TbStAppRyxxService;
import org.springblade.founder.utils.KtInterfaceUtils;
import org.springblade.founder.utils.QgryckUtils; import org.springblade.founder.utils.QgryckUtils;
import org.springblade.founder.ydjwhc.controller.CallDygabxxfwController; import org.springblade.founder.ydjwhc.controller.CallDygabxxfwController;
import org.springblade.founder.ydjwhc.entity.Cpxx;
import org.springblade.founder.ydjwhc.entity.RySmxx; import org.springblade.founder.ydjwhc.entity.RySmxx;
import org.springblade.founder.ydjwhc.entity.HcAjJg; import org.springblade.founder.ydjwhc.entity.HcAjJg;
import org.springblade.founder.ydjwhc.mapper.QgBjHcMapper;
import org.springblade.founder.ydjwhc.mapper.QsBjHcMapper;
import org.springblade.founder.ydjwhc.mapper.RyxxbjhcDao; import org.springblade.founder.ydjwhc.mapper.RyxxbjhcDao;
import org.springblade.founder.ydjwhc.service.BjHcService; import org.springblade.founder.ydjwhc.service.BjHcService;
import org.springblade.founder.ydjwhc.service.QgBjHcService;
import org.springblade.founder.ydjwhc.service.QsBjHcService;
import org.springblade.founder.ydjwhc.thread.TimeControl; import org.springblade.founder.ydjwhc.thread.TimeControl;
import org.springblade.founder.ydjwhc.thread.TimeControl2; import org.springblade.founder.ydjwhc.thread.TimeControl2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -34,9 +35,9 @@ public class BjHcServiceImpl implements BjHcService { ...@@ -34,9 +35,9 @@ public class BjHcServiceImpl implements BjHcService {
@Autowired @Autowired
private TbStAppRyxxService tbStAppRyxxService; private TbStAppRyxxService tbStAppRyxxService;
@Autowired @Autowired
private QsBjHcMapper qsBjHcMapper; private QsBjHcService qsBjHcService;
@Autowired @Autowired
private QgBjHcMapper qgBjHcMapper; private QgBjHcService qgBjHcService;
@Autowired @Autowired
private QgAsjQueryService qgAsjQueryService; private QgAsjQueryService qgAsjQueryService;
...@@ -66,11 +67,17 @@ public class BjHcServiceImpl implements BjHcService { ...@@ -66,11 +67,17 @@ public class BjHcServiceImpl implements BjHcService {
sjList.add("15000000003"); sjList.add("15000000003");
ryxx.setRySjhmList(sjList); ryxx.setRySjhmList(sjList);
//获取人员车牌号 //获取人员车牌号
// TODO 查询人员实名车牌 JSONObject param = new JSONObject();
param.put("expr", "JDCSYR_JTGLYWDXSFZMHM='" + sfzh + "'");
String resultJson = KtInterfaceUtils.getDateByJsonParam(KtInterfaceUtils.RCCL, param.toString());
List<Map<String, String>> listByJson = KtInterfaceUtils.getMapByJson(resultJson);
if (listByJson == null) {
return null;
}
ArrayList<String> cpList = new ArrayList<>(); ArrayList<String> cpList = new ArrayList<>();
cpList.add("琼A00001"); for (Map<String, String> map : listByJson) {
cpList.add("琼A00002"); cpList.add(map.get("JDCHPHM"));
cpList.add("琼A00003"); }
ryxx.setRyCphmList(cpList); ryxx.setRyCphmList(cpList);
resultMap.put("ryxx", ryxx); resultMap.put("ryxx", ryxx);
//查询人员主标签 //查询人员主标签
...@@ -83,7 +90,7 @@ public class BjHcServiceImpl implements BjHcService { ...@@ -83,7 +90,7 @@ public class BjHcServiceImpl implements BjHcService {
resultMap.put("zbq", zbq); resultMap.put("zbq", zbq);
//查询重点关注人员标签 //查询重点关注人员标签
Map<String, String> rybzMap = qsBjHcMapper.selectRyBzByZjhm(sfzh); Map<String, String> rybzMap = qsBjHcService.selectRyBzByZjhm(sfzh);
if (rybzMap != null) { if (rybzMap != null) {
String CODE = processingBz(rybzMap.get("CODE")); String CODE = processingBz(rybzMap.get("CODE"));
String AJLB = processingBz(rybzMap.get("AJLB")); String AJLB = processingBz(rybzMap.get("AJLB"));
...@@ -93,14 +100,14 @@ public class BjHcServiceImpl implements BjHcService { ...@@ -93,14 +100,14 @@ public class BjHcServiceImpl implements BjHcService {
resultMap.put("sabq", SABQ); resultMap.put("sabq", SABQ);
} }
//查询人员涉案信息 //查询人员涉案信息
List<HcAjJg> qsAjList = qsBjHcMapper.selectAjBySfzh(sfzh); List<HcAjJg> qsAjList = qsBjHcService.selectAjBySfzh(sfzh);
resultMap.put("qsAjList", qsAjList); resultMap.put("qsAjList", qsAjList);
resultMap.put("qsAjCount", qsAjList.size()); resultMap.put("qsAjCount", qsAjList.size());
List<HcAjJg> qgAjList = qgBjHcMapper.selectAjBySfzh(sfzh, qsAjList); List<HcAjJg> qgAjList = qgBjHcService.selectAjBySfzh(sfzh, qsAjList);
for (HcAjJg hcAjJg : qgAjList) { for (HcAjJg hcAjJg : qgAjList) {
String ajlb = qsBjHcMapper.getNameByCodeAndGroupid(hcAjJg.getAjlb(), "CODE_AJLB"); String ajlb = qsBjHcService.getNameByCodeAndGroupid(hcAjJg.getAjlb(), "CODE_AJLB");
String fadq = qsBjHcMapper.getNameByCodeAndGroupid(hcAjJg.getFadq(), "CODE_XZQH"); String fadq = qsBjHcService.getNameByCodeAndGroupid(hcAjJg.getFadq(), "CODE_XZQH");
hcAjJg.setAjlb(ajlb); hcAjJg.setAjlb(ajlb);
hcAjJg.setFadq(fadq); hcAjJg.setFadq(fadq);
} }
...@@ -111,12 +118,10 @@ public class BjHcServiceImpl implements BjHcService { ...@@ -111,12 +118,10 @@ public class BjHcServiceImpl implements BjHcService {
} }
@Override @Override
public Map<String, Object> clsahcByCphm(String cphm) { public Map<String, Object> clsahcByCphm(String cphm) throws Exception {
HashMap<String, Object> resultMap = new HashMap<>(); HashMap<String, Object> resultMap = new HashMap<>();
//查询车牌实名制 //查询车牌实名制
//TODO 查询车牌实名信息 getClxxByCphm(cphm, resultMap);
RySmxx rySmxx = getClxxByCphm(cphm);
resultMap.put("cpSmxx", rySmxx);
getSaxxByBsh(cphm, resultMap); getSaxxByBsh(cphm, resultMap);
return resultMap; return resultMap;
} }
...@@ -129,7 +134,7 @@ public class BjHcServiceImpl implements BjHcService { ...@@ -129,7 +134,7 @@ public class BjHcServiceImpl implements BjHcService {
String SJHM_REGEX = "^1(3[0-9]|4[57]|5[0-35-9]|7[0135678]|8[0-9])\\d{8}$"; String SJHM_REGEX = "^1(3[0-9]|4[57]|5[0-35-9]|7[0135678]|8[0-9])\\d{8}$";
if (hm.startsWith("A") && hm.length() == 23) { if (hm.startsWith("A") && hm.length() == 23) {
HashMap<String, Object> resultMap = new HashMap<>(); HashMap<String, Object> resultMap = new HashMap<>();
HcAjJg ajxx = qsBjHcMapper.selectAjByAsjbh(hm); HcAjJg ajxx = qsBjHcService.selectAjByAsjbh(hm);
resultMap.put("ajxx", ajxx); resultMap.put("ajxx", ajxx);
resultMap.put("type", "asjbh"); resultMap.put("type", "asjbh");
return resultMap; return resultMap;
...@@ -151,16 +156,16 @@ public class BjHcServiceImpl implements BjHcService { ...@@ -151,16 +156,16 @@ public class BjHcServiceImpl implements BjHcService {
private void getSaxxByBsh(String bsh, HashMap<String, Object> resultMap){ private void getSaxxByBsh(String bsh, HashMap<String, Object> resultMap){
//查询车牌涉案信息 //查询车牌涉案信息
List<HcAjJg> qsAjList = qsBjHcMapper.selectAjByCphm(bsh); List<HcAjJg> qsAjList = qsBjHcService.selectAjByCphm(bsh);
resultMap.put("qsAjList", qsAjList); resultMap.put("qsAjList", qsAjList);
resultMap.put("qsAjCount", qsAjList.size()); resultMap.put("qsAjCount", qsAjList.size());
//本地测试 //本地测试
List<HcAjJg> qgAjList = qgBjHcMapper.selectAjByCphm(bsh, qsAjList); List<HcAjJg> qgAjList = qgBjHcService.selectAjByCphm(bsh, qsAjList);
resultMap.put("qgAjList", qgAjList); resultMap.put("qgAjList", qgAjList);
resultMap.put("qgAjCount", qgAjList.size()); resultMap.put("qgAjCount", qgAjList.size());
// 公安网 // 公安网
// List<TbXszCbypQgaj> asjListByBsh = qgAsjQueryService.getQgAsjByBsh(cphm); // List<TbXszCbypQgaj> asjListByBsh = qgAsjQueryService.getQgAsjByBsh(bsh);
// if (asjListByBsh != null && asjListByBsh.size() > 0) { // if (asjListByBsh != null && asjListByBsh.size() > 0) {
// List<HcAjJg> qgAjList = new ArrayList<>(); // List<HcAjJg> qgAjList = new ArrayList<>();
// for (TbXszCbypQgaj asjByBsh : asjListByBsh) { // for (TbXszCbypQgaj asjByBsh : asjListByBsh) {
...@@ -202,20 +207,38 @@ public class BjHcServiceImpl implements BjHcService { ...@@ -202,20 +207,38 @@ public class BjHcServiceImpl implements BjHcService {
} }
//查询车辆实名信息 //查询车辆实名信息
private RySmxx getClxxByCphm(String cphm) { private void getClxxByCphm(String cphm, Map<String, Object> resultMap) throws Exception {
HashMap<String, String> map = new HashMap<>(); JSONObject param = new JSONObject();
map.put("cphm", cphm); param.put("expr", "JDCHPHM='" + cphm + "'");
map.put("cpsm", "150105199909090010"); String resultJson = KtInterfaceUtils.getDateByJsonParam(KtInterfaceUtils.CPCX, param.toString());
map.put("clys", "灰色"); //获取结果列表
map.put("cllx", "小型轿车"); List<Map<String, String>> listByJson = KtInterfaceUtils.getMapByJson(resultJson);
map.put("clpp", "大众"); if (listByJson == null) {
map.put("clzt", "未年检"); return;
}
Cpxx cpxx = null;
ArrayList<RySmxx> ryList = new ArrayList<>();
for (Map<String, String> map : listByJson) {
if (cpxx == null) {
cpxx = new Cpxx(map);
}
QgryckUtils qgryckUtils = new QgryckUtils(); QgryckUtils qgryckUtils = new QgryckUtils();
// QgckryBean qgry = qgryckUtils.getQgckAllxxXml(map.get("cpsm")); // QgckryBean qgry = qgryckUtils.getQgckAllxxXml(map.get("JDCSYR_JTGLYWDXSFZMHM"));
QgckryBean qgry = null; QgckryBean qgry = null;
RySmxx rySmxx = new RySmxx(map, qgry); RySmxx rySmxx = new RySmxx(qgry);
String dicJdcztdm = map.get("DIC_JDCZTDM");
if ("正常".equals(dicJdcztdm)){
cpxx.setClzt(dicJdcztdm);
}
rySmxx.setZt(dicJdcztdm);
translateZdm(rySmxx); translateZdm(rySmxx);
return rySmxx; ryList.add(rySmxx);
}
if (cpxx != null){
resultMap.put("cpxx", cpxx);
resultMap.put("czList", ryList);
resultMap.put("czCount", ryList.size());
}
} }
//翻译字段码 //翻译字段码
......
package org.springblade.founder.ydjwhc.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springblade.founder.ydjwhc.entity.HcAjJg;
import org.springblade.founder.ydjwhc.mapper.QgBjHcMapper;
import org.springblade.founder.ydjwhc.service.QgBjHcService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@DS("xzxt_qg")
public class QgBjHcServiceImpl implements QgBjHcService {
@Autowired
private QgBjHcMapper qgBjHcMapper;
@Override
public List<HcAjJg> selectAjBySfzh(String sfzh, List<HcAjJg> qsAjList) {
return qgBjHcMapper.selectAjBySfzh(sfzh, qsAjList);
}
@Override
public List<HcAjJg> selectAjByCphm(String cphm, List<HcAjJg> qsAjList) {
return qgBjHcMapper.selectAjByCphm(cphm, qsAjList);
}
}
package org.springblade.founder.ydjwhc.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springblade.founder.ydjwhc.entity.HcAjJg;
import org.springblade.founder.ydjwhc.mapper.QsBjHcMapper;
import org.springblade.founder.ydjwhc.service.QsBjHcService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
@DS("xzxt_hm")
public class QsBjHcServiceImpl implements QsBjHcService {
@Autowired
private QsBjHcMapper qsBjHcMapper;
@Override
public Map<String, String> selectRyBzByZjhm(String sfzh) {
return qsBjHcMapper.selectRyBzByZjhm(sfzh);
}
@Override
public List<HcAjJg> selectAjBySfzh(String sfzh) {
return qsBjHcMapper.selectAjBySfzh(sfzh);
}
@Override
public List<HcAjJg> selectAjByCphm(String cphm) {
return qsBjHcMapper.selectAjByCphm(cphm);
}
@Override
public HcAjJg selectAjByAsjbh(String asjbh) {
return qsBjHcMapper.selectAjByAsjbh(asjbh);
}
@Override
public String getNameByCodeAndGroupid(String ajlb, String code_ajlb) {
return qsBjHcMapper.getNameByCodeAndGroupid(ajlb, code_ajlb);
}
}
...@@ -31,21 +31,21 @@ public class TimeControl2 implements Callable<Map<String, String>> { ...@@ -31,21 +31,21 @@ public class TimeControl2 implements Callable<Map<String, String>> {
@Override @Override
public Map<String, String> call() { public Map<String, String> call() {
switch (resourceName) { switch (resourceName) {
case "ztry": { // case "ztry": {
Map map = callDygabxxfwController.getGabZyInfo("ztryxx", zjhm); // Map map = callDygabxxfwController.getGabZyInfo("ztryxx", zjhm);
System.out.println("map====>" + map); // System.out.println("map====>" + map);
if (map != null) { // if (map != null) {
List<Map> resultList = (List) map.get("dataResult"); // List<Map> resultList = (List) map.get("dataResult");
if (resultList.size() > 0) { // if (resultList.size() > 0) {
HashMap<String, String> resultMap = new HashMap<>(); // HashMap<String, String> resultMap = new HashMap<>();
resultMap.put("zylx", "1"); // resultMap.put("zylx", "1");
resultMap.put("resourceName", resourceName); // resultMap.put("resourceName", resourceName);
resultMap.put("zymc", "在逃人员"); // resultMap.put("zymc", "在逃人员");
return resultMap; // return resultMap;
} // }
} // }
break; // break;
} // }
case "fzxyr": { case "fzxyr": {
Map map = callDygabxxfwController.getGabZyInfo("fzxyr", zjhm); Map map = callDygabxxfwController.getGabZyInfo("fzxyr", zjhm);
System.out.println("map====>" + map); System.out.println("map====>" + map);
......
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