Skip to content

H
hnxtbaboot
Commit ad90f045 by wuchengwu
Options

设备管理-设备厂商添加功能修正以及人员统计页面展示字段修改

parent c6ce2f77
Showing with 266 additions and 155 deletions
src/main/java/com/founder/cjqx/dao/SysClientCsMapper.java
......@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Component
@Mapper
......@@ -14,6 +15,7 @@ public interface SysClientCsMapper {
int selectPageCount(SysClientCs sysClientCs);
int saveSysClientCs(SysClientCs sysClientCs);
SysClientCs selectSysClientCs(String id);
SysClientCs selectClientCsCode(Map<String ,String> map);
int updateSysClientCs(SysClientCs sysClientCs);
int deleteSysClientCs(String id);
......
src/main/java/com/founder/cjqx/service/impl/SysClientCsServiceImpl.java
......@@ -5,11 +5,15 @@ import com.founder.cjqx.service.SysClientCsService;
import com.founder.model.ResultMap;
import com.founder.model.SysClientCs;
import com.founder.model.XzxtRestResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.founder.utils.SequenceUtil.getNextId;
......@@ -19,6 +23,7 @@ import static com.founder.utils.SequenceUtil.getNextId;
*/
@Service
public class SysClientCsServiceImpl implements SysClientCsService {
private Logger log= LoggerFactory.getLogger(this.getClass());
@Autowired
private SysClientCsMapper SysClientCsMapper;
......@@ -48,8 +53,17 @@ public class SysClientCsServiceImpl implements SysClientCsService {
@Override
public XzxtRestResult SaveClientCs(SysClientCs SysClientCs) {
Map<String, String> map = new HashMap<>(8);
SysClientCs.setId(getNextId());
SysClientCs.setScbz("0");
cjsblx(map, SysClientCs);
SysClientCs clientCs = SysClientCsMapper.selectClientCsCode(map);
System.err.println("获取已有的厂商信息："+clientCs.toString());
//根据已有设备编号+1
int csCode = Integer.parseInt(clientCs.getSbwhr2()) + 1;
System.err.println("新增后的厂商编号："+csCode);
cjsblxCode(SysClientCs,csCode+"");
log.info("厂商新增参数信息{}",SysClientCs);
int num = SysClientCsMapper.saveSysClientCs(SysClientCs);
XzxtRestResult result = new XzxtRestResult();
if (num == 1) {
......@@ -63,6 +77,62 @@ public class SysClientCsServiceImpl implements SysClientCsService {
}
}
private void cjsblxCode(SysClientCs cs, String code) {
if ("1".equals(cs.getCjsblx())) {
cs.setZwcjycode(code);
} else if ("2".equals(cs.getCjsblx())) {
cs.setEdzydqcode(code);
} else if ("3".equals(cs.getCjsblx())) {
cs.setSgtzzccjycode(code);
} else if ("4".equals(cs.getCjsblx())) {
cs.setSjcjycode(code);
} else if ("5".equals(cs.getCjsblx())) {
cs.setZjcjycode(code);
} else if ("6".equals(cs.getCjsblx())) {
cs.setHmcjycode(code);
} else if ("7".equals(cs.getCjsblx())) {
cs.setSwcjycode(code);
} else if ("8".equals(cs.getCjsblx())) {
cs.setBjcjycode(code);
} else if ("9".equals(cs.getCjsblx())) {
cs.setGpycode(code);
} else if ("10".equals(cs.getCjsblx())) {
cs.setYhkcjycode(code);
} else if ("11".equals(cs.getCjsblx())) {
cs.setDnabqdyjcode(code);
}
}
private void cjsblx(Map<String, String> map, SysClientCs cs) {
if ("1".equals(cs.getCjsblx())) {
map.put("cjsbname", "ZWCJYCODE");
} else if ("2".equals(cs.getCjsblx())) {
map.put("cjsbname", "EDZYDQCODE");
} else if ("3".equals(cs.getCjsblx())) {
map.put("cjsbname", "SGTZZCCJYCODE");
} else if ("4".equals(cs.getCjsblx())) {
map.put("cjsbname", "SJCJYCODE");
} else if ("5".equals(cs.getCjsblx())) {
map.put("cjsbname", "ZJCJYCODE");
} else if ("6".equals(cs.getCjsblx())) {
map.put("cjsbname", "HMCJYCODE");
} else if ("7".equals(cs.getCjsblx())) {
map.put("cjsbname", "SWCJYCODE");
} else if ("8".equals(cs.getCjsblx())) {
map.put("cjsbname", "BJCJYCODE");
} else if ("9".equals(cs.getCjsblx())) {
map.put("cjsbname", "GPYCODE");
} else if ("10".equals(cs.getCjsblx())) {
map.put("cjsbname", "YHKCJYCODE");
} else if ("11".equals(cs.getCjsblx())) {
map.put("cjsbname", "DNABQDYJCODE");
}
map.put("cjsbCode", cs.getCjsblx());
// return map;
}
@Override
public XzxtRestResult SelectClientCs(String id) {
SysClientCs SysClientCs=SysClientCsMapper.selectSysClientCs(id);
......
src/main/java/com/founder/controller/RyfkController.java
......@@ -14,9 +14,7 @@ import com.founder.service.AfisQualityService;
import com.founder.socketio.service.IMessageService;
import com.founder.util.HttpClientUtil;
import com.founder.util.Maputil;
import com.founder.utils.EasyUIPage;
import com.founder.utils.PropertiesUtil;
import com.founder.utils.Qgckzp;
import com.founder.utils.*;
import com.founder.ztry.service.TbywztryService;
import com.founder.ztry.service.impl.TbywztryServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -136,24 +134,29 @@ public class RyfkController {
@GetMapping("/zwbzxxByzjhm")
@ResponseBody
public ResultMap zwbzxxByzjhm(String zjhm,HttpServletRequest request){
String rwbh = "";
int bzcs = 0;
User user =(User)request.getSession().getAttribute("User");
TbZwbzxx tbZwbzxx = new TbZwbzxx();
EasyUIPage easyUIPage = new EasyUIPage();
easyUIPage.setPagePara("10000");
easyUIPage.setEnd(10000);
AfisQualityCk afisQualityCk= new AfisQualityCk();
//根据zjhm查询ryxxlist
ResultMap resultMap=rycjService.getRycjInfoByzjhmorder(zjhm);
List<AutoTbStRy> lryxx = (List<AutoTbStRy>)resultMap.getData();
List<TbXsjszyZwZwbzJbxx> result = new ArrayList<>();
Date date = new Date();
String fbzsj = DateFormatUtils.dateToStr(DateUtil.lastDays(-1));
String ebzsj = DateFormatUtils.dateToStr(date);
for(AutoTbStRy stry : lryxx){
//根据人员编号查询比中任务和比中信息
String zwbh = stry.getSzzwbh();
TbXsjszyZwZwbzJbxx zwbz = new TbXsjszyZwZwbzJbxx();
afisQualityCk = afisQualityService.getAfisQuality(zwbh);
//当为倒查时，指纹编号赋值到原条码中
zwbz.setLa_type("AL");
zwbz.setSrcbarcode(zwbh);
zwbz.setFbzsj(fbzsj);
zwbz.setEbzsj(ebzsj);
EasyUIPage dc=ajswtzService.queryZwbzPage(easyUIPage,zwbz);
if (dc.getRows().size() > 0){
bzcs ++;
......@@ -165,6 +168,8 @@ public class RyfkController {
TbXsjszyZwZwbzJbxx zwbz2 = new TbXsjszyZwZwbzJbxx();
zwbz2.setLa_type("LA");
zwbz2.setDestbarcode(zwbh);
zwbz2.setFbzsj(fbzsj);
zwbz2.setEbzsj(ebzsj);
EasyUIPage zc=ajswtzService.queryZwbzPage(easyUIPage,zwbz2);
if (zc.getRows().size() > 0){
bzcs ++;
......@@ -183,6 +188,9 @@ public class RyfkController {
tbFwXxdl.setXxlx("1");
tbFwXxdl.setXxnr("身份证号码为："+zjhm+"的嫌疑人有指纹比中信息！");
String Message = messageService.sendMessage(tbFwXxdl);
if (Message.indexOf("失败") == -1) {
boolean b = afisQualityService.addAfisQualityRwbh(afisQualityCk);
}
}
}
ResultMap lzwbzMap=new ResultMap();
......
src/main/java/com/founder/model/SysClientCs.java
......@@ -376,4 +376,46 @@ public class SysClientCs extends PageBean{
this.sbwhr2lxdh = sbwhr2lxdh;
}
@Override
public String toString() {
return "SysClientCs{" +
"id='" + id + '\'' +
", cjsblx='" + cjsblx + '\'' +
", cjsbname='" + cjsbname + '\'' +
", zwcjyname='" + zwcjyname + '\'' +
", zwcjycode='" + zwcjycode + '\'' +
", edzydqname='" + edzydqname + '\'' +
", edzydqcode='" + edzydqcode + '\'' +
", sgtzzccjyname='" + sgtzzccjyname + '\'' +
", sgtzzccjycode='" + sgtzzccjycode + '\'' +
", sjcjyname='" + sjcjyname + '\'' +
", sjcjycode='" + sjcjycode + '\'' +
", zjcjyname='" + zjcjyname + '\'' +
", zjcjycode='" + zjcjycode + '\'' +
", hmcjyname='" + hmcjyname + '\'' +
", hmcjycode='" + hmcjycode + '\'' +
", swcjyname='" + swcjyname + '\'' +
", swcjycode='" + swcjycode + '\'' +
", bjcjyname='" + bjcjyname + '\'' +
", bjcjycode='" + bjcjycode + '\'' +
", gpyname='" + gpyname + '\'' +
", gpycode='" + gpycode + '\'' +
", yhkcjyname='" + yhkcjyname + '\'' +
", yhkcjycode='" + yhkcjycode + '\'' +
", dnabqdyjname='" + dnabqdyjname + '\'' +
", dnabqdyjcode='" + dnabqdyjcode + '\'' +
", sbxh='" + sbxh + '\'' +
", jsdjr='" + jsdjr + '\'' +
", jsdjrlxdh='" + jsdjrlxdh + '\'' +
", sbwhr1='" + sbwhr1 + '\'' +
", sbwhr1lxdh='" + sbwhr1lxdh + '\'' +
", sbwhr2='" + sbwhr2 + '\'' +
", sbwhr2lxdh='" + sbwhr2lxdh + '\'' +
", lrsj=" + lrsj +
", gxsj=" + gxsj +
", lrr='" + lrr + '\'' +
", lrdwdm='" + lrdwdm + '\'' +
", scbz='" + scbz + '\'' +
'}';
}
}
\ No newline at end of file
src/main/java/com/founder/utils/SysUitl.java
......@@ -129,7 +129,7 @@ public class SysUitl {
try {
Process p = null;
try {
//String comstr = "nbtstat -A " + ip ;//WINDOW系统使用
// String comstr = "nbtstat -A " + ip ;//WINDOW系统使用
String comstr = "nmblookup -A " + ip ;//LINUX系统使用
p = Runtime.getRuntime().exec(comstr);
} catch (IOException e) {
......
src/main/java/com/founder/utils/Utils.java
......@@ -83,13 +83,13 @@ public class Utils {
if (molecule == null || molecule.equals("") || molecule.equals("0")) {
percentage = "0";
} else if (denominator == null || denominator.equals("") || denominator.equals("0") || denominator.equals(molecule)) {
percentage = "100%";
percentage = "100";
} else {
BigDecimal bd1 = new BigDecimal(denominator);
BigDecimal bd2 = new BigDecimal(molecule);
BigDecimal bd3 = bd2.divide(bd1, 4, BigDecimal.ROUND_HALF_UP);
BigDecimal bd4 = bd3.multiply(new BigDecimal(100)).setScale(2);
percentage = bd4.toString() + "%";
percentage = bd4.toString();
}
return percentage;
}
......
src/main/resources/mapper/SysClientCsMapper.xml
......@@ -50,6 +50,14 @@
AND SCBZ='0'
</where>
</sql>
<!-- 判断设备类型下设备已添加数量-->
<select id="selectClientCsCode" parameterType="map" resultType="com.founder.model.SysClientCs">
select nvl(max(${cjsbname}),0) as sbwhr2 FROM Sys_Client_Cs
where CJSBLX =#{cjsbCode} and scbz = '0'
</select>
<!-- 通过条件分页查询，返回数据集 -->
<select id="selectPageList" parameterType="com.founder.model.SysClientCs" resultMap="BaseResultMap">
SELECT * FROM
......
src/main/resources/templates/cjqx/sbcsglform.html
......@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
<title>设备审批管理</title>
<title>设备厂商管理</title>
<link rel="stylesheet" href="/static//css/font.css">
<link rel="stylesheet" href="/static/fenye/font-awesome.min.css" media="all">
<script type="text/javascript" src="/static/jquery/jquery.min.js"></script>
......@@ -91,6 +91,7 @@
layui.use('table', function(){
var date = new Date();
var table = layui.table;
var index = layer.load(1);
table.render({
elem: '#test'
,url:'sysClientCslist'
......@@ -117,7 +118,16 @@
],
id:'testTableReload',
limit: 10,
page:true
page:true,
done : function(res, curr, count){
//太长title 提示
$("tr td").hover(function() {
$(this).attr("title", $(this).text());
}, function() {
$(this).removeAttr("title");
});
layer.close(index); //返回数据关闭loading
}
});
//根据条件查询表格数据重新加载
......
src/main/resources/templates/cjqx/sbxxform.html
......@@ -76,7 +76,7 @@
<div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
<div class="layui-input-block" style="margin-left:0px !important;">
<button class="layui-btn layui-btn-normal" onclick="return false;" data-type="reload" id="selectbyCondition" >查 询</button>
<button type="reset" class="layui-btn layui-btn-primary">重 置</button>
<button type="reset" class="layui-btn layui-btn-primary" id="rzglReset">重 置</button>
</div>
</div>
</form>
......@@ -165,6 +165,7 @@
layui.use('table', function(){
var date = new Date();
var table = layui.table;
var index = layer.load(1);
table.render({
elem: '#test'
,url:'sysClientVplist'
......@@ -199,7 +200,16 @@
],
id:'testTableReload',
limit: 10,
page:true
page:true,
done : function(res, curr, count){
//太长title 提示
$("tr td").hover(function() {
$(this).attr("title", $(this).text());
}, function() {
$(this).removeAttr("title");
});
layer.close(index); //返回数据关闭loading
}
});
//根据条件查询表格数据重新加载
......@@ -234,6 +244,18 @@
active[type] ? active[type].call(this) : '';
});
//点击搜索按钮根据用户名称查询
$('#rzglReset').on('click',
function(){
openCombotree('ssdwcode');
$("input[name='ssdwcode']").val("");
$('#ssdwcode').combotree('setValue',"");
// $('#ssdwcode').combobox('clear');
// $("#ip").val("");
// $('input[name="sbztstr"]').attr("checked",true);
$("#gxsjStr").val("");
});
//头工具栏事件
table.on('toolbar(test)', function(obj){
var checkStatus = table.checkStatus(obj.config.id);
......@@ -294,7 +316,18 @@
});
/**
* 重置按钮
*/
function reset() {
$('#ip').val("")
openCombotree('ssdwcode');
$("input[name='ssdwcode']").val("");
$('#ssdwcode').combotree('setValue',"");
// $('#startTime').val(""),
// $('#endTime').val("")
// $('#LdjlTable').bootstrapTable('refresh');
}
</script>
</body>
......
src/main/resources/templates/cjqx/sbxzform.html
......@@ -64,7 +64,7 @@
,layer = layui.layer
,laydate = layui.laydate
,form = layui.form;
var index = layer.load(1);
table.render({
elem: '#test'
,url:'xzVplist'
......@@ -73,19 +73,28 @@
,cols: [
[
{type:'numbers', title:'序号',align:'center', width:'5%'}
,{field:'ip', title:'IP地址',align:'center', width:'15%'}
,{field:'lrdwmc', title:'数据采集单位',align:'center', width:'15%'}
{type:'numbers',width:'5%', title:'序号',align:'center', width:'5%'}
,{field:'ip',width:'15%', title:'IP地址',align:'center', width:'15%'}
,{field:'lrdwmc',width:'20%', title:'数据采集单位',align:'center', width:'15%'}
// ,{field:'ifythcjy', title:'是否一体化采集仪',align:'center', width:'8%'}
,{field:'lrr', title:'数据操作用户',align:'center', width:'15%'}
,{field:'rybh', title:'首次采集人员编号',align:'center', width:'20%'}
,{field:'lrsj', title:'首次采集时间',align:'center', width:'20%',templet : "<div>{{layui.util.toDateString(d.lrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'sfzc', title:'是否已注册',align:'center' ,templet: '#ifsbzt', width:'10%'}
,{field:'lrr',width:'10%', title:'数据操作用户',align:'center', width:'15%'}
,{field:'rybh',width:'20%', title:'首次采集人员编号',align:'center', width:'20%'}
,{field:'lrsj',width:'20%', title:'首次采集时间',align:'center', width:'20%',templet : "<div>{{layui.util.toDateString(d.lrsj, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
,{field:'sfzc',width:'10%', title:'是否已注册',align:'center' ,templet: '#ifsbzt', width:'10%'}
]
],
id:'testTableReload',
limit: 10,
page:true
page:true,
done : function(res, curr, count){
//太长title 提示
$("tr td").hover(function() {
$(this).attr("title", $(this).text());
}, function() {
$(this).removeAttr("title");
});
layer.close(index); //返回数据关闭loading
}
});
function initLaydate() {
......
src/main/resources/templates/cjqx/shebcsform.html
......@@ -174,7 +174,7 @@
<!-- <option value="3">新德汇</option>-->
<!-- <option value="4">连腾</option>-->
<!-- </select>-->
<input type="text" id="pps8" name="gpyname" autocomplete="off" class="layui-input"/>
<input type="text" id="pps9" name="gpyname" autocomplete="off" class="layui-input"/>
</div>
</div>
......
src/main/resources/templates/khtj/ryxxtj.html
......@@ -179,7 +179,7 @@
halign: 'center'
}, // rowspan:2 表示跨两行
{
title: "协同总人数",
title: "总人数",
field: "zycs",
width: '4.5%',
align: "center",
......@@ -196,23 +196,6 @@
}
},
{
title: "场所应采数",
field: "ycs",
width: '4.5%',
align: "center",
rowspan: 2,
resizeable: false,
halign: 'center',
formatter: function (value, row, index) {
if (row.name == "合计") {
// return value;
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + nameCode + "','" + row.unitgrade + "','csycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + row.name + "')>" + value + "</a>";
} else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','csycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + null + "')>" + value + "</a>";
}
}
},
{
title: "指纹采集",field: "zw", width: '16.6%', align: "center", colspan: 2
},
{
......@@ -233,7 +216,7 @@
], // 第一行表头显示
[
{//指纹
title: '场所采集数', field: 'zwcjs', width: 50, align: 'center', halign: 'center',
title: '采集数', field: 'zwcjs', width: 50, align: 'center', halign: 'center',
formatter: function (value, row, index) {
if (row.name == "合计") {
// return value;
......@@ -244,11 +227,11 @@
}
},
{
title: '场所采集率', field: 'zwcjl', width: 50, align: 'center', halign: 'center'
title: '采集率', field: 'zwcjl', width: 50, align: 'center', halign: 'center'
},
{//人像
title: '场所采集数', field: 'rxcjs', width: 50, align: 'center', halign: 'center',
title: '采集数', field: 'rxcjs', width: 50, align: 'center', halign: 'center',
formatter: function (value, row, index) {
if (row.name == "合计") {
// return value;
......@@ -259,11 +242,11 @@
}
},
{
title: '场所采集率', field: 'rxcjl', width: 50, align: 'center', halign: 'center'
title: '采集率', field: 'rxcjl', width: 50, align: 'center', halign: 'center'
},
{//虹膜
title: '场所采集数', field: 'hmcjs', width: 50, align: 'center', halign: 'center',
title: '采集数', field: 'hmcjs', width: 50, align: 'center', halign: 'center',
formatter: function (value, row, index) {
if (row.name == "合计") {
// return value;
......@@ -274,11 +257,11 @@
}
},
{
title: '场所采集率', field: 'hmcjl', width: 50, align: 'center', halign: 'center'
title: '采集率', field: 'hmcjl', width: 50, align: 'center', halign: 'center'
},
{//足迹
title: '场所采集数', field: 'zjcjs', width: 50, align: 'center', halign: 'center',
title: '采集数', field: 'zjcjs', width: 50, align: 'center', halign: 'center',
formatter: function (value, row, index) {
if (row.name == "合计") {
// return value;
......@@ -289,11 +272,11 @@
}
},
{
title: '场所采集率', field: 'zjcjl', width: 50, align: 'center', halign: 'center'
title: '采集率', field: 'zjcjl', width: 50, align: 'center', halign: 'center'
},
{//声纹
title: '场所采集数', field: 'swcjs', width: 50, align: 'center', halign: 'center',
title: '采集数', field: 'swcjs', width: 50, align: 'center', halign: 'center',
formatter: function (value, row, index) {
if (row.name == "合计") {
// return value;
......@@ -304,7 +287,7 @@
}
},
{
title: '场所采集率', field: 'swcjl', width: 50, align: 'center', halign: 'center'
title: '采集率', field: 'swcjl', width: 50, align: 'center', halign: 'center'
},
{//手机
title:'采集数',field:'sjcjs',width:60,align:'center',halign:'center',
......@@ -337,9 +320,9 @@
return data;
},
onLoadSuccess: function (data) {
$("#ryxxTable").datagrid("resize", {
width: 2000
});
// $("#ryxxTable").datagrid("resize", {
// width: 2000
// });
dataColumn(check_val);
}
});
......
src/main/resources/templates/khtj/ryxxtjhk.html
......@@ -167,7 +167,7 @@
title: "采集单位",field:"name",width:'16%',align:"center",rowspan:2,resizeable:false,halign:'center'
}, // rowspan:2 表示跨两行
{
title: "协同总人数<br/>（重复人数）",field:"zycs",width:'6%',align:"center",rowspan:2,resizeable:false,halign:'center',
title: "总人数<br/>（重复人数）",field:"zycs",width:'6%',align:"center",rowspan:2,resizeable:false,halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
// return value;
......@@ -178,23 +178,6 @@
}
},
{
title: "场所应采数",
field: "ycs",
width: '4.5%',
align: "center",
rowspan: 2,
resizeable: false,
halign: 'center',
formatter: function (value, row, index) {
if (row.name == "合计") {
// return value;
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + nameCode + "','" + row.unitgrade + "','csycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + row.name + "')>" + value + "</a>";
} else {
return "<a href='javascript:void(0)' style='text-decoration:none;' onclick=showlist('" + row.code + "','" + row.unitgrade + "','csycs','" + value + "','" + row.maxccsjStr + "','" + row.minccsjStr + "','" + null + "')>" + value + "</a>";
}
}
},
{
title: "指纹采集",field: "zw", width: '16.6%', align: "center", colspan: 2
},
{
......@@ -215,7 +198,7 @@
], // 第一行表头显示
[
{//指纹
title:'场所采集数',field:'zwcjs',width:50,align:'center',halign:'center',
title:'采集数',field:'zwcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
// return value;
......@@ -226,11 +209,11 @@
}
},
{
title:'场所采集率',field:'zwcjl',width:50,align:'center',halign:'center'
title:'采集率',field:'zwcjl',width:50,align:'center',halign:'center'
},
{//人像
title:'场所采集数',field:'rxcjs',width:50,align:'center',halign:'center',
title:'采集数',field:'rxcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
// return value;
......@@ -241,11 +224,11 @@
}
},
{
title:'场所采集率',field:'rxcjl',width:50,align:'center',halign:'center'
title:'采集率',field:'rxcjl',width:50,align:'center',halign:'center'
},
{//虹膜
title:'场所采集数',field:'hmcjs',width:50,align:'center',halign:'center',
title:'采集数',field:'hmcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
// return value;
......@@ -256,11 +239,11 @@
}
},
{
title:'场所采集率',field:'hmcjl',width:50,align:'center',halign:'center'
title:'采集率',field:'hmcjl',width:50,align:'center',halign:'center'
},
{//足迹
title:'场所采集数',field:'zjcjs',width:50,align:'center',halign:'center',
title:'采集数',field:'zjcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
// return value;
......@@ -271,11 +254,11 @@
}
},
{
title:'场所采集率',field:'zjcjl',width:50,align:'center',halign:'center'
title:'采集率',field:'zjcjl',width:50,align:'center',halign:'center'
},
{//声纹
title:'场所采集数',field:'swcjs',width:50,align:'center',halign:'center',
title:'采集数',field:'swcjs',width:50,align:'center',halign:'center',
formatter:function(value,row,index){
if(row.name=="合计"){
// return value;
......@@ -286,7 +269,7 @@
}
},
{
title:'场所采集率',field:'swcjl',width:50,align:'center',halign:'center'
title:'采集率',field:'swcjl',width:50,align:'center',halign:'center'
},
{//手机
title:'采集数',field:'sjcjs',width:60,align:'center',halign:'center',
......@@ -319,9 +302,9 @@
return data;
},
onLoadSuccess: function(data){
$("#ryxxTable").datagrid("resize",{
width: 2000
});
// $("#ryxxTable").datagrid("resize",{
// width: 2000
// });
dataColumn(check_val);
}
});
......
src/main/resources/templates/userPower/user.html
......@@ -76,7 +76,7 @@
<div class="layui-form-item" style="clear: both;width: 100%;text-align: center;">
<div class="layui-input-block" style="margin-left:0px !important;">
<button class="layui-btn layui-btn-normal" onclick="return false;" data-type="reload" id="selectbyCondition" >查 询</button>
<button type="reset" class="layui-btn layui-btn-primary">重 置</button>
<button type="reset" class="layui-btn layui-btn-primary" id="rzglReset">重 置</button>
</div>
</div>
</form>
......@@ -185,7 +185,7 @@
,where: {
username: $('#username1').val(),
trueName: $('#trueName').val(),
unitcode:$("#unitcode").val(),
unitcode:$("#unitcode").combobox("getValue"),
userGroup: $("#userGroup1").val()
}
});
......@@ -199,6 +199,17 @@
active[type] ? active[type].call(this) : '';
});
//点击搜索按钮根据用户名称查询
$('#rzglReset').on('click',
function(){
openCombotree('unitcode');
$("input[name='unitcode']").val("");
$('#unitcode').combotree('setValue',"");
// $('#ssdwcode').combobox('clear');
// $("#ip").val("");
// $('input[name="sbztstr"]').attr("checked",true);
$("#gxsjStr").val("");
});
//监听工具条
table.on('tool(test)', function (obj) {
......@@ -253,6 +264,9 @@
// }
});
$(function() {
openCombotree('unitcode');
})
</script>
</body>
......
src/main/resources/templates/zlcc/pfkhxj.html
......@@ -72,7 +72,7 @@
line-height: 26px!important;
}
.inputWidth{
width: 120px!important;
width: 107px!important;
}
</style>
<body>
......@@ -272,12 +272,25 @@ function khnrValue() {
}
$(function(){
$("input[name='rwdx']").val("");
$('#rwkssjStr').val("");
$('#rwjssjStr').val("");
$('#cjrwl').val("");
$('#bzfz').val();
$('#khnr').val();
$('#wcd').val("");
$('#zw').val("");
$('#rx').val("");
$('#hm').val("");
$('#zj').val("");
$('#sw').val("");
$('#sj').val("");
openCombotree('rwdx');
$.ajax({
url:"getAfisScoreAssess?rwbh="+window.parent.document.getElementById("rwbh").value,
type:"POST",
success:function(data){
if (data == null){
if (data == null|| data ==''){
$("input[name='rwdx']").val($("#userunitcode").val());
}else {
if (data.khnr != null && data.khnr !='') {
......@@ -294,6 +307,7 @@ function khnrValue() {
}
khnrValue();
$("input[name='rwdx']").val(data.rwdx);
$('#rwdx').combotree('setValue',data.rwdx);
$('#rwkssjStr').val(data.rwkssjStr);
$('#rwjssjStr').val(data.rwjssjStr);
$('#cjrwl').val(data.cjrwl);
......
src/test/java/com/founder/SysWhgl/LogTest.java deleted 100644 → 0
package com.founder.SysWhgl;
import com.founder.model.SysWhglLog;
import com.founder.sysWhgl.dao.SysWhglLogMapper;
import com.founder.sysWhgl.service.SysWhglLogService;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class LogTest {
@Autowired
private SysWhglLogMapper sysWhglLogMapper;
@Autowired
private SysWhglLogService sysWhglLogService;
@Test
@Ignore
public void queryByBxdw(){
String bxdw = "R4690067400002021035004";
SysWhglLog sysWhglLog=sysWhglLogMapper.queryByBxdw(bxdw);
System.out.println(sysWhglLog);
}
@Test
public void save(){
SysWhglLog sysWhglLog=new SysWhglLog();
sysWhglLog.setBxdw("test");
sysWhglLog.setWhbh("2021-07-13");
sysWhglLog.setBxr("test");
sysWhglLog.setGzxx("test");
boolean save = sysWhglLogService.save(sysWhglLog);
System.out.println(save);
}
}
src/test/java/com/founder/XtbaBootApplicationTests.java deleted 100644 → 0
package com.founder;
import com.cc.utls.MD5Util;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import static com.cc.utls.MD5Util.MD5;
import static com.cc.utls.MD5Util.generate;
import static com.cc.utls.MD5Util.verify;
@RunWith(SpringRunner.class)
@SpringBootTest
public class XtbaBootApplicationTests {
@Test
public void contextLoads() {
System.out.println(MD5Util.MD5("123456"));
String ss = generate("123456");
System.out.println(generate("123456"));
System.out.println("是否是同一字符串："+verify("123456",ss));
}
}
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