Browse Source

执法预警需求调整

v4
chenrui 2 years ago
parent
commit
72e038e5e3
  1. 21
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/project/message/js/wbsUtil.js
  2. 113
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/LawEnforcementWarningList.html
  3. 38
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html
  4. 10
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  5. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml

21
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/project/message/js/wbsUtil.js

@ -7,7 +7,6 @@ var websocketUtil={
websocketUtil._openWebSocket();
//连接发生错误的回调方法
websocket.onerror = function () {
debugger
console.log("WebSocket连接发生错误");
websocketUtil._openWebSocket();
//websocketUtil._init();
@ -18,18 +17,18 @@ var websocketUtil={
websocket.onopen = function () {
websocketUtil._getMes();
}
};
//接收到消息的回调方法
websocket.onmessage = function (event) {
debugger
websocketUtil._getMes();
}
};
//连接关闭的回调方法
websocket.onclose = function () {
//setMessageInnerHTML("WebSocket连接关闭");
}
};
//监听窗口关闭事件,当窗口关闭时,主动去关闭websocket连接,防止连接还没断开就关闭窗口,server端会抛异常。
window.onbeforeunload = function () {
@ -38,7 +37,7 @@ var websocketUtil={
},
//发送消息
_send:function(message){
websocketUtil._openWebSocket()
websocketUtil._openWebSocket();
try {
//发送消息
websocket.addEventListener('open',function(){
@ -82,7 +81,7 @@ var websocketUtil={
},
//获取消息
_getMes:function(){
var data={"receiverId":userId}
var data={"receiverId":userId};
var url="/message/action/getReceiver";
$.ajax({
type: "POST",
@ -102,7 +101,7 @@ var websocketUtil={
_openMSG:function(data){
var width=400;
var height=400;
var title="消息提示"
var title="消息提示";
var content="<p style='margin-left: 10px'> 你小子有点带</p>";
for(var i=0;i<data.length;i++){
title=data[i].messageInfo.title;
@ -123,7 +122,7 @@ var websocketUtil={
shadeClose: false,
offset: 'rb', //右下角弹出
btn1:function (index, layero){
websocketUtil._msgcallback(data[i])
websocketUtil._msgcallback(data[i]);
layer.close(index);
} ,
cancel: function(index, layero) {
@ -137,7 +136,7 @@ var websocketUtil={
//修改消息状态
_msgcallback:function(action) {
var url = ctx + "message/action/upReceiver";
var data = {"id": action.id, "receiverId": userId}
var data = {"id": action.id, "receiverId": userId};
$.ajax({
type: "POST",
url: url,
@ -149,12 +148,12 @@ var websocketUtil={
});
}
}
};
//消息通知
window.onload = function() {
websocketUtil._init(userId);
}
};

113
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/LawEnforcementWarningList.html

@ -2,6 +2,7 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="zdxtInclude :: header('执法预警列表列表')" />
<link type="text/css" href="/css/stat1.css" rel="stylesheet" />
</head>
<body class="gray-bg">
<div class="container-div">
@ -26,7 +27,9 @@
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginWarningTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endWarningTime]"/>
<input type="hidden" name="currentMonth">
</li>
<li>
<a class="btn btn-success btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -36,21 +39,14 @@
</form>
</div>
<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="code:LawEnforcementWarningList:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="code:LawEnforcementWarningList:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="code:LawEnforcementWarningList:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="code:LawEnforcementWarningList:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
<!-- </div>-->
<div class="btn-group-sm" id="toolbar" role="group" style="color: orange">
当月累计接受行政检查三至四次为黄色提示,五至六次为橙色提示,七次及以上为红色提示。
</div>
<div class="col-sm-12 select-table table-bordered">
<div id="detail2" class="detail-list" style="width: 75%;margin-top: 10%">
<span id="closeButton2" class="detail-close" onclick="closeUnite()">×</span>
<table id="bootstrap-table3"></table>
</div>
<table id="bootstrap-table"></table>
</div>
</div>
@ -59,8 +55,15 @@
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('code:LawEnforcementWarningList:edit')}]];
var prefix = ctx + "code/LawEnforcementWarningList";
var warnLevel = [[${@dict.getType('warnLevel')}]]
var prefix2 = ctx + "code/registration";
var warnLevel = [[${@dict.getType('warnLevel')}]];
$(function() {
$('#detail2').hide();
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
console.log(year + "-" + month);
$("input[name='currentMonth']").val(year + "-" + month);
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
@ -73,18 +76,29 @@
showColumns: false,
showRefresh: false,
showToggle: false,
columns: [{
checkbox: true
},
columns: [
{
field : 'id',
title : '主键ID',
visible: false
},
{
field : 'warningTime',
field : 'warningTime',
title : '预警时间'
},
{
field : 'enforcementNumber',
title : '检查次数',
formatter:function (value,row,index) {
return "<span style='cursor: pointer;color: green'" +
" onclick='selectUnite(\""+row.enterpriseNumber+ "\",\""+row.beginTime+ "\",\""+row.endTime+ "\")'>" +value+ "</span>";
// ,' + row.beginTime + ',' + row.endTime +"
}
},
{
field : 'enterpriseName',
title : '企业名称'
},
{
field : 'warningLevel',
title : '预警等级',
@ -95,16 +109,12 @@
// return warnLevel[i].dictLabel
// }
if(value == warnLevel[i].dictValue){
var color=map.get(warnLevel[i].dictValue)
var color=map.get(warnLevel[i].dictValue);
return '<a style="'+color+'"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i>'+' '+warnLevel[i].dictLabel+'</a>'
}
}
}
},
{
field : 'enterpriseName',
title : '企业名称'
},
{
field : 'warningCause',
title : '预警原因'
@ -128,14 +138,65 @@
["2","color:#e7880e"],
["3","color:#edc41e"],
["4","color:#5195fe"],
])
]);
return map;
}
function detail(dictId) {
console.log(dictId)
console.log(dictId);
var url = prefix + '/registrationDetail/' + dictId;
$.modal.openTab("字典数据", url);
}
function selectUnite(value,beginTime,endTime){
console.log(value);
$.ajax({
url: prefix2 +'/listWarn',
type:'POST',
data:{
enterpriseNumber: value,
beginTime: beginTime,
endTime: endTime,
},
success: function (response) {
$('#detail2').show();
$('#bootstrap-table3').bootstrapTable('load', response);
}
})
}
function closeUnite(){
$('#detail2').hide();
}
$(function() {
var options = {
showHeader: true,
showFooter: false,
showColumns: false,
showRefresh: false,
showToggle: false,
pagination: true,
pageSize: 10,
pageList: [10, 25, 50],
columns: [
{
field : 'id',
title : '主键ID',
visible: false
},
{
field : 'bureauDeptName',
title : '执法部门'
},
{
field : 'lawEnforcementItemText',
title : '执法事项'
},
{
field : 'enforcementTime',
title : '执法时间'
},]
};
$("#bootstrap-table3").bootstrapTable(options);
});
</script>
</body>
</html>

38
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html

@ -49,13 +49,14 @@
$(function() {
var options = {
url: prefix + "/list",
url: prefix + "/listWarn",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
detailUrl: prefix + "/detail/{id}",
exportUrl: prefix + "/export",
modalName: "企业端-执法部门预约记录",
height: $(window).height() - 150,
showHeader: false,
showFooter: false,
showColumns: false,
@ -70,11 +71,7 @@
visible: false
},
{
field : 'lawEnforcementCode',
title : '登记编号'
},
{
field : 'lawEnforcement',
field : 'bureauDeptName',
title : '执法部门'
},
{
@ -86,8 +83,8 @@
title : '企业税号'
},
{
field : 'enforcementTime',
title : '执法时间'
field : 'lawEnforcementItemText',
title : '执法事项'
},
{
field : 'lawEnforcer',
@ -97,30 +94,11 @@
}
},
{
field : 'lawEnforcerTel',
title : '执法人员联系方式',
formatter:function (value,row,index) {
return (value != null && value != "" ? value : "") +
( row.lawEnforcerTelTwo != "" && row.lawEnforcerTelTwo !=null? "," + row.lawEnforcerTelTwo : "");
}
},
{
field : 'lawEnforcementItemText',
title : '执法事项'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a>');
return actions.join('');
}
}]
field : 'enforcementTime',
title : '执法时间'
},]
};
$.table.init(options);
});
</script>
</body>

10
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@ -114,15 +114,15 @@ public class EnforcementRegistrationController extends BaseController
/**
* 查询执法端-执法登记列表
*/
/*@RequiresPermissions("code:registration:list")
@PostMapping("/list")
@RequiresPermissions("code:registration:list")
@PostMapping("/listWarn")
@ResponseBody
public TableDataInfo list(EnforcementRegistration enforcementRegistration)
public TableDataInfo listWarn(EnforcementRegistration enforcementRegistration)
{
startPage();
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
return getDataTable(list);
}*/
}
@RequiresPermissions("code:registration:list")
@PostMapping("/list")
@ResponseBody

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml

@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and DATE_FORMAT(warning_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y')
</if>
</where>
ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000
ORDER BY enforcement_number DESC,create_time DESC LIMIT 1000000000
) t GROUP BY t.enterprise_number order by t.create_time desc
</select>
<!--<select id="selectLawEnforcementWarningListList1" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">

Loading…
Cancel
Save