haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改数据查询

This commit is contained in:
haozq 2024-04-19 14:06:40 +08:00
parent 18310e5b9e
commit cfdd2ee1b7
20 changed files with 198 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysPasswordService.java
View File

@ -62,7 +62,7 @@ public class SysPasswordService
throw new ServiceException("用户不存在/密码错误",201);
} else {
redisService.deleteObject(username);
// redisService.deleteObject(username);
clearLoginRecordCache(username);
}
}

2
securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/AesCbcUtils.java
View File

@ -75,7 +75,7 @@ public class AesCbcUtils {
}
public static void main(String[] args) {
// String json="username=guest&password=admin@123";
// String json="";
String json="{\"username\":\"guest\",\"password\":\"admin@123\"}";
String data=encrypt(json);
System.err.println(data);

4
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java
View File

@ -24,6 +24,7 @@ public class AlarmMgeDto extends ScreenParamDto {
@ApiModelProperty(value = "告警类型")
private String warnType;
@ApiModelProperty(value = "状态")
private String status;
@ -32,5 +33,6 @@ public class AlarmMgeDto extends ScreenParamDto {
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "告警内容")
private String warnContent;
}

16
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ConstructionQualityDto.java
View File

@ -2,6 +2,7 @@ package com.securitycontrol.entity.screen.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.scheduling.support.SimpleTriggerContext;
/**
* 告警管理
@ -36,4 +37,19 @@ public class ConstructionQualityDto extends ScreenParamDto {
@ApiModelProperty(value = "施工工艺")
private String construction;
@ApiModelProperty(value = "设备名称")
private String deviceName;
@ApiModelProperty(value = "时间")
private String times;
@ApiModelProperty(value = "开始时间")
private String startTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
@ApiModelProperty(value = "检测属性")
private String moduleName;
}

24
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/AlarmMgeVo.java
View File

@ -11,24 +11,48 @@ import org.hibernate.validator.constraints.Length;
*/
@Data
public class AlarmMgeVo {
@ApiModelProperty(value = "id")
private String warnId;
@ApiModelProperty(value = "告警内容")
private String warnContent;
@ApiModelProperty(value = "建管单位名称")
private String orgName;
@ApiModelProperty(value = "建管单位id")
private String orgId;
@ApiModelProperty(value = "工程id")
private String proId;
@ApiModelProperty(value = "工程名称")
private String proName;
@ApiModelProperty(value = "班组id")
private String teamId;
@ApiModelProperty(value = "班组名称")
private String teamName;
@ApiModelProperty(value = "班组长名称")
private String teamLeader;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "处理人")
private String userName;
@ApiModelProperty(value = "状态 0未处理 1 告警 2 未告警")
private String status;
@ApiModelProperty(value = "处理时间")
private String updateTime;
@ApiModelProperty(value = "处理时间")
private String warnTime;
}

6
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ConstructionQualityVo.java
View File

