Merge branch 'dev_change_0818' into dev
commit
c47dec3320
|
|
@ -30,3 +30,4 @@ replay_pid*
|
||||||
/web-client/target/
|
/web-client/target/
|
||||||
/web-adapter/target/
|
/web-adapter/target/
|
||||||
/start/target/
|
/start/target/
|
||||||
|
/start/src/main/resources/templates/
|
||||||
|
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/7/28 16:48:49) App/fireCheck"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>秦港安全监管平台</title><script>(function () {
|
|
||||||
const APP_ENV = {
|
|
||||||
antd: {
|
|
||||||
'ant-prefix': 'micro-temp',
|
|
||||||
fontFamily: 'PingFangSC-Regular',
|
|
||||||
colorPrimary: '#1677ff',
|
|
||||||
borderRadius: parseInt('2')
|
|
||||||
},
|
|
||||||
appKey: '',
|
|
||||||
basename: 'fireCheck',
|
|
||||||
API_HOST: ''
|
|
||||||
};
|
|
||||||
APP_ENV.API_HOST = sessionStorage.API_HOST || APP_ENV.API_HOST || window.location.origin;
|
|
||||||
window.process = {
|
|
||||||
env: { app: APP_ENV },
|
|
||||||
NODE_ENV: 'production'
|
|
||||||
};
|
|
||||||
window.__JJB_ENVIRONMENT__ = {
|
|
||||||
API_HOST: APP_ENV.API_HOST,
|
|
||||||
redirect: '',
|
|
||||||
FRAMEWORK: APP_ENV.antd
|
|
||||||
};
|
|
||||||
})();</script><script defer="defer" src="/fireCheck/static/js/201.9d4d48ed85dbd20c30f6.js"></script><script defer="defer" src="/fireCheck/static/js/514.cbbdb1f566e234e3ebed.js"></script><script defer="defer" src="/fireCheck/static/js/main.e0c5ce72dc8c82f0bb1b.js"></script><link href="/fireCheck/static/css/main.4351c3e506121e95b980.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/7/28 16:48:49) App/fireCheck Version/main Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB |
|
|
@ -1 +0,0 @@
|
||||||
module.exports={compact:!1,plugins:[["@babel/plugin-proposal-decorators",{legacy:!0}]],presets:[["@babel/preset-env",{targets:{browsers:["ie >= 10"]}}],["@babel/preset-react",{runtime:"automatic"}]]};
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"fireCheck",contextInject:{appKey:"",fileUrl:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8088",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,114 +0,0 @@
|
||||||
/*!
|
|
||||||
Copyright (c) 2018 Jed Watson.
|
|
||||||
Licensed under the MIT License (MIT), see
|
|
||||||
http://jedwatson.github.io/classnames
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* is-plain-object <https://github.com/jonschlinkert/is-plain-object>
|
|
||||||
*
|
|
||||||
* Copyright (c) 2014-2017, Jon Schlinkert.
|
|
||||||
* Released under the MIT License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @license React
|
|
||||||
* react-is.production.min.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** @preserve
|
|
||||||
* Counter block mode compatible with Dr Brian Gladman fileenc.c
|
|
||||||
* derived from CryptoJS.mode.CTR
|
|
||||||
* Jan Hruby jhruby.web@gmail.com
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** @preserve
|
|
||||||
(c) 2012 by Cédric Mesnil. All rights reserved.
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
||||||
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
|
||||||
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
|
|
||||||
/** */
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,98 +0,0 @@
|
||||||
/*!
|
|
||||||
* isobject <https://github.com/jonschlinkert/isobject>
|
|
||||||
*
|
|
||||||
* Copyright (c) 2014-2017, Jon Schlinkert.
|
|
||||||
* Released under the MIT License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* screenfull
|
|
||||||
* v5.2.0 - 2021-11-03
|
|
||||||
* (c) Sindre Sorhus; MIT License
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @license React
|
|
||||||
* react-dom.production.min.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @license React
|
|
||||||
* react-is.production.min.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @license React
|
|
||||||
* react-jsx-runtime.production.min.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @license React
|
|
||||||
* react.production.min.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @license React
|
|
||||||
* scheduler.production.min.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @license React
|
|
||||||
* use-sync-external-store-shim.production.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @license qrcode.react
|
|
||||||
* Copyright (c) Paul O'Shannessy
|
|
||||||
* SPDX-License-Identifier: ISC
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** @license React v16.13.1
|
|
||||||
* react-is.production.min.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** @license React v17.0.2
|
|
||||||
* react-is.production.min.js
|
|
||||||
*
|
|
||||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
||||||
*
|
|
||||||
* This source code is licensed under the MIT license found in the
|
|
||||||
* LICENSE file in the root directory of this source tree.
|
|
||||||
*/
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1 +0,0 @@
|
||||||
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
|
|
||||||
|
|
@ -1,50 +0,0 @@
|
||||||
{
|
|
||||||
"name": "micro-app",
|
|
||||||
"version": "2.0.0",
|
|
||||||
"description": "建教帮微应用模板",
|
|
||||||
"author": "JJB",
|
|
||||||
"license": "MIT",
|
|
||||||
"main": "index.js",
|
|
||||||
"scripts": {
|
|
||||||
"serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js",
|
|
||||||
"build": "node node_modules/@cqsjjb/scripts/webpack.build.js",
|
|
||||||
"push": "jjb-cmd push java production",
|
|
||||||
"clean-cache": "rimraf node_modules/.cache/webpack",
|
|
||||||
"serve:development": "cross-env NODE_ENV=development npm run serve",
|
|
||||||
"serve:production": "cross-env NODE_ENV=production npm run serve",
|
|
||||||
"build:development": "cross-env NODE_ENV=development npm run build",
|
|
||||||
"build:production": "cross-env NODE_ENV=production npm run build",
|
|
||||||
"code-optimization": "node node_modules/@cqsjjb/scripts/code-optimization.js",
|
|
||||||
"lint": "eslint --ext .js,.jsx,.tsx --fix src"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@ant-design/icons": "latest",
|
|
||||||
"@ant-design/pro-components": "^2.8.10",
|
|
||||||
"@cqsjjb/jjb-common-decorator": "latest",
|
|
||||||
"@cqsjjb/jjb-common-lib": "latest",
|
|
||||||
"@cqsjjb/jjb-dva-runtime": "latest",
|
|
||||||
"@cqsjjb/jjb-react-admin-component": "latest",
|
|
||||||
"ahooks": "^3.9.5",
|
|
||||||
"antd": "latest",
|
|
||||||
"antd-mobile": "^5.42.3",
|
|
||||||
"dayjs": "^1.11.7",
|
|
||||||
"lodash-es": "^4.17.21",
|
|
||||||
"qrcode.react": "^4.2.0",
|
|
||||||
"react": "^18.2.0",
|
|
||||||
"react-dom": "^18.2.0",
|
|
||||||
"react-to-print": "^3.2.0",
|
|
||||||
"zy-react-library": "^1.2.23"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@antfu/eslint-config": "^5.4.1",
|
|
||||||
"@babel/plugin-proposal-decorators": "^7.19.3",
|
|
||||||
"@cqsjjb/scripts": "latest",
|
|
||||||
"@eslint-react/eslint-plugin": "^2.2.2",
|
|
||||||
"cross-env": "^7.0.3",
|
|
||||||
"eslint": "^9.37.0",
|
|
||||||
"eslint-plugin-format": "^1.0.2",
|
|
||||||
"eslint-plugin-react-hooks": "^7.0.0",
|
|
||||||
"eslint-plugin-react-refresh": "^0.4.23",
|
|
||||||
"typescript": "^5.9.3"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -33,6 +33,13 @@ public class AppFireCheckListController {
|
||||||
public PageResponse<FireCheckListCO> checkList(@RequestBody FireCheckListPageQry qry) {
|
public PageResponse<FireCheckListCO> checkList(@RequestBody FireCheckListPageQry qry) {
|
||||||
return fireCheckListService.appCheckList(qry);
|
return fireCheckListService.appCheckList(qry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation("根据点位获取个人检查清单数量")
|
||||||
|
@PostMapping("/pointCheckListCount")
|
||||||
|
public SingleResponse<PointCheckListCountCO> pointCheckListCount(@RequestBody @Validated PointCheckListCountQry qry) {
|
||||||
|
return SingleResponse.of(fireCheckListService.pointCheckListCount(qry));
|
||||||
|
}
|
||||||
|
|
||||||
@ApiOperation("获取待排查数量和打回数量")
|
@ApiOperation("获取待排查数量和打回数量")
|
||||||
@PostMapping("/checkListCount")
|
@PostMapping("/checkListCount")
|
||||||
public SingleResponse<Integer> checkListCount(@RequestBody FireCheckListPageQry qry) {
|
public SingleResponse<Integer> checkListCount(@RequestBody FireCheckListPageQry qry) {
|
||||||
|
|
|
||||||
|
|
@ -76,6 +76,14 @@ public class FireCheckListQueryExe {
|
||||||
private MessageFacade messageFacade;
|
private MessageFacade messageFacade;
|
||||||
private MessageConfig messageConfig;
|
private MessageConfig messageConfig;
|
||||||
|
|
||||||
|
public PointCheckListCountCO pointCheckListCount(PointCheckListCountQry qry) {
|
||||||
|
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
|
||||||
|
PointCheckListCountDO countDO = fireCheckListRepository.pointCheckListCount(params);
|
||||||
|
PointCheckListCountCO countCO = new PointCheckListCountCO();
|
||||||
|
BeanUtils.copyProperties(countDO, countCO);
|
||||||
|
return countCO;
|
||||||
|
}
|
||||||
|
|
||||||
public PageResponse<FireCheckListScreenCO> screenList(FireCheckListScreenQry qry) {
|
public PageResponse<FireCheckListScreenCO> screenList(FireCheckListScreenQry qry) {
|
||||||
if (qry == null) {
|
if (qry == null) {
|
||||||
qry = new FireCheckListScreenQry();
|
qry = new FireCheckListScreenQry();
|
||||||
|
|
@ -196,6 +204,32 @@ public class FireCheckListQueryExe {
|
||||||
fireCheckListCO.setCheckStartTime(info.getPeriodStart());
|
fireCheckListCO.setCheckStartTime(info.getPeriodStart());
|
||||||
fireCheckListCO.setCheckEndTime(info.getPeriodEnd());
|
fireCheckListCO.setCheckEndTime(info.getPeriodEnd());
|
||||||
fireCheckListCO.setUserName(fireCheckListUserDONameMap.getOrDefault(fireCheckListCO.getFireCheckId(), ""));
|
fireCheckListCO.setUserName(fireCheckListUserDONameMap.getOrDefault(fireCheckListCO.getFireCheckId(), ""));
|
||||||
|
|
||||||
|
List<FireCheckStandardStatisticDO> standardList = fireCheckStandardRepository
|
||||||
|
.getDeviceStandardList(fireCheckListCO.getFireCheckId());
|
||||||
|
if (CollUtil.isEmpty(standardList)) {
|
||||||
|
fireCheckListCO.setStandardFlag(false);
|
||||||
|
fireCheckListCO.setStandardMessage("请维护点检设备的检查标准");
|
||||||
|
} else {
|
||||||
|
List<FireCheckStandardStatisticDO> missingStandardList = standardList.stream()
|
||||||
|
.filter(standard -> standard.getStatisticCount() == null || standard.getStatisticCount() == 0)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
if (CollUtil.isEmpty(missingStandardList)) {
|
||||||
|
fireCheckListCO.setStandardFlag(true);
|
||||||
|
fireCheckListCO.setStandardMessage("");
|
||||||
|
} else {
|
||||||
|
List<String> missingStandardDeviceTypeNames = missingStandardList.stream()
|
||||||
|
.map(FireCheckStandardStatisticDO::getFireDeviceTypeName)
|
||||||
|
.filter(StringUtils::isNotEmpty)
|
||||||
|
.distinct()
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
fireCheckListCO.setStandardFlag(false);
|
||||||
|
String standardMessage = CollUtil.isEmpty(missingStandardDeviceTypeNames)
|
||||||
|
? "请维护点检设备的检查标准"
|
||||||
|
: String.join("、", missingStandardDeviceTypeNames) + "无检查标准，无法检查";
|
||||||
|
fireCheckListCO.setStandardMessage(standardMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,11 @@ public class FireCheckListServiceImpl implements FireCheckListServiceI {
|
||||||
return fireCheckListQueryExe.screenList(qry);
|
return fireCheckListQueryExe.screenList(qry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PointCheckListCountCO pointCheckListCount(PointCheckListCountQry qry) {
|
||||||
|
return fireCheckListQueryExe.pointCheckListCount(qry);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResponse<FireCheckListCO> listPage(FireCheckListPageQry qry) {
|
public PageResponse<FireCheckListCO> listPage(FireCheckListPageQry qry) {
|
||||||
return fireCheckListQueryExe.execute(qry);
|
return fireCheckListQueryExe.execute(qry);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ import java.util.Map;
|
||||||
public interface FireCheckListServiceI {
|
public interface FireCheckListServiceI {
|
||||||
PageResponse<FireCheckListScreenCO> screenList(FireCheckListScreenQry qry);
|
PageResponse<FireCheckListScreenCO> screenList(FireCheckListScreenQry qry);
|
||||||
|
|
||||||
|
PointCheckListCountCO pointCheckListCount(PointCheckListCountQry qry);
|
||||||
|
|
||||||
PageResponse<FireCheckListCO> listPage(FireCheckListPageQry qry);
|
PageResponse<FireCheckListCO> listPage(FireCheckListPageQry qry);
|
||||||
|
|
||||||
SingleResponse<FireCheckListCO> add(FireCheckListAddCmd cmd);
|
SingleResponse<FireCheckListCO> add(FireCheckListAddCmd cmd);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
package com.zcloud.fire.check.dto;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* App点位检查清单数量查询参数
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class PointCheckListCountQry implements Serializable {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "消防点位id", name = "firePointId", required = true)
|
||||||
|
@NotEmpty(message = "消防点位id不能为空")
|
||||||
|
private String firePointId;
|
||||||
|
}
|
||||||
|
|
@ -84,5 +84,12 @@ public class FireCheckListCO extends ClientObject {
|
||||||
|
|
||||||
@ApiModelProperty(value = "检查人员列表")
|
@ApiModelProperty(value = "检查人员列表")
|
||||||
private List<FireCheckListUserCO> fireCheckListUserCOList;
|
private List<FireCheckListUserCO> fireCheckListUserCOList;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "是否有检查标准")
|
||||||
|
private Boolean standardFlag;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "无检查标准的描述")
|
||||||
|
private String standardMessage;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
package com.zcloud.fire.check.dto.clientobject;
|
||||||
|
|
||||||
|
import com.alibaba.cola.dto.ClientObject;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* App点位检查清单数量
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class PointCheckListCountCO extends ClientObject {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "已完成数量")
|
||||||
|
private Long completedCount;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "未排查数量")
|
||||||
|
private Long uncheckedCount;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "已打回数量")
|
||||||
|
private Long backCount;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
package com.zcloud.fire.check.persistence.dataobject;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* App点位检查清单数量数据对象
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class PointCheckListCountDO {
|
||||||
|
|
||||||
|
private Long completedCount;
|
||||||
|
|
||||||
|
private Long uncheckedCount;
|
||||||
|
|
||||||
|
private Long backCount;
|
||||||
|
}
|
||||||
|
|
@ -7,9 +7,11 @@ import com.jjb.saas.framework.datascope.annotation.DataScopes;
|
||||||
import com.zcloud.fire.check.domain.model.DateTimeE;
|
import com.zcloud.fire.check.domain.model.DateTimeE;
|
||||||
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
|
import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
|
||||||
|
import com.zcloud.fire.check.persistence.dataobject.PointCheckListCountDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.PointDistributionDO;
|
import com.zcloud.fire.check.persistence.dataobject.PointDistributionDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
|
import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
@ -30,6 +32,9 @@ public interface FireCheckListMapper extends BaseMapper<FireCheckListDO> {
|
||||||
|
|
||||||
IPage<FireCheckListDO> screenList(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE);
|
IPage<FireCheckListDO> screenList(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE);
|
||||||
|
|
||||||
|
PointCheckListCountDO pointCheckListCount(@Param("params") Map<String, Object> params,
|
||||||
|
@Param("dateTimeE") DateTimeE dateTimeE);
|
||||||
|
|
||||||
FireCheckListDO getInfoById(Long id);
|
FireCheckListDO getInfoById(Long id);
|
||||||
|
|
||||||
IPage<FireCheckListDO> listPage(IPage<FireCheckListDO> iPage, Map<String, Object> params, String menuPerms);
|
IPage<FireCheckListDO> listPage(IPage<FireCheckListDO> iPage, Map<String, Object> params, String menuPerms);
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse;
|
||||||
import com.jjb.saas.framework.repository.repo.BaseRepository;
|
import com.jjb.saas.framework.repository.repo.BaseRepository;
|
||||||
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
|
import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
|
||||||
|
import com.zcloud.fire.check.persistence.dataobject.PointCheckListCountDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.PointDistributionDO;
|
import com.zcloud.fire.check.persistence.dataobject.PointDistributionDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
|
import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
@ -20,6 +21,8 @@ import java.util.Map;
|
||||||
public interface FireCheckListRepository extends BaseRepository<FireCheckListDO> {
|
public interface FireCheckListRepository extends BaseRepository<FireCheckListDO> {
|
||||||
PageResponse<FireCheckListDO> screenList(Map<String, Object> params);
|
PageResponse<FireCheckListDO> screenList(Map<String, Object> params);
|
||||||
|
|
||||||
|
PointCheckListCountDO pointCheckListCount(Map<String, Object> params);
|
||||||
|
|
||||||
PageResponse<FireCheckListDO> listPage(Map<String, Object> params);
|
PageResponse<FireCheckListDO> listPage(Map<String, Object> params);
|
||||||
|
|
||||||
FireCheckListDO getInfoById(Long id);
|
FireCheckListDO getInfoById(Long id);
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ import com.zcloud.fire.check.domain.model.DateTimeE;
|
||||||
import com.zcloud.fire.check.domain.model.FireCheckListE;
|
import com.zcloud.fire.check.domain.model.FireCheckListE;
|
||||||
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
import com.zcloud.fire.check.persistence.FireCheckPointListDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
|
import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
|
||||||
|
import com.zcloud.fire.check.persistence.dataobject.PointCheckListCountDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.PointDistributionDO;
|
import com.zcloud.fire.check.persistence.dataobject.PointDistributionDO;
|
||||||
import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
|
import com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO;
|
||||||
import com.zcloud.fire.check.persistence.mapper.FireCheckListMapper;
|
import com.zcloud.fire.check.persistence.mapper.FireCheckListMapper;
|
||||||
|
|
@ -48,6 +49,14 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl<FireCheckLis
|
||||||
return PageHelper.pageToResponse(result, result.getRecords());
|
return PageHelper.pageToResponse(result, result.getRecords());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PointCheckListCountDO pointCheckListCount(Map<String, Object> params) {
|
||||||
|
params.put("corpinfoId", AuthContext.getTenantId());
|
||||||
|
params.put("userId", AuthContext.getUserId());
|
||||||
|
DateTimeE dateTimeE = new FireCheckListE().getCheckRecordInterval(null);
|
||||||
|
return fireCheckListMapper.pointCheckListCount(params, dateTimeE);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResponse<FireCheckListDO> listPage(Map<String, Object> params) {
|
public PageResponse<FireCheckListDO> listPage(Map<String, Object> params) {
|
||||||
IPage<FireCheckListDO> iPage = new Query<FireCheckListDO>().getPage(params);
|
IPage<FireCheckListDO> iPage = new Query<FireCheckListDO>().getPage(params);
|
||||||
|
|
|
||||||
|
|
@ -142,6 +142,59 @@
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="pointCheckListCount" resultType="com.zcloud.fire.check.persistence.dataobject.PointCheckListCountDO">
|
||||||
|
select COALESCE(SUM(case when statistic.checkedCount > 0 then 1 else 0 end), 0) as completedCount,
|
||||||
|
COALESCE(SUM(case when statistic.fireCheckType = 'fireCheckPeriod0009' or statistic.checkedCount = 0 then 1 else 0 end), 0) as uncheckedCount,
|
||||||
|
COALESCE(SUM(case when statistic.backCount > 0 then 1 else 0 end), 0) as backCount
|
||||||
|
from (
|
||||||
|
select cl.fire_check_id as fireCheckId,
|
||||||
|
cl.fire_check_type as fireCheckType,
|
||||||
|
COUNT(DISTINCT cr.id) as checkedCount,
|
||||||
|
MAX(case when backInfo.fireCheckId is not null then 1 else 0 end) as backCount
|
||||||
|
from fire_check_list cl
|
||||||
|
inner join fire_check_list_item cli
|
||||||
|
on cl.fire_check_id = cli.fire_check_id
|
||||||
|
and cli.fire_point_id = #{params.firePointId}
|
||||||
|
inner join fire_check_list_user fclu
|
||||||
|
on cl.fire_check_id = fclu.fire_check_id
|
||||||
|
and fclu.user_id = #{params.userId}
|
||||||
|
left join fire_check_record cr
|
||||||
|
on cl.fire_check_id = cr.fire_check_id
|
||||||
|
and cr.delete_enum = 'FALSE'
|
||||||
|
and cr.finished_flag = 1
|
||||||
|
and (
|
||||||
|
(cl.fire_check_type = 'fireCheckPeriod0001' and cr.check_time <![CDATA[>=]]> #{dateTimeE.dayStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.dayEndTime})
|
||||||
|
or (cl.fire_check_type = 'fireCheckPeriod0002' and cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime})
|
||||||
|
or (cl.fire_check_type = 'fireCheckPeriod0003' and cr.check_time <![CDATA[>=]]> #{dateTimeE.tenDaysStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.tenDaysEndTime})
|
||||||
|
or (cl.fire_check_type = 'FireCheckPeriod0004' and cr.check_time <![CDATA[>=]]> #{dateTimeE.monthlyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.monthlyEndTime})
|
||||||
|
or (cl.fire_check_type = 'fireCheckPeriod0005' and cr.check_time <![CDATA[>=]]> #{dateTimeE.quarterlyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.quarterlyEndTime})
|
||||||
|
or (cl.fire_check_type = 'fireCheckPeriod0006' and cr.check_time <![CDATA[>=]]> #{dateTimeE.yearlyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.yearlyEndTime})
|
||||||
|
or (cl.fire_check_type = 'fireCheckPeriod0007' and cr.check_time <![CDATA[>=]]> #{dateTimeE.halfYearStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.halfYearEndTime})
|
||||||
|
or (cl.fire_check_type = 'fireCheckPeriod0008' and cr.check_time <![CDATA[>=]]> #{dateTimeE.halfMonthStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.halfMonthEndTime})
|
||||||
|
or (cl.fire_check_type = 'fireCheckPeriod0009' and cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime})
|
||||||
|
)
|
||||||
|
left join (
|
||||||
|
select backRecord.fire_check_id as fireCheckId
|
||||||
|
from fire_check_record backRecord
|
||||||
|
inner join fire_check_record_point crp
|
||||||
|
on backRecord.fire_record_id = crp.fire_record_id
|
||||||
|
and crp.delete_enum = 'FALSE'
|
||||||
|
and crp.fire_point_id = #{params.firePointId}
|
||||||
|
inner join fire_check_record_device crd
|
||||||
|
on backRecord.fire_record_id = crd.fire_record_id
|
||||||
|
and crp.fire_record_point_id = crd.fire_record_point_id
|
||||||
|
and crd.delete_enum = 'FALSE'
|
||||||
|
and crd.checked_flag = 2
|
||||||
|
where backRecord.delete_enum = 'FALSE'
|
||||||
|
group by backRecord.fire_check_id
|
||||||
|
) backInfo on cl.fire_check_id = backInfo.fireCheckId
|
||||||
|
where cl.delete_enum = 'FALSE'
|
||||||
|
and cl.state = 0
|
||||||
|
and cl.corpinfo_id = #{params.corpinfoId}
|
||||||
|
group by cl.fire_check_id, cl.fire_check_type
|
||||||
|
) statistic
|
||||||
|
</select>
|
||||||
|
|
||||||
<select id="riskDistribution" resultType="com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO">
|
<select id="riskDistribution" resultType="com.zcloud.fire.check.persistence.dataobject.RiskDistributionDO">
|
||||||
SELECT c.corp_name as corpinfoName,
|
SELECT c.corp_name as corpinfoName,
|
||||||
c.id as corpinfoId,
|
c.id as corpinfoId,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue