Skip to content

H
hnxtbaboot
Commit e3294eff by 焦荣
Options

Merge remote-tracking branch 'origin/master'

parents 172bc588 86fac754
Showing with 464 additions and 175 deletions
src/main/java/com/founder/controller/CallDygabxxfw.java
...@@ -3,6 +3,7 @@ package com.founder.controller; ...@@ -3,6 +3,7 @@ package com.founder.controller;
import com.founder.model.User; import com.founder.model.User;
import com.founder.util.propertiesUtil; import com.founder.util.propertiesUtil;
import com.founder.utils.PropertiesUtil; import com.founder.utils.PropertiesUtil;
import com.founder.utils.Utils;
import org.apache.http.HttpEntity; import org.apache.http.HttpEntity;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.CloseableHttpResponse;
...@@ -42,9 +43,9 @@ public class CallDygabxxfw { ...@@ -42,9 +43,9 @@ public class CallDygabxxfw {
* @param jsonStr * @param jsonStr
* @return * @return
*/ */
@RequestMapping("/getGabZyInfo") @RequestMapping("/getGabZyInfo_bak")
@ResponseBody @ResponseBody
public Map<String,Object> getGabZyInfo(String zylx,String jsonStr) { public Map<String,Object> getGabZyInfo_bak(String zylx,String jsonStr) {
//"fzxyr", "[{\"ZHFZXYR_CYZJ_ZJHM\":\"" + zjhm + "\"}]" //"fzxyr", "[{\"ZHFZXYR_CYZJ_ZJHM\":\"" + zjhm + "\"}]"
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
try { try {
...@@ -65,6 +66,7 @@ public class CallDygabxxfw { ...@@ -65,6 +66,7 @@ public class CallDygabxxfw {
httpPost.setEntity(entity); httpPost.setEntity(entity);
CloseableHttpResponse response = httpClient.execute(httpPost); CloseableHttpResponse response = httpClient.execute(httpPost);
System.out.println("response.getStatusLine().getStatusCode()======" + response.getStatusLine().getStatusCode());
if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) { if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
String jsonResult = EntityUtils.toString(response.getEntity(), "utf-8"); String jsonResult = EntityUtils.toString(response.getEntity(), "utf-8");
System.out.println("map=jsonResult===" + jsonResult); System.out.println("map=jsonResult===" + jsonResult);
...@@ -85,6 +87,46 @@ public class CallDygabxxfw { ...@@ -85,6 +87,46 @@ public class CallDygabxxfw {
} }
return map; return map;
} }
/**
* 获取全国资源
*
* @param zylx
* @param jsonStr
* @return
*/
@RequestMapping("/getGabZyInfo")
@ResponseBody
public Map<String,Object> getGabZyInfo(String zylx,String jsonStr) {
String url = p.getValue("qganurl");
//String url = "http://zhyy.xzxt.nm/qgfwzycx/queryDygabzy.action";
Map<String,Object> map = new HashMap<>();
String urlName = url+"?zylx="+zylx+"&jsonStr="+jsonStr;
String result = "";
try {
URL realURL = new URL(urlName);
URLConnection conn = realURL.openConnection();
conn.setRequestProperty("accept", "*/*");
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36");
conn.connect();
BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
String line;
while ((line = in.readLine()) != null) {
result += "\n" + line;
}
if(result==null||"".equals(result)){
}else{
map = Utils.parseJSON2Map(result);
}
System.out.println("map=调取全国案件人员接口===" + map);
} catch (IOException e) {
System.out.println("获取全国案件数据异常===" + e.getMessage());
e.printStackTrace();
}
return map;
}
//根据条件调取部级资源-主方法 //根据条件调取部级资源-主方法
...@@ -238,7 +280,7 @@ public class CallDygabxxfw { ...@@ -238,7 +280,7 @@ public class CallDygabxxfw {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
try { try {
//String url = "http://zhyy.xzxt.nm/szxc/query/person?rwbh=" + rwbh ; //String url = "http://zhyy.xzxt.nm/szxc/query/person?rwbh=" + rwbh ;
String url = p.getValue("zwbzurl") + "?rwbh=" + rwbh; String url = p.getValue("zwrwurl") + "?rwbh=" + rwbh;
// http链接工具 // http链接工具
CloseableHttpClient httpClient = HttpClients.createDefault(); CloseableHttpClient httpClient = HttpClients.createDefault();
Map<Object, Object> param = new HashMap(); Map<Object, Object> param = new HashMap();
......
src/main/java/com/founder/controller/RyfkController.java
...@@ -119,7 +119,7 @@ public class RyfkController { ...@@ -119,7 +119,7 @@ public class RyfkController {
//根据zjhm查询全国案件信息 //根据zjhm查询全国案件信息
public List getQgajxx(String zjhm) { public List getQgajxx(String zjhm) {
CallDygabxxfw fw = new CallDygabxxfw(); CallDygabxxfw fw = new CallDygabxxfw();
String jsonStr = "[{\"ZHFZXYR_CYZJ_ZJHM\":\"" + zjhm + "\"}]"; String jsonStr = "[\"{\\\"ZHFZXYR_CYZJ_ZJHM\\\":\\\"" + zjhm + "\\\"}\"]";
String zylx = "fzxyr"; String zylx = "fzxyr";
Map<String, Object> zbfzxyr = fw.getGabZyInfo(zylx, jsonStr); Map<String, Object> zbfzxyr = fw.getGabZyInfo(zylx, jsonStr);
List rowlist = new ArrayList(); List rowlist = new ArrayList();
...@@ -134,7 +134,7 @@ public class RyfkController { ...@@ -134,7 +134,7 @@ public class RyfkController {
String asjbh = maps.get("ASJBH").toString(); String asjbh = maps.get("ASJBH").toString();
System.out.println("asjbh= 根据人员查询案件编号==" + asjbh); System.out.println("asjbh= 根据人员查询案件编号==" + asjbh);
//获取案件信息 //获取案件信息
jsonStr = "[{\"ASJBH\":\"" + asjbh + "\"}]"; jsonStr = "[\"{\\\"ASJBH\\\":\\\"" + asjbh + "\\\"}\"]";
zylx = "asj"; zylx = "asj";
Map<String, Object> asjmap = fw.getGabZyInfo(zylx, jsonStr); Map<String, Object> asjmap = fw.getGabZyInfo(zylx, jsonStr);
List asjlist = new ArrayList(); List asjlist = new ArrayList();
......
src/main/java/com/founder/controller/XsjsbzController.java
...@@ -180,11 +180,12 @@ public class XsjsbzController { ...@@ -180,11 +180,12 @@ public class XsjsbzController {
//} //}
//imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNRollByRybh?rybh="+zwbh); //imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNRollByRybh?rybh="+zwbh);
//imgstrs = hu.getJsonString("http://10.142.16.171:8082/data/getPSNRollByRybh?rybh=" + zwbh); //imgstrs = hu.getJsonString("http://10.142.16.171:8082/data/getPSNRollByRybh?rybh=" + zwbh);
//String imgStr = getZwImagedata("http://65.65.66.27:8081/data/getPSNRollByRybh?rybh="+personList.get(0).getBarcode(),nyzw); String imgStr = getZwImagedata("http://65.65.66.27:8081/data/getPSNRollByRybh?rybh="+personList.get(0).getBarcode(),nyzw);
String imgStr = getZwImagedata("http://10.185.207.31:8082/data/getPSNRollByRybh?rybh="+personList.get(0).getBarcode(),nyzw); //String imgStr = getZwImagedata("http://10.185.207.31:8082/data/getPSNRollByRybh?rybh="+personList.get(0).getBarcode(),nyzw);
System.out.println("株洲捺印指纹图片="+imgStr); System.out.println("株洲捺印指纹图片="+imgStr);
if(imgStr==null||"".equals(imgStr)){ if(imgStr==null||"".equals(imgStr)){
imgStr = getZwImagedata("http://10.185.207.31:8082/data/getPSNRollByRybh?rybh="+personList.get(0).getBarcode(),nyzw); imgStr = getZwImagedata("http://10.142.16.171:8082/data/getPSNRollByRybh?rybh="+personList.get(0).getBarcode(),nyzw);
//imgStr = getZwImagedata("http://10.185.207.31:8082/data/getPSNRollByRybh?rybh="+personList.get(0).getBarcode(),nyzw);
System.out.println("省厅捺印指纹图片="+imgStr); System.out.println("省厅捺印指纹图片="+imgStr);
} }
personList.get(0).setRybzzwtpBase64(imgStr); personList.get(0).setRybzzwtpBase64(imgStr);
......
src/main/java/com/founder/khtj/controller/KhtjController.java
...@@ -161,7 +161,6 @@ public class KhtjController { ...@@ -161,7 +161,6 @@ public class KhtjController {
int swcjs=0;int swxzcjs=0;int swwcjs=0; int swcjs=0;int swxzcjs=0;int swwcjs=0;
int zjcjs=0;int zjxzcjs=0;int zjwcjs=0; int zjcjs=0;int zjxzcjs=0;int zjwcjs=0;
int hmcjs=0;int hmxzcjs=0;int hmwcjs=0; int hmcjs=0;int hmxzcjs=0;int hmwcjs=0;
int sjcjs=0;int sjxzcjs=0;int sjwcjs=0;
int dnacjs=0;int dnaxzcjs=0;int dnawcjs=0; int dnacjs=0;int dnaxzcjs=0;int dnawcjs=0;
for(RstBean aj:rstBeanlist){ for(RstBean aj:rstBeanlist){
aj.setMaxccsjStr(rstBean.getMaxccsjStr()); aj.setMaxccsjStr(rstBean.getMaxccsjStr());
...@@ -185,9 +184,6 @@ public class KhtjController { ...@@ -185,9 +184,6 @@ public class KhtjController {
hmcjs=hmcjs+Integer.parseInt(aj.getHmcjs()); hmcjs=hmcjs+Integer.parseInt(aj.getHmcjs());
hmxzcjs=hmxzcjs+Integer.parseInt(aj.getHmxzcjs()); hmxzcjs=hmxzcjs+Integer.parseInt(aj.getHmxzcjs());
hmwcjs=hmwcjs+Integer.parseInt(aj.getHmwcjs()); hmwcjs=hmwcjs+Integer.parseInt(aj.getHmwcjs());
sjcjs=sjcjs+Integer.parseInt(aj.getSjcjs());
sjxzcjs=sjxzcjs+Integer.parseInt(aj.getSjxzcjs());
sjwcjs=sjwcjs+Integer.parseInt(aj.getSjwcjs());
dnacjs=dnacjs+Integer.parseInt(aj.getDnacjs()); dnacjs=dnacjs+Integer.parseInt(aj.getDnacjs());
dnaxzcjs=dnaxzcjs+Integer.parseInt(aj.getDnaxzcjs()); dnaxzcjs=dnaxzcjs+Integer.parseInt(aj.getDnaxzcjs());
dnawcjs=dnawcjs+Integer.parseInt(aj.getDnawcjs()); dnawcjs=dnawcjs+Integer.parseInt(aj.getDnawcjs());
...@@ -220,12 +216,12 @@ public class KhtjController { ...@@ -220,12 +216,12 @@ public class KhtjController {
rstBean.setDnaxzcjtotal(dnaxzcjs+""); rstBean.setDnaxzcjtotal(dnaxzcjs+"");
rstBean.setDnawcjtotal(dnawcjs+""); rstBean.setDnawcjtotal(dnawcjs+"");
*/ */
rstBean.setZwcjl(jscjl(zycs+"",zwcjs+"")); rstBean.setZwcjl(jscjl(ycs+"",zwcjs+""));
rstBean.setRxcjl(jscjl(zycs+"",rxcjs+"")); rstBean.setRxcjl(jscjl(ycs+"",rxcjs+""));
rstBean.setSwcjl(jscjl(zycs+"",swcjs+"")); rstBean.setSwcjl(jscjl(ycs+"",swcjs+""));
rstBean.setZjcjl(jscjl(zycs+"",zjcjs+"")); rstBean.setZjcjl(jscjl(ycs+"",zjcjs+""));
rstBean.setHmcjl(jscjl(zycs+"",hmcjs+"")); rstBean.setHmcjl(jscjl(ycs+"",hmcjs+""));
rstBean.setDnacjl(jscjl(zycs+"",dnacjs+"")); rstBean.setDnacjl(jscjl(ycs+"",dnacjs+""));
rstBean.setZycs(zycs+""); rstBean.setZycs(zycs+"");
rstBean.setYcs(ycs+""); rstBean.setYcs(ycs+"");
rstBean.setZwcjs(zwcjs+""); rstBean.setZwcjs(zwcjs+"");
......
src/main/java/com/founder/khtj/service/impl/IRycjtjServiceImpl.java
...@@ -81,36 +81,28 @@ public class IRycjtjServiceImpl implements IRycjtjService { ...@@ -81,36 +81,28 @@ public class IRycjtjServiceImpl implements IRycjtjService {
if(nuitCodes!=null){ if(nuitCodes!=null){
if(ifslgzd==0){ if(ifslgzd==0){
List<RstBean> zycs = khtjDao.getRycjtjListzycs(filterMap);
List<RstBean> ycs = khtjDao.getRycjtjListycs(filterMap); List<RstBean> ycs = khtjDao.getRycjtjListycs(filterMap);
List<RstBean> zwcjs = khtjDao.getRycjtjListzwcjs(filterMap); List<RstBean> zwcjs = khtjDao.getRycjtjListzwcjs(filterMap);
//List<RstBean> zwxzcjs = khtjDao.getRycjtjListzwxzcjs(filterMap); List<RstBean> zwxzcjs = khtjDao.getRycjtjListzwxzcjs(filterMap);
//List<RstBean> zwwcjs = khtjDao.getRycjtjListzwwcjs(filterMap); List<RstBean> zwwcjs = khtjDao.getRycjtjListzwwcjs(filterMap);
List<RstBean> rxcjs = khtjDao.getRycjtjListrxcjs(filterMap); List<RstBean> rxcjs = khtjDao.getRycjtjListrxcjs(filterMap);
//List<RstBean> rxxzcjs = khtjDao.getRycjtjListrxxzcjs(filterMap); List<RstBean> rxxzcjs = khtjDao.getRycjtjListrxxzcjs(filterMap);
//List<RstBean> rxwcjs = khtjDao.getRycjtjListrxwcjs(filterMap); List<RstBean> rxwcjs = khtjDao.getRycjtjListrxwcjs(filterMap);
List<RstBean> swcjs = khtjDao.getRycjtjListswcjs(filterMap); List<RstBean> swcjs = khtjDao.getRycjtjListswcjs(filterMap);
//List<RstBean> swxzcjs = khtjDao.getRycjtjListswxzcjs(filterMap); List<RstBean> swxzcjs = khtjDao.getRycjtjListswxzcjs(filterMap);
//List<RstBean> swwcjs = khtjDao.getRycjtjListswwcjs(filterMap); List<RstBean> swwcjs = khtjDao.getRycjtjListswwcjs(filterMap);
List<RstBean> zjcjs = khtjDao.getRycjtjListzjcjs(filterMap); List<RstBean> zjcjs = khtjDao.getRycjtjListzjcjs(filterMap);
//List<RstBean> zjxzcjs = khtjDao.getRycjtjListzjxzcjs(filterMap); List<RstBean> zjxzcjs = khtjDao.getRycjtjListzjxzcjs(filterMap);
//List<RstBean> zjwcjs = khtjDao.getRycjtjListzjwcjs(filterMap); List<RstBean> zjwcjs = khtjDao.getRycjtjListzjwcjs(filterMap);
List<RstBean> dnacjs = khtjDao.getRycjtjListdnacjs(filterMap); List<RstBean> dnacjs = khtjDao.getRycjtjListdnacjs(filterMap);
//List<RstBean> dnaxzcjs = khtjDao.getRycjtjListdnaxzcjs(filterMap); List<RstBean> dnaxzcjs = khtjDao.getRycjtjListdnaxzcjs(filterMap);
//List<RstBean> dnawcjs = khtjDao.getRycjtjListdnawcjs(filterMap); List<RstBean> dnawcjs = khtjDao.getRycjtjListdnawcjs(filterMap);
List<RstBean> hmcjs = khtjDao.getRycjtjListhmcjs(filterMap); List<RstBean> hmcjs = khtjDao.getRycjtjListhmcjs(filterMap);
//List<RstBean> hmxzcjs = khtjDao.getRycjtjListhmxzcjs(filterMap); List<RstBean> hmxzcjs = khtjDao.getRycjtjListhmxzcjs(filterMap);
//List<RstBean> hmwcjs = khtjDao.getRycjtjListhmwcjs(filterMap); List<RstBean> hmwcjs = khtjDao.getRycjtjListhmwcjs(filterMap);
List<RstBean> sjcjs = khtjDao.getRycjtjListsjcjs(filterMap);
//List<RstBean> sjxzcjs = khtjDao.getRycjtjListsjxzcjs(filterMap);
//List<RstBean> sjwcjs = khtjDao.getRycjtjListsjwcjs(filterMap);
for (UnitCodeBean unitCodeBean : nuitCodes) { for (UnitCodeBean unitCodeBean : nuitCodes) {
RstBean rstbean = new RstBean(); RstBean rstbean = new RstBean();
for(RstBean zwzltj:ycs){ for(RstBean zwzltj:ycs){
...@@ -118,150 +110,136 @@ public class IRycjtjServiceImpl implements IRycjtjService { ...@@ -118,150 +110,136 @@ public class IRycjtjServiceImpl implements IRycjtjService {
rstbean.setYcs(zwzltj.getYcs()); rstbean.setYcs(zwzltj.getYcs());
} }
} }
for(RstBean zwzltj:zycs){ for(RstBean zwzltj:zwcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setZycs(zwzltj.getZycs()); rstbean.setZwcjs(zwzltj.getZwcjs());
} }
} }
for(RstBean zwzltj:zwcjs){ for(RstBean zwzltj:zwxzcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setZwcjs(zwzltj.getZwcjs()); rstbean.setZwxzcjs(zwzltj.getZwxzcjs());
}
}
for(RstBean zwzltj:zwwcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setZwwcjs(zwzltj.getZwwcjs());
} }
} }
//for(RstBean zwzltj:zwxzcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setZwxzcjs(zwzltj.getZwxzcjs());
// }
//}
//for(RstBean zwzltj:zwwcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setZwwcjs(zwzltj.getZwwcjs());
// }
//}
for(RstBean zwzltj:rxcjs){ for(RstBean zwzltj:rxcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setRxcjs(zwzltj.getRxcjs()); rstbean.setRxcjs(zwzltj.getRxcjs());
} }
} }
//for(RstBean zwzltj:rxxzcjs){ for(RstBean zwzltj:rxxzcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setRxxzcjs(zwzltj.getRxxzcjs()); rstbean.setRxxzcjs(zwzltj.getRxxzcjs());
// } }
//} }
//for(RstBean zwzltj:rxwcjs){ for(RstBean zwzltj:rxwcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setRxwcjs(zwzltj.getRxwcjs()); rstbean.setRxwcjs(zwzltj.getRxwcjs());
// } }
//} }
for(RstBean zwzltj:swcjs){ for(RstBean zwzltj:swcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setSwcjs(zwzltj.getSwcjs()); rstbean.setSwcjs(zwzltj.getSwcjs());
} }
} }
//for(RstBean zwzltj:swxzcjs){ for(RstBean zwzltj:swxzcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setSwxzcjs(zwzltj.getSwxzcjs()); rstbean.setSwxzcjs(zwzltj.getSwxzcjs());
// } }
//} }
//for(RstBean zwzltj:swwcjs){ for(RstBean zwzltj:swwcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setSwwcjs(zwzltj.getSwwcjs()); rstbean.setSwwcjs(zwzltj.getSwwcjs());
// } }
//} }
for(RstBean zwzltj:zjcjs){ for(RstBean zwzltj:zjcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setZjcjs(zwzltj.getZjcjs()); rstbean.setZjcjs(zwzltj.getZjcjs());
} }
} }
//for(RstBean zwzltj:zjxzcjs){ for(RstBean zwzltj:zjxzcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setZjxzcjs(zwzltj.getZjxzcjs()); rstbean.setZjxzcjs(zwzltj.getZjxzcjs());
// } }
//} }
//for(RstBean zwzltj:zjwcjs){ for(RstBean zwzltj:zjwcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setZjwcjs(zwzltj.getZjwcjs()); rstbean.setZjwcjs(zwzltj.getZjwcjs());
// } }
//} }
for(RstBean zwzltj:hmcjs){ for(RstBean zwzltj:hmcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setHmcjs(zwzltj.getHmcjs()); rstbean.setHmcjs(zwzltj.getHmcjs());
} }
} }
//for(RstBean zwzltj:hmxzcjs){ for(RstBean zwzltj:hmxzcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setHmxzcjs(zwzltj.getHmxzcjs()); rstbean.setHmxzcjs(zwzltj.getHmxzcjs());
// } }
//} }
//for(RstBean zwzltj:hmwcjs){ for(RstBean zwzltj:hmwcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setHmwcjs(zwzltj.getHmwcjs()); rstbean.setHmwcjs(zwzltj.getHmwcjs());
// } }
//} }
for(RstBean zwzltj:dnacjs){ for(RstBean zwzltj:dnacjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setDnacjs(zwzltj.getDnacjs()); rstbean.setDnacjs(zwzltj.getDnacjs());
} }
} }
//for(RstBean zwzltj:dnaxzcjs){ for(RstBean zwzltj:dnaxzcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setDnaxzcjs(zwzltj.getDnaxzcjs());
// }
//}
//for(RstBean zwzltj:dnawcjs){
// if(unitCodeBean.getCode().equals(zwzltj.getCode())){
// rstbean.setDnawcjs(zwzltj.getDnawcjs());
// }
//}
for(RstBean zwzltj:sjcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){ if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setSjcjs(zwzltj.getSjcjs()); rstbean.setDnaxzcjs(zwzltj.getDnaxzcjs());
}
}
for(RstBean zwzltj:dnawcjs){
if(unitCodeBean.getCode().equals(zwzltj.getCode())){
rstbean.setDnawcjs(zwzltj.getDnawcjs());
} }
} }
if(rstbean.getYcs()==null||"".equals(rstbean.getYcs())){ if(rstbean.getYcs()==null||"".equals(rstbean.getYcs())){
rstbean.setYcs("0"); rstbean.setYcs("0");
} }
if(rstbean.getZycs()==null||"".equals(rstbean.getZycs())){
rstbean.setZycs("0");
}
if(rstbean.getZwcjs()==null||"".equals(rstbean.getZwcjs())){ if(rstbean.getZwcjs()==null||"".equals(rstbean.getZwcjs())){
rstbean.setZwcjs("0"); rstbean.setZwcjs("0");
} }
//if(rstbean.getZwxzcjs()==null||"".equals(rstbean.getZwxzcjs())){ if(rstbean.getZwxzcjs()==null||"".equals(rstbean.getZwxzcjs())){
// rstbean.setZwxzcjs("0"); rstbean.setZwxzcjs("0");
//} }
//if(rstbean.getZwwcjs()==null||"".equals(rstbean.getZwwcjs())){ if(rstbean.getZwwcjs()==null||"".equals(rstbean.getZwwcjs())){
// rstbean.setZwwcjs("0"); rstbean.setZwwcjs("0");
//} }
if(rstbean.getRxcjs()==null||"".equals(rstbean.getRxcjs())){ if(rstbean.getRxcjs()==null||"".equals(rstbean.getRxcjs())){
rstbean.setRxcjs("0"); rstbean.setRxcjs("0");
} }
//if(rstbean.getRxxzcjs()==null||"".equals(rstbean.getRxxzcjs())){ if(rstbean.getRxxzcjs()==null||"".equals(rstbean.getRxxzcjs())){
// rstbean.setRxxzcjs("0"); rstbean.setRxxzcjs("0");
//} }
//if(rstbean.getRxwcjs()==null||"".equals(rstbean.getRxwcjs())){ if(rstbean.getRxwcjs()==null||"".equals(rstbean.getRxwcjs())){
// rstbean.setRxwcjs("0"); rstbean.setRxwcjs("0");
//} }
if(rstbean.getSwcjs()==null||"".equals(rstbean.getSwcjs())){ if(rstbean.getSwcjs()==null||"".equals(rstbean.getSwcjs())){
rstbean.setSwcjs("0"); rstbean.setSwcjs("0");
} }
//if(rstbean.getSwxzcjs()==null||"".equals(rstbean.getSwxzcjs())){ if(rstbean.getSwxzcjs()==null||"".equals(rstbean.getSwxzcjs())){
// rstbean.setSwxzcjs("0"); rstbean.setSwxzcjs("0");
//} }
//if(rstbean.getSwwcjs()==null||"".equals(rstbean.getSwwcjs())){ if(rstbean.getSwwcjs()==null||"".equals(rstbean.getSwwcjs())){
// rstbean.setSwwcjs("0"); rstbean.setSwwcjs("0");
//} }
if(rstbean.getZjcjs()==null||"".equals(rstbean.getZjcjs())){ if(rstbean.getZjcjs()==null||"".equals(rstbean.getZjcjs())){
rstbean.setZjcjs("0"); rstbean.setZjcjs("0");
} }
//if(rstbean.getZjxzcjs()==null||"".equals(rstbean.getZjxzcjs())){ if(rstbean.getZjxzcjs()==null||"".equals(rstbean.getZjxzcjs())){
// rstbean.setZjxzcjs("0"); rstbean.setZjxzcjs("0");
//} }
//if(rstbean.getZjwcjs()==null||"".equals(rstbean.getZjwcjs())){ if(rstbean.getZjwcjs()==null||"".equals(rstbean.getZjwcjs())){
// rstbean.setZjwcjs("0"); rstbean.setZjwcjs("0");
//} }
if(rstbean.getHmcjs()==null||"".equals(rstbean.getHmcjs())){ if(rstbean.getHmcjs()==null||"".equals(rstbean.getHmcjs())){
rstbean.setHmcjs("0"); rstbean.setHmcjs("0");
} }
......
src/main/java/com/founder/service/impl/SequenceServiceImpl.java
...@@ -45,12 +45,12 @@ public class SequenceServiceImpl extends BaseService<Sequence> implements Sequen ...@@ -45,12 +45,12 @@ public class SequenceServiceImpl extends BaseService<Sequence> implements Sequen
sequence.setId(user.getUnitcode() + tableName + df.format(getSystemDateTime()) + "5001"); sequence.setId(user.getUnitcode() + tableName + df.format(getSystemDateTime()) + "5001");
} }
}else{ }else{
maxNo="0001"; maxNo="5001";
sequence.setMaxSeq("0001"); sequence.setMaxSeq("5001");
if (tableName.length() > 10) { if (tableName.length() > 10) {
sequence.setId(user.getUnitcode() + tableName.substring(tableName.length() - 10, tableName.length()) + df.format(getSystemDateTime()) + "0001"); sequence.setId(user.getUnitcode() + tableName.substring(tableName.length() - 10, tableName.length()) + df.format(getSystemDateTime()) + "5001");
} else { } else {
sequence.setId(user.getUnitcode() + tableName + df.format(getSystemDateTime()) + "0001"); sequence.setId(user.getUnitcode() + tableName + df.format(getSystemDateTime()) + "5001");
} }
} }
sequence.setLrr(user.getUsername()); sequence.setLrr(user.getUsername());
...@@ -66,7 +66,8 @@ public class SequenceServiceImpl extends BaseService<Sequence> implements Sequen ...@@ -66,7 +66,8 @@ public class SequenceServiceImpl extends BaseService<Sequence> implements Sequen
if("43".equals(user.getUnitcode().substring(0,2))) { if("43".equals(user.getUnitcode().substring(0,2))) {
maxNo = "5"+("0000"+mxo).substring(("0000"+mxo).length()-3,("0000"+mxo).length()); maxNo = "5"+("0000"+mxo).substring(("0000"+mxo).length()-3,("0000"+mxo).length());
}else{ }else{
maxNo = ("0000"+mxo).substring(("0000"+mxo).length()-4,("0000"+mxo).length()); maxNo = "5"+("0000"+mxo).substring(("0000"+mxo).length()-3,("0000"+mxo).length());
//maxNo = ("0000"+mxo).substring(("0000"+mxo).length()-4,("0000"+mxo).length());
} }
sequence.setMaxSeq(maxNo); sequence.setMaxSeq(maxNo);
sequence.setGxr(user.getUsername()); sequence.setGxr(user.getUsername());
......
src/main/java/com/founder/utils/Utils.java
package com.founder.utils; package com.founder.utils;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.*;
import java.util.Date;
public class Utils { public class Utils {
...@@ -81,4 +82,26 @@ public class Utils { ...@@ -81,4 +82,26 @@ public class Utils {
return date; return date;
} }
public static Map<String, Object> parseJSON2Map(String jsonStr) {
Map<String, Object> map = new HashMap<String, Object>();
//最外层解析
JSONObject json = JSONObject.fromObject(jsonStr);
for (Object k : json.keySet()) {
Object v = json.get(k);
//如果内层还是数组的话，继续解析
if (v instanceof JSONArray) {
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
Iterator<JSONObject> it = ((JSONArray) v).iterator();
while (it.hasNext()) {
JSONObject json2 = it.next();
list.add(parseJSON2Map(json2.toString()));
}
map.put(k.toString(), list);
} else {
map.put(k.toString(), v);
}
}
return map;
}
} }
src/main/resources/application-dev.properties
...@@ -17,9 +17,9 @@ mybatis.mapperLocations=classpath:mapper/*.xml ...@@ -17,9 +17,9 @@ mybatis.mapperLocations=classpath:mapper/*.xml
#协同数据源配置 #协同数据源配置
spring.datasource.xzxtdb.url=jdbc:oracle:thin:@47.92.129.99:1600:XTBA spring.datasource.xzxtdb.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
spring.datasource.xzxtdb.username=YTHCJ spring.datasource.xzxtdb.username=XZXT
spring.datasource.xzxtdb.password=YTHCJ spring.datasource.xzxtdb.password=XZXT
spring.datasource.xzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver spring.datasource.xzxtdb.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.xzxtdb.type: com.alibaba.druid.pool.DruidDataSource spring.datasource.xzxtdb.type: com.alibaba.druid.pool.DruidDataSource
#指纹数据源配置 #指纹数据源配置
......
src/main/resources/mapper/KhtjDao.xml
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
<!-- 按单位分组统计人员采集数(指纹采集数) --> <!-- 按单位分组统计人员采集数(指纹采集数) -->
<select id="getRycjtjListzwcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean"> <select id="getRycjtjListzwcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zwcjs from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) and szzwbh is not null select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zwcjs from TB_RY_RYCJ where (SCBZ='0' or SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and szzwbh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if> <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if> <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
<!-- 按单位分组统计人员采集数(人像采集数) --> <!-- 按单位分组统计人员采集数(人像采集数) -->
<select id="getRycjtjListrxcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean"> <select id="getRycjtjListrxcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) rxcjs from TB_RY_RYCJ select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) rxcjs from TB_RY_RYCJ
where (SCBZ='0' or SCBZ is null) and ZMZPXXBH is not null where (SCBZ='0' or SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and ZMZPXXBH is not null
and CMZPXXBH is not null and CMZPXXBH is not null
and YCMZPXXBH is not null and YCMZPXXBH is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
<!-- 按单位分组统计人员采集数(足迹采集数) --> <!-- 按单位分组统计人员采集数(足迹采集数) -->
<select id="getRycjtjListzjcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean"> <select id="getRycjtjListzjcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zjcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_zj group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and s.swrybh is not null select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) zjcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_zj group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and s.swrybh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if> <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if> <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
...@@ -358,7 +358,7 @@ ...@@ -358,7 +358,7 @@
<!-- 按单位分组统计人员采集数(虹膜采集数) --> <!-- 按单位分组统计人员采集数(虹膜采集数) -->
<select id="getRycjtjListhmcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean"> <select id="getRycjtjListhmcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) hmcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_hm group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and s.swrybh is not null select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) hmcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_hm group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and s.swrybh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if> <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if> <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
...@@ -385,7 +385,7 @@ ...@@ -385,7 +385,7 @@
<!-- 按单位分组统计人员采集数(声纹采集数) --> <!-- 按单位分组统计人员采集数(声纹采集数) -->
<select id="getRycjtjListswcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean"> <select id="getRycjtjListswcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) swcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_sw group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and s.swrybh is not null select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) swcjs from TB_RY_RYCJ p,(select rybh swrybh from tb_xw_ythcj_sw group by rybh) s where p.rybh=s.swrybh(+) and (p.SCBZ='0' or p.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and s.swrybh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if> <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if> <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
...@@ -412,7 +412,7 @@ ...@@ -412,7 +412,7 @@
<!-- 按单位分组统计手机采集(手机应采数) --> <!-- 按单位分组统计手机采集(手机应采数) -->
<select id="getRycjtjListsjycs" parameterType="map" resultType="com.founder.khtj.domain.RstBean"> <select id="getRycjtjListsjycs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12)||'000000000000',1,12) code,count(*) sjycs from TB_RY_RYCJ where (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) select substr(substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12)||'000000000000',1,12) code,count(*) sjycs from TB_RY_RYCJ where (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and (sjbs<![CDATA[<>]]>'0' or sjbs is null)
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if> <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if> <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
<select id="getRycjtjListsjcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean"> <select id="getRycjtjListsjcjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(p.lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) sjcjs from TB_RY_RYCJ p,(select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_LXRXX sjcj where sjcj.SCBZ = '0' group by sjcj.xyrbh) rt, select substr(substr(p.lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) sjcjs from TB_RY_RYCJ p,(select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_LXRXX sjcj where sjcj.SCBZ = '0' group by sjcj.xyrbh) rt,
(select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_FZXYRSJGL sjcj where sjcj.SCBZ = '0' group by sjcj.xyrbh) sj (select sjcj.xyrbh rybh, count(*) iftxlcj from TB_PH_FZXYRSJGL sjcj where sjcj.SCBZ = '0' group by sjcj.xyrbh) sj
where p.rybh = rt.rybh(+) and p.rybh = sj.rybh(+) and (rt.rybh is not null or sj.rybh is not null) and (p.SCBZ='0' or p.SCBZ is null) where p.rybh = rt.rybh(+) and p.rybh = sj.rybh(+) and (rt.rybh is not null and sj.rybh is not null) and (p.SCBZ='0' or p.SCBZ is null) and (p.ifhb is null or p.ifhb<![CDATA[<>]]>'1') and (p.tbbz = '1' or p.tbbz = '2') and (p.sjbs<![CDATA[<>]]>'0' or p.sjbs is null)
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if> <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if> <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
...@@ -441,7 +441,7 @@ ...@@ -441,7 +441,7 @@
and p.rybh=lxrxx.xyrbh(+) and p.rybh=lxrxx.xyrbh(+)
and p.rybh=dxjl.xyrbh(+) and p.rybh=dxjl.xyrbh(+)
and p.rybh=thjl.xyrbh(+) and p.rybh=thjl.xyrbh(+)
and (p.SCBZ='0' or p.SCBZ is null) and (p.SCBZ='0' or p.SCBZ is null) and (p.ifhb is null or p.ifhb<![CDATA[<>]]>'1') and (p.tbbz = '1' or p.tbbz = '2') and (p.sjbs<![CDATA[<>]]>'0' or p.sjbs is null)
and sj.xyrbh is not null and sj.xyrbh is not null
and lxrxx.xyrbh is not null and dxjl.xyrbh is not null and thjl.xyrbh is not null and lxrxx.xyrbh is not null and dxjl.xyrbh is not null and thjl.xyrbh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
<!-- 按单位分组统计人员采集数(DNA采集数) --> <!-- 按单位分组统计人员采集数(DNA采集数) -->
<select id="getRycjtjListdnacjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean"> <select id="getRycjtjListdnacjs" parameterType="map" resultType="com.founder.khtj.domain.RstBean">
select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) dnacjs from TB_RY_RYCJ where (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) and dnabh is not null select substr(substr(lrdwdm,1,${unitgrade})||'000000000000',1,12) code,count(*) dnacjs from TB_RY_RYCJ where (TB_RY_RYCJ.SCBZ='0' or TB_RY_RYCJ.SCBZ is null) and (ifhb is null or ifhb<![CDATA[<>]]>'1') and (tbbz = '1' or tbbz = '2') and dnabh is not null
<if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if> <if test="maxccsj != null and maxccsj != ''"> and lrsj <![CDATA[<]]> to_date(#{maxccsj , jdbcType=VARCHAR },'YYYY-MM-DD')+1</if>
<if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if> <if test="minccsj != null and minccsj != ''"> and lrsj <![CDATA[>=]]> to_date(#{minccsj , jdbcType=VARCHAR },'YYYY-MM-DD')</if>
<if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if> <if test="sqlwhere != null and sqlwhere != ''"> and ${sqlwhere}</if>
......
src/main/resources/static/rygl/js/JsBarcode.all.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/resources/templates/khtj/cxlist.html
...@@ -75,6 +75,55 @@ ...@@ -75,6 +75,55 @@
} }
function doQuery(){ function doQuery(){
var table_title = [ var table_title = [
{title:"操作",field:"scbz",align:'center',color:'gree',width:110,formatter:function(val,row,index){
var rybh=row.rybh;
var xm=row.xm;
var hm=row.hm;
var hmzt;
if(hm==null||hm==""||hm<=0){
hmzt = "0";
}else{
hmzt = "1";
}
var zj=row.zj;
var zjzt;
if(zj==null||zj==""||zj<=0){
zjzt = "0";
}else{
zjzt = "1";
}
var sw=row.sw;
var swzt;
if(sw==null||sw==""||sw<=0){
swzt = "0";
}else{
swzt = "1";
}
var sjjbxx=row.sjjbxx;
var sjlxrxx=row.sjlxrxx;
var sjzt;
if(sjjbxx==null||sjjbxx==""||sjjbxx<=0||sjlxrxx==null||sjlxrxx==""||sjlxrxx<=0){
sjzt = "0";
}else{
sjzt = "1";
}
var yhk=row.yhk;
var yhkzt;
if(yhk==null||yhk==""||yhk<=0){
yhkzt = "0";
}else{
yhkzt = "1";
}
var sswp=row.sswp;
var sswpzt;
if(sswp==null||sswp==""||sswp<=0){
sswpzt = "0";
}else{
sswpzt = "1";
}
//return "<span class='hg-btn' onclick=\"modify('"+rybh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
return "<span class='hg-btn' onclick=\"modify('"+rybh+"','"+hmzt+"','"+zjzt+"','"+swzt+"','"+sjzt+"','"+yhkzt+"','"+sswpzt+"')\">修改</span>";
}},
{title:"人员编号",field:"rybh",align:'left',width:240,formatter:function(val,row,index){ {title:"人员编号",field:"rybh",align:'left',width:240,formatter:function(val,row,index){
var rybh=row.rybh; var rybh=row.rybh;
var xm=row.xm; var xm=row.xm;
...@@ -232,6 +281,20 @@ ...@@ -232,6 +281,20 @@
doQuery(); doQuery();
} }
//修改
function modify(rybh,hmzt,zjzt,swzt,sjzt,yhkzt,sswpzt){
//判断用户是否具有设备采集权限
debugger;
var perurl=$("#perurl").html();
if(perurl.indexOf("sbqx")>=0){
perurl=0
}else{
perurl=1
}
//window.open("openIE:"+$("#webappurl").val()+"/toHome?asjxgrybh="+rybh+","+$("#username").val()+","+perurl);
window.open("/toEditRyxx?asjxgrybh="+rybh+"&perurl="+perurl+"&hmzt="+hmzt+"&zjzt="+zjzt+"&swzt="+swzt+"&sjzt="+sjzt+"&yhkzt="+yhkzt+"&sswpzt="+sswpzt);
}
function doExportExcel(){ function doExportExcel(){
var rybh = $("#rybh").val(); var rybh = $("#rybh").val();
var szzwbh = $("#szzwbh").val(); var szzwbh = $("#szzwbh").val();
......
src/main/resources/templates/khtj/ryxxtj.html
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
title: "采集单位",field:"name",width:200,align:"center",rowspan:2,resizeable:false,halign:'center' title: "采集单位",field:"name",width:200,align:"center",rowspan:2,resizeable:false,halign:'center'
}, // rowspan:2 表示跨两行 }, // rowspan:2 表示跨两行
{ {
title: "总人数",field:"zycs",width:60,align:"center",rowspan:2,resizeable:false,halign:'center', title: "协同总人数",field:"zycs",width:60,align:"center",rowspan:2,resizeable:false,halign:'center',
formatter:function(value,row,index){ formatter:function(value,row,index){
if(row.name=="合计"){ if(row.name=="合计"){
return value; return value;
...@@ -151,27 +151,24 @@ ...@@ -151,27 +151,24 @@
} }
}, },
{ {
title: "指纹采集", order: 2, width: 120, align: "center",colspan:4 title: "指纹采集", order: 4, width: 200, align: "center",colspan:4
}, },
{ {
title: "人像采集", order: 2, width: 120, align: "center",colspan:4 title: "人像采集", order: 4, width: 200, align: "center",colspan:4
}, },
{ {
title: "虹膜采集", order: 2, width: 120, align: "center",colspan:4 title: "虹膜采集", order: 4, width: 200, align: "center",colspan:4
}, },
{ {
title: "足迹采集", order: 2, width: 120, align: "center",colspan:4 title: "足迹采集", order: 4, width: 200, align: "center",colspan:4
},//colspan:2 表示跨两列 },//colspan:2 表示跨两列
{ {
title: "声纹采集", order: 2, width: 120, align: "center",colspan:4 title: "声纹采集", order: 4, width: 200, align: "center",colspan:4
},//colspan:2 表示跨两列 },
{
title: "手机采集", order: 2, width: 120, align: "center",colspan:4
}
], // 第一行表头显示 ], // 第一行表头显示
[ [
{//指纹 {//指纹
title:'采集数',field:'zwcjs',width:60,align:'center',halign:'center', title:'场所采集数',field:'zwcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){ formatter:function(value,row,index){
if(row.name=="合计"){ if(row.name=="合计"){
return value; return value;
...@@ -181,11 +178,31 @@ ...@@ -181,11 +178,31 @@
} }
}, },
{ {
title:'采集率',field:'zwcjl',width:60,align:'center',halign:'center' title:'新增采集数',field:'zwxzcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','zwxzcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
},
{
title:'未采集数',field:'zwwcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','zwwcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
},
{
title:'场所采集率',field:'zwcjl',width:50,align:'center',halign:'center'
}, },
{//人像 {//人像
title:'采集数',field:'rxcjs',width:60,align:'center',halign:'center', title:'场所采集数',field:'rxcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){ formatter:function(value,row,index){
if(row.name=="合计"){ if(row.name=="合计"){
return value; return value;
...@@ -195,11 +212,31 @@ ...@@ -195,11 +212,31 @@
} }
}, },
{ {
title:'采集率',field:'rxcjl',width:60,align:'center',halign:'center' title:'新增采集数',field:'rxxzcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','rxxzcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
},
{
title:'未采集数',field:'rxwcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','rxwcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
},
{
title:'场所采集率',field:'rxcjl',width:50,align:'center',halign:'center'
}, },
{//虹膜 {//虹膜
title:'采集数',field:'hmcjs',width:60,align:'center',halign:'center', title:'场所采集数',field:'hmcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){ formatter:function(value,row,index){
if(row.name=="合计"){ if(row.name=="合计"){
return value; return value;
...@@ -209,11 +246,31 @@ ...@@ -209,11 +246,31 @@
} }
}, },
{ {
title:'采集率',field:'hmcjl',width:60,align:'center',halign:'center' title:'新增采集数',field:'hmxzcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','hmxzcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
},
{
title:'未采集数',field:'hmwcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','hmwcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
},
{
title:'场所采集率',field:'hmcjl',width:50,align:'center',halign:'center'
}, },
{//足迹 {//足迹
title:'采集数',field:'zjcjs',width:60,align:'center',halign:'center', title:'场所采集数',field:'zjcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){ formatter:function(value,row,index){
if(row.name=="合计"){ if(row.name=="合计"){
return value; return value;
...@@ -223,23 +280,31 @@ ...@@ -223,23 +280,31 @@
} }
}, },
{ {
title:'采集率',field:'dnacjl',width:60,align:'center',halign:'center' title:'新增采集数',field:'zjxzcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','zjxzcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
}, },
{//声纹 {
title:'采集数',field:'swcjs',width:60,align:'center',halign:'center', title:'未采集数',field:'zjwcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){ formatter:function(value,row,index){
if(row.name=="合计"){ if(row.name=="合计"){
return value; return value;
}else { }else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','swcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>"; return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','zjwcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
} }
} }
}, },
{ {
title:'采集率',field:'swcjl',width:60,align:'center',halign:'center' title:'场所采集率',field:'dnacjl',width:50,align:'center',halign:'center'
}, },
{//声纹 {//声纹
title:'采集数',field:'sjcjs',width:60,align:'center',halign:'center', title:'场所采集数',field:'swcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){ formatter:function(value,row,index){
if(row.name=="合计"){ if(row.name=="合计"){
return value; return value;
...@@ -249,7 +314,27 @@ ...@@ -249,7 +314,27 @@
} }
}, },
{ {
title:'采集率',field:'sjcjl',width:60,align:'center',halign:'center' title:'新增采集数',field:'swxzcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','swxzcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
},
{
title:'未采集数',field:'swwcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
return value;
}else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('"+row.code+"','"+row.unitgrade+"','swwcjs','"+value+"','"+row.maxccsjStr+"','"+row.minccsjStr+"')>"+value+"</a>";
}
}
},
{
title:'场所采集率',field:'swcjl',width:50,align:'center',halign:'center'
} }
]], ]],
...@@ -268,6 +353,11 @@ ...@@ -268,6 +353,11 @@
pageNumber : 1, pageNumber : 1,
loadFilter: function(data){ loadFilter: function(data){
return data; return data;
},
onLoadSuccess: function(data){
$("#ryxxTable").datagrid("resize",{
width: 2000
});
} }
}); });
} }
......
src/main/resources/templates/khtj/sjlist.html
...@@ -75,6 +75,55 @@ ...@@ -75,6 +75,55 @@
} }
function doQuery(){ function doQuery(){
var table_title = [ var table_title = [
{title:"操作",field:"scbz",align:'center',color:'gree',width:110,formatter:function(val,row,index){
var rybh=row.rybh;
var xm=row.xm;
var hm=row.hm;
var hmzt;
if(hm==null||hm==""||hm<=0){
hmzt = "0";
}else{
hmzt = "1";
}
var zj=row.zj;
var zjzt;
if(zj==null||zj==""||zj<=0){
zjzt = "0";
}else{
zjzt = "1";
}
var sw=row.sw;
var swzt;
if(sw==null||sw==""||sw<=0){
swzt = "0";
}else{
swzt = "1";
}
var sjjbxx=row.sjjbxx;
var sjlxrxx=row.sjlxrxx;
var sjzt;
if(sjjbxx==null||sjjbxx==""||sjjbxx<=0||sjlxrxx==null||sjlxrxx==""||sjlxrxx<=0){
sjzt = "0";
}else{
sjzt = "1";
}
var yhk=row.yhk;
var yhkzt;
if(yhk==null||yhk==""||yhk<=0){
yhkzt = "0";
}else{
yhkzt = "1";
}
var sswp=row.sswp;
var sswpzt;
if(sswp==null||sswp==""||sswp<=0){
sswpzt = "0";
}else{
sswpzt = "1";
}
//return "<span class='hg-btn' onclick=\"modify('"+rybh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
return "<span class='hg-btn' onclick=\"modify('"+rybh+"','"+hmzt+"','"+zjzt+"','"+swzt+"','"+sjzt+"','"+yhkzt+"','"+sswpzt+"')\">修改</span>";
}},
{title:"人员编号",field:"rybh",align:'left',width:240,formatter:function(val,row,index){ {title:"人员编号",field:"rybh",align:'left',width:240,formatter:function(val,row,index){
var rybh=row.rybh; var rybh=row.rybh;
var xm=row.xm; var xm=row.xm;
...@@ -196,6 +245,20 @@ ...@@ -196,6 +245,20 @@
doQuery(); doQuery();
} }
//修改
function modify(rybh,hmzt,zjzt,swzt,sjzt,yhkzt,sswpzt){
//判断用户是否具有设备采集权限
debugger;
var perurl=$("#perurl").html();
if(perurl.indexOf("sbqx")>=0){
perurl=0
}else{
perurl=1
}
//window.open("openIE:"+$("#webappurl").val()+"/toHome?asjxgrybh="+rybh+","+$("#username").val()+","+perurl);
window.open("/toEditRyxx?asjxgrybh="+rybh+"&perurl="+perurl+"&hmzt="+hmzt+"&zjzt="+zjzt+"&swzt="+swzt+"&sjzt="+sjzt+"&yhkzt="+yhkzt+"&sswpzt="+sswpzt);
}
function doExportExcel(){ function doExportExcel(){
var rybh = $("#rybh").val(); var rybh = $("#rybh").val();
var szzwbh = $("#szzwbh").val(); var szzwbh = $("#szzwbh").val();
......
src/main/resources/templates/rygl/dnabqdy.html
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<script type="text/javascript" src="/static/rygl/js/jQuery.print.js"></script> <script type="text/javascript" src="/static/rygl/js/jQuery.print.js"></script>
<script type="text/javascript" src="/static/rygl/js/jquery.jqprint-0.3.js"></script> <script type="text/javascript" src="/static/rygl/js/jquery.jqprint-0.3.js"></script>
<script type="text/javascript" src="/static/rygl/js/jquery-migrate-1.0.0.js"></script> <script type="text/javascript" src="/static/rygl/js/jquery-migrate-1.0.0.js"></script>
<script type="text/javascript" src="/static/rygl/js/JsBarcode.all.js"></script>
<style type="text/css"> <style type="text/css">
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
...@@ -40,6 +41,33 @@ ...@@ -40,6 +41,33 @@
document.getElementById("lrr").innerHTML = window.parent.document.getElementById("lrrXm").value; document.getElementById("lrr").innerHTML = window.parent.document.getElementById("lrrXm").value;
document.getElementById("lrsj").innerHTML = window.parent.document.getElementById("lrsj").value; document.getElementById("lrsj").innerHTML = window.parent.document.getElementById("lrsj").value;
document.getElementById("lxdm").innerHTML = window.parent.document.getElementById("cjRlxdh").value; document.getElementById("lxdm").innerHTML = window.parent.document.getElementById("cjRlxdh").value;
var barcode = document.getElementById('barcode'),
str = window.parent.document.getElementById("rybh").value;
options = {
format:"CODE128",
displayValue:false,
fontSize:18,
height:40
};
JsBarcode(barcode, str, options);
/*
JsBarcode("#svgcode", window.parent.document.getElementById("rybh").value, {
format: "CODE39",//选择要使用的条形码类型
width:3,//设置条之间的宽度
height:40,//高度
//displayValue:true,//是否在条形码下方显示文字
//text:"456",//覆盖显示的文本
fontOptions:"bold italic",//使文字加粗体或变斜体
font:"fantasy",//设置文本的字体
textAlign:"center",//设置文本的水平对齐方式
//textPosition:"top",//设置文本的垂直位置
textMargin:5,//设置条形码和文本之间的间距
fontSize:15,//设置文本的大小
background:"#eee",//设置条形码的背景
lineColor:"#2196f3",//设置条和文本的颜色。
margin:5//设置条形码周围的空白边距
});
*/
} }
//格式化字典 //格式化字典
...@@ -116,6 +144,10 @@ ...@@ -116,6 +144,10 @@
</tr> </tr>
</table> </table>
</div> </div>
<div style="width: 100%;height: 60px;">
<!--<svg id="svgcode"></svg>-->
<img style="margin-top: 10px;margin-left: 10px;" id="barcode"/>
</div>
<div><button id="capture" onclick="jQuery('#jt').print();" style="cursor: pointer;background-color: orange;width: 60px;height: 27px;margin-top: 10px;margin-left: 174px;">打印</button></div> <div><button id="capture" onclick="jQuery('#jt').print();" style="cursor: pointer;background-color: orange;width: 60px;height: 27px;margin-top: 10px;margin-left: 174px;">打印</button></div>
</body> </body>
......
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