@ -49,6 +49,9 @@ public class ConstructionQualityVo {
@ApiModelProperty(value = "合格次数")
private String qualificationNumber;
@ApiModelProperty(value = "检测名称")
private String moduleName;
@ApiModelProperty(value = "变化值")
private String changeVal;
@ -61,6 +64,9 @@ public class ConstructionQualityVo {
@ApiModelProperty(value = "施工工艺")
private String construction;
@ApiModelProperty(value = "告警时间")
private String warnTime;

17
securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/DownLoadFileController.java
View File

@ -1,32 +1,19 @@
package com.securitycontrol.background.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import com.securitycontrol.background.service.IProService;
import com.securitycontrol.common.core.utils.ExcelStyleUtil;
import com.securitycontrol.common.log.annotation.Log;
import com.securitycontrol.common.log.enums.OperationType;
import com.securitycontrol.entity.system.base.dto.ProDto;
import com.securitycontrol.entity.system.base.vo.ProVo;
import com.securitycontrol.system.export.entity.ProExportVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.IOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
/**
* @author：cwchen

18
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ConstructionQualityController.java
View File

@ -30,6 +30,7 @@ public class ConstructionQualityController extends BaseController {
@Resource(name = "ConstructionQualityService")
private ConstructionQualityService service;
@RequestMapping(value = "/qualityInspection", method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "施工质量-质量检测设备")
@ -50,6 +51,7 @@ public class ConstructionQualityController extends BaseController {
List<ConstructionQualityVo> list = service.getDetectionRecord(dto);
return AjaxResult.success(list);
} catch (Exception e) {
log.error(e.toString(),e);
return AjaxResult.error();
}
}
@ -59,7 +61,6 @@ public class ConstructionQualityController extends BaseController {
@Log(title = "告警内容", menu = "告警内容->告警内容", grade = OperationType.QUERY_BUSINESS, details = "查询告警内容", type = "业务日志")
public TableDataInfo getConstructionAlarm(ConstructionQualityDto dto) {
try{
startLayPage();
List<ConstructionQualityVo> list = service.getConstructionAlarm(dto);
return getDataTableLayui(list);
}catch (Exception e){
@ -82,4 +83,19 @@ public class ConstructionQualityController extends BaseController {
}
}
@ApiOperation(value = "施工质量-施工质量历史数据列表")
@GetMapping("getHistoryList")
@Log(title = "施工质量列表", menu = "施工质量列表->施工质量列表", grade = OperationType.QUERY_BUSINESS, details = "查询施工质量历史数据", type = "业务日志")
public TableDataInfo getHistoryList(ConstructionQualityDto dto) {
try{
startLayPage();
List<ConstructionQualityVo> list = service.getHistoryList(dto);
return getDataTableLayui(list);
}catch (Exception e){
log.error(e.toString(),e);
return getDataTableBadLayui(new ArrayList<>(),"请求出错了");
}
}
}

4
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/OperatingController.java
View File

@ -29,8 +29,12 @@ public class OperatingController extends BaseController {
@Resource(name = "OperatingService")
private OperatingService service;
@RequestMapping(value = "/RealTimeMonitoring", method = RequestMethod.POST)
@ApiOperation(value = "作业环境-实时监测")
@Log(title = "实时监测", menu = "作业环境->实时监测", grade = OperationType.QUERY_BUSINESS, details = "查询实时检测", type = "业务日志")
public AjaxResult getRealTimeMonitoring(@RequestBody OperatingQualityDto dto) {
try {
List<OperatingQualityVo> list = service.getRealTimeMonitoring(dto);

6
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/ScIndexController.java
View File

@ -76,4 +76,10 @@ public class ScIndexController {
public AjaxResult efficiencyAnalysis(ScreenParamDto dto){
return service.efficiencyAnalysis(dto);
}
@ApiOperation(value = "杆塔集合查询")
@GetMapping("getGtList")
public AjaxResult getGtList(ScreenParamDto dto){
return service.efficiencyAnalysis(dto);
}
}

7
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/ConstructionQualityMapper.java
View File

@ -51,4 +51,11 @@ public interface ConstructionQualityMapper {
* @date 2024/3/27 19:54
*/
List<ConstructionQualityVo> getConstructionQualityList(ConstructionQualityDto dto);
/**
* 查询施工质量设备历史告警信息
* @param dto
* @return
*/
List<ConstructionQualityVo> getHistoryList(ConstructionQualityDto dto);
}

6
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/ConstructionQualityService.java
View File

@ -49,4 +49,10 @@ public interface ConstructionQualityService {
*/
List<ConstructionQualityVo> getConstructionQualityList(ConstructionQualityDto dto);
/**
* 查询施工质量历史数据记录
* @param dto
* @return
*/
List<ConstructionQualityVo> getHistoryList(ConstructionQualityDto dto);
}

4
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/AlarmMgeServiceImpl.java
View File

@ -39,7 +39,7 @@ public class AlarmMgeServiceImpl implements AlarmMgeService {
try {
list = mapper.getAlarmMgeList(dto);
} catch (Exception e) {
log.error("获取告警管理列表",e);
log.error(e.toString(),e);
}
return list;
}
@ -56,7 +56,7 @@ public class AlarmMgeServiceImpl implements AlarmMgeService {
dto.setUserId(user.getUserid()+"");
dto.setUserName(user.getUsername());
int num= mapper.warnProcess(dto);
if(num> SystemGlobal.SUCCESS_NUM){
if(num==SystemGlobal.SUCCESS_NUM){
return Result.ok("操作成功","操作成功");
}
return Result.fail("操作失败");

25
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ConstructionQualityImpl.java
View File

@ -1,5 +1,6 @@
package com.securitycontrol.screen.service.impl;
import com.securitycontrol.common.core.utils.aes.StringHelper;
import com.securitycontrol.entity.screen.dto.ConstructionQualityDto;
import com.securitycontrol.entity.screen.vo.ConstructionQualityVo;
import com.securitycontrol.screen.mapper.ConstructionQualityMapper;
@ -74,6 +75,30 @@ public class ConstructionQualityImpl implements ConstructionQualityService {
return list;
}
/**
* 查询施工质量历史数据信息
* @param dto
* @return
*/
@Override
public List<ConstructionQualityVo> getHistoryList(ConstructionQualityDto dto) {
List<ConstructionQualityVo> list = new ArrayList<>();
try{
if(StringHelper.isNotEmpty(dto.getTimes())){
dto.setStartTime(dto.getTimes().split(" - ")[0]);
dto.setEndTime(dto.getTimes().split(" - ")[1]);
}
list = mapper.getHistoryList(dto);
}catch (Exception e){
log.error(e.toString(),e);
}
return list;
}
/**
* 施工质量-检测记录对比
* @param dto

29
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/AlarmMgeMapper.xml
View File

@ -9,29 +9,24 @@
<select id="getAlarmMgeList" resultType="com.securitycontrol.entity.screen.vo.AlarmMgeVo">
SELECT tw.warn_id as warnId,
sb.city_name AS orgName,
sb.org_id AS orgId,
tp.pro_id as proId,
tp.pro_name as proName,
tw.warn_content as warnContent,
sb.city_name AS orgName,tw.warn_time warnTime,
sb.org_id AS orgId, tp.pro_id as proId,
tp.pro_name as proName, tw.warn_content as warnContent,
twt.team_id as teamId,
twt.team_name as teamName,
twt.team_leader as teamLeader
twt.team_name as teamName,tdd.mode_name module ,td.device_name deviceName,
twt.team_leader as teamLeader,su.update_time updateTime,
su.login_name userName, tw.remark,tw.`status`
FROM tb_warn tw
LEFT JOIN tb_device_detail tdd on tw.attribute_id=tdd.id
LEFT JOIN tb_bd_device td on tdd.device_id=td.device_id
LEFT JOIN sys_user su on su.user_id=tw.user_id
LEFT JOIN sys_build sb ON sb.org_id = tw.org_id
LEFT JOIN tb_project tp ON tp.bid_code = tw.bid_code
LEFT JOIN tb_work_team twt ON twt.team_id = tw.team_id
where tw.bid_code = #{bidCode} and tw.warn_type = #{warnType}
<if test="orgId !=null and orgId!=''">
AND sb.org_id = #{orgId}
</if>
<if test="proName !=null and proName!=''">
AND tp.pro_name LIKE concat('%',#{proName},'%')
</if>
<if test="teamLeader !=null and teamLeader!=''">
AND twt.team_leader LIKE concat('%',#{teamLeader},'%')
<if test="warnContent!=null and warnContent!=''">
and tw.warn_content like concat('%',#{warnContent},'%')
</if>
order by tw.warn_time desc
</select>
</mapper>

71
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ConstructionQualityMapper.xml
View File

@ -9,7 +9,7 @@
DATE_FORMAT(thdv.create_time,'%Y-%m') as month,
SUM(CASE WHEN thdv.is_warn = 1 THEN 1 ELSE 0 END) as qualificationNumber
FROM tb_his_device_value thdv
LEFT JOIN tb_device_detail tdd ON thdv.id = tdd.id
LEFT JOIN tb_device_detail tdd ON thdv.attribute_id = tdd.id
LEFT JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id
LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
WHERE tpb.bid_code = #{bidCode} and DATE_FORMAT(thdv.create_time,'%Y-%m') = #{month}
@ -25,12 +25,15 @@
</select>
<!--施工质量-告警内容-->
<select id="getConstructionAlarm" resultType="com.securitycontrol.entity.screen.vo.ConstructionQualityVo">
SELECT
# tw.warn_id AS warningId,
tw.warn_content AS warningContent
select tbd.device_name deviceName,
tw.warn_content AS warningContent,
tw.warn_time warnTime
FROM tb_warn tw
LEFT JOIN tb_bd_device tbd ON tw.device_id = tbd.device_id
where tw.bid_code = #{bidCode} and tbd.devic_type = 1906
<if test="deviceId!=null and deviceId!=''">
AND tbd.device_id=#{deviceId}
</if>
</select>
<!--施工质量-质量检测设备-->
@ -49,39 +52,45 @@
LEFT JOIN tb_device_detail tdd ON tdd.device_id = tbd.device_id
LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
WHERE
tbd.devic_type = 1906 and tpb.bid_code = #{bidCode} and tbd.device_code = 1906001
tbd.devic_type =1906 and tpb.bid_code = #{bidCode}
</select>
<select id="getConstructionQualityList"
resultType="com.securitycontrol.entity.screen.vo.ConstructionQualityVo">
SELECT
thdv.val as val,
thdv.create_time as createTime,
thdv.is_warn as isWarn,
tdd.max_value as maxVal,
tbd.devic_type as devicType,
tbd.device_name as deviceName,
ta.area_name as areaName
FROM tb_his_device_value thdv
LEFT JOIN tb_device_detail tdd ON thdv.id = tdd.id
LEFT JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id
LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
LEFT JOIN tb_area ta ON tbd.area_id = ta.area_id
WHERE
tpb.bid_code = #{bidCode}
<if test="month != null and month != ''">
AND DATE_FORMAT(thdv.create_time,'%Y-%m-%d') = #{month}
SELECT tbd.device_name deviceName,tdd.mode_name moduleName,tdv.val,tdv.change_val,ta.area_name areaName,
tpb.bd_name ,tdv.create_time createTime,tdv.is_warn isWarn
FROM tb_bd_device tbd
LEFT JOIN tb_area ta on tbd.area_id=ta.area_id
left join tb_device_detail tdd on tbd.device_id=tdd.device_id
left join tb_device_value tdv on tdd.id=tdv.attribute_id
left join tb_pro_bd tpb on tpb.id=tbd.bd_id
WHERE tpb.bid_code = #{bidCode}
and tbd.devic_type = 1906
<if test="deviceId!=null and deviceId!=''">
AND tbd.device_id=#{deviceId}
</if>
<if test="moduleName!=null and moduleName!=''">
AND tdd.mode_name like concat('%',#{moduleName},'%')
</if>
</select>
<select id="getHistoryList" resultType="com.securitycontrol.entity.screen.vo.ConstructionQualityVo">
SELECT tbd.device_name deviceName,tdd.mode_name moduleName,tdv.val,tdv.change_val,ta.area_name areaName,
tpb.bd_name ,tdv.create_time createTime,tdv.is_warn isWarn,tdd.id,unit
FROM tb_bd_device tbd
LEFT JOIN tb_area ta on tbd.area_id=ta.area_id
left join tb_device_detail tdd on tbd.device_id=tdd.device_id
left join tb_his_device_value tdv on tdd.id=tdv.attribute_id
left join tb_pro_bd tpb on tpb.id=tbd.bd_id
WHERE
tbd.devic_type = 1906 and tdv.val is not null and tpb.bid_code = #{bidCode}
<if test="deviceName!=null and deviceName!=''">
AND tbd.device_name like concat('%',#{deviceName},'%')
</if>
<if test="times!=null and times!=''">
and tdv.create_time BETWEEN #{startTime} AND #{endTime}
</if>
<choose>
<when test="construction != null and construction != ''">
AND tbd.device_code = #{construction}
</when>
<otherwise>
AND tbd.device_code IN ('1906002', '1906003', '1906004')
</otherwise>
</choose>
</select>
</mapper>

4
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml
View File

@ -29,7 +29,7 @@
FROM tb_device_detail tdd
LEFT JOIN tb_his_device_value thdv ON tdd.id = thdv.attribute_id
WHERE tdd.device_id = #{deviceId} AND tdd.id = #{id} and tdd.del_flag = '0'
ORDER BY thdv.create_time DESC
ORDER BY thdv.create_time ASC
</select>
<select id="getRealTimeAlarmList" resultType="com.securitycontrol.entity.screen.vo.TowerAssInspectVo">
@ -39,7 +39,7 @@
<select id="getHistoryList" resultType="com.securitycontrol.entity.screen.vo.TowerAssInspectVo">
SELECT ta.area_name as areaName,tdd.mode_name as modeName, thdv.val ,
tdd.change_val as thisChangeVal, thdv.change_val as changeVal,tdd.update_time as updateTime,
thdv.change_val as changeVal,tdd.update_time as updateTime,
case when thdv.is_warn = '0' then '未告警' else '告警' end isWarn
FROM tb_device_detail tdd
LEFT JOIN tb_bd_device tbd ON tdd.device_id = tbd.device_id

12
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml
View File

@ -7,14 +7,14 @@
(SELECT '0' AS id,'球机' AS title, '-1' AS parentId,'0' AS onLine,'1' AS level)
UNION ALL
(
SELECT CONCAT('QJ',td.device_code) AS id,
td.device_name AS title,
SELECT CONCAT('QJ',tcm.puid) AS id,
tcm.pro_name AS title,
'0' AS parentId,
on_line AS onLine,
IFNULL(on_line,0) AS onLine,
'2' AS level
FROM tb_device td
INNER JOIN t_class_metting tcm on td.device_code = tcm.puid AND tcm.work_day = CURRENT_DATE
WHERE td.del_flag = 0
FROM t_class_metting tcm
left JOIN tb_device td on td.device_code = tcm.puid AND td.del_flag=0
WHERE tcm.del_flag = 0 AND tcm.work_day = CURRENT_DATE AND TCM.puid is not null
<if test="param!=null and param!=''">
AND INSTR(td.device_name,#{param}) > 0
</if>

2
securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SelectMapper.xml
View File

@ -136,7 +136,7 @@
FROM sys_dict sd
LEFT JOIN sys_dict sd2 ON sd.dict_code = sd2.p_code AND sd2.del_flag = 0
WHERE sd.dict_code = '9990' AND sd.del_flag = 0
ORDER BY sd2.dict_sort
ORDER BY sd2.dict_sort DESC
</select>
<select id="getGtLists" resultType="com.securitycontrol.entity.system.vo.SelectVo">