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-18 14:04:25 +08:00
parent f265bcbdd6
commit 1f654ea3ca
52 changed files with 175 additions and 166 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

@ -48,7 +48,7 @@ public class SysPasswordService
public void validate(SysUser user, String password)
{
long startTime = System.currentTimeMillis();
String username = user.getUserName();
String username = user.getNickName();
Integer retryCount=redisService.getIntVal(username);
if(retryCount>ERROR_TIMES){
long time=redisService.getExpireTimes(username);

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

@ -2,6 +2,7 @@ package com.securitycontrol.entity.screen.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.omg.CORBA.PRIVATE_MEMBER;
/**
* 告警管理
@ -23,4 +24,13 @@ public class AlarmMgeDto extends ScreenParamDto {
@ApiModelProperty(value = "告警类型")
private String warnType;
@ApiModelProperty(value = "状态")
private String status;
@ApiModelProperty(value = "处理人")
private String userName;
@ApiModelProperty(value = "备注")
private String remark;
}

15
securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java
View File

@ -49,18 +49,19 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
public static String ur="/";
/**
* 放权的请求 -公共的请求
* 越权 放权的请求 指定的前缀 -公共的请求+数据接口
*/
public static String WHITE_URL="/sys/select/";
public static String[] WHITE_URL=new String[]{"/sys/select/","/dataCenter/inter/"};
/**
* 白名单路径
* 越权白名单路径->指定的路径
*/
public static String[] WHITE_URLS= new String[]{"/sys/sysLog/addLogs"};
/**
* 大屏路径拦截
* 越权 大屏路径拦截-指定的前缀拦截
*/
public static String[] SC_URL= new String[]{"/largeScreen/xcIndex/"};
public static String[] SC_URL= new String[]{"/largeScreen/accessMge/","/largeScreen/alarmMge/","/largeScreen/constructionQuality/","/largeScreen/operatingEnvironment/","/largeScreen/personnelControl/","/largeScreen/scIndex/","/largeScreen/towerAssInspect/","/largeScreen/video/","/largeScreen/xcIndex/"};
private final String whiteURL = "http://127.0.0.1:18080/";
@ -194,8 +195,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
if(urls.length>4){
requestUri=ur+urls[1]+ur+urls[2]+ur+urls[3];
}else {
String selected=ur+urls[1]+ur+urls[2]+ur;
if(selected.equals(WHITE_URL)){
String selected=ur+urls[1]+ur+urls[2]+ur;
if(Arrays.asList(WHITE_URL).contains(selected)){
return true;
}else if(Arrays.asList(SC_URL).contains(selected)){
requestUri=selected;

4
securitycontrol-gateway/src/main/java/com/securitycontrol/gateway/filter/RsaDecryptResponseGatewayFilterFactory.java
View File

@ -42,7 +42,7 @@ class RsaDecryptResponseGatewayFilterFactory extends AbstractGatewayFilterFactor
public boolean jaData;
public final static String HEARD_NAME="decrypt";
public final static String CONTENT_TYPE="content-type";
public final static String PARAMS="params";
@Override
@ -69,9 +69,11 @@ class RsaDecryptResponseGatewayFilterFactory extends AbstractGatewayFilterFactor
}
}
}
if (!HttpMethod.POST.matches(serverHttpRequest.getMethodValue())) {//非 post请求
return chain.filter(exchange);
}
byte[] decrypBytes;
GatewayContext gatewayContext = exchange.getAttribute(GatewayContext.CACHE_GATEWAY_CONTEXT);
if(StrUtil.isBlank(gatewayContext.getCacheBody())){

2
securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/controller/BdController.java
View File

@ -18,7 +18,7 @@ import java.util.List;
* @author lsun
*/
@RestController
@RequestMapping("/dataCenter/")
@RequestMapping("/dataCenter/inter/")
@Slf4j
public class BdController {

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

@ -1,19 +1,32 @@
package com.securitycontrol.system.base.controller;
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
@ -46,4 +59,6 @@ public class DownLoadFileController {
log.error("工程模板-下载失败", e);
}
}
}

6
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProController.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ProController.java
View File

@ -1,5 +1,6 @@
package com.securitycontrol.system.base.controller;
package com.securitycontrol.background.controller;
import com.securitycontrol.background.service.IProService;
import com.securitycontrol.common.core.web.controller.BaseController;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.common.core.web.page.TableDataInfo;
@ -9,7 +10,6 @@ import com.securitycontrol.entity.system.base.dto.GxPlanDto;
import com.securitycontrol.entity.system.base.dto.ProDto;
import com.securitycontrol.entity.system.base.vo.GxPlanVo;
import com.securitycontrol.entity.system.base.vo.ProVo;
import com.securitycontrol.system.base.service.IProService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -29,7 +29,7 @@ import java.util.List;
@RequestMapping("/sys/pro/")
public class ProController extends BaseController {
@Resource(name = "IProService")
@Resource
private IProService service;
@ApiOperation(value = "获取工程列表")

6
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProScheduleController.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/ProScheduleController.java
View File

@ -1,5 +1,6 @@
package com.securitycontrol.system.base.controller;
package com.securitycontrol.background.controller;
import com.securitycontrol.background.service.IProScheduleService;
import com.securitycontrol.common.core.web.controller.BaseController;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.common.core.web.page.TableDataInfo;
@ -10,7 +11,6 @@ import com.securitycontrol.entity.system.base.dto.ProScheduleDto;
import com.securitycontrol.entity.system.base.vo.GxPlanProgressVo;
import com.securitycontrol.entity.system.base.vo.GxPlanVo;
import com.securitycontrol.entity.system.base.vo.ProScheduleVo;
import com.securitycontrol.system.base.service.IProScheduleService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@ -27,7 +27,7 @@ import java.util.List;
@RequestMapping("/base/proSchedule/")
public class ProScheduleController extends BaseController {
@Resource(name = "IProScheduleService")
@Resource
private IProScheduleService service;
@ApiOperation(value = "获取工程进度列表")

4
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/TeamQuEvalController.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/TeamQuEvalController.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.controller;
package com.securitycontrol.background.controller;
import com.securitycontrol.common.core.web.controller.BaseController;
import com.securitycontrol.common.core.web.domain.AjaxResult;
@ -7,7 +7,7 @@ import com.securitycontrol.common.log.annotation.Log;
import com.securitycontrol.common.log.enums.OperationType;
import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;
import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo;
import com.securitycontrol.system.base.service.ITeamQuEvalService;
import com.securitycontrol.background.service.ITeamQuEvalService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IProMapper.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.mapper;
package com.securitycontrol.background.mapper;
import com.securitycontrol.entity.system.base.dto.GxPlanDto;
import com.securitycontrol.entity.system.base.dto.ProDto;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProScheduleMapper.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IProScheduleMapper.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.mapper;
package com.securitycontrol.background.mapper;
import com.securitycontrol.entity.system.base.dto.GxPlanDto;
import com.securitycontrol.entity.system.base.dto.ProScheduleDto;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ITeamQuEvalMapper.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/ITeamQuEvalMapper.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.mapper;
package com.securitycontrol.background.mapper;
import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;
import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProScheduleService.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IProScheduleService.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service;
package com.securitycontrol.background.service;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.base.dto.GxPlanDto;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProService.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/IProService.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service;
package com.securitycontrol.background.service;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.base.dto.GxPlanDto;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ITeamQuEvalService.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/ITeamQuEvalService.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service;
package com.securitycontrol.background.service;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;

8
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/ProScheduleServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.securitycontrol.system.base.service.impl;
package com.securitycontrol.background.service.impl;
import com.securitycontrol.background.service.IProScheduleService;
import com.securitycontrol.common.core.constant.Constant;
import com.securitycontrol.common.core.utils.StringUtils;
import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
@ -11,8 +12,7 @@ import com.securitycontrol.entity.system.base.dto.ProScheduleDto;
import com.securitycontrol.entity.system.base.vo.GxPlanProgressVo;
import com.securitycontrol.entity.system.base.vo.GxPlanVo;
import com.securitycontrol.entity.system.base.vo.ProScheduleVo;
import com.securitycontrol.system.base.mapper.IProScheduleMapper;
import com.securitycontrol.system.base.service.IProScheduleService;
import com.securitycontrol.background.mapper.IProScheduleMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
@ -39,7 +39,7 @@ public class ProScheduleServiceImpl implements IProScheduleService {
@Resource(name = "IProScheduleMapper")
private IProScheduleMapper mapper;
@Resource(name = "ValidatorsUtils")
@Resource
private ValidatorsUtils validatorsUtils;
@Override

8
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/ProServiceImpl.java
View File

@ -1,8 +1,9 @@
package com.securitycontrol.system.base.service.impl;
package com.securitycontrol.background.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.securitycontrol.background.service.IProService;
import com.securitycontrol.common.core.constant.Constant;
import com.securitycontrol.common.core.constant.HttpStatus;
import com.securitycontrol.common.core.constant.SecurityConstants;
@ -21,8 +22,7 @@ import com.securitycontrol.entity.system.base.vo.ProVo;
import com.securitycontrol.entity.system.vo.ResourceFileVo;
import com.securitycontrol.system.api.RemoteFileService;
import com.securitycontrol.system.api.domain.SysFile;
import com.securitycontrol.system.base.mapper.IProMapper;
import com.securitycontrol.system.base.service.IProService;
import com.securitycontrol.background.mapper.IProMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.*;
import static com.securitycontrol.common.core.utils.uuid.IdUtils.*;
import static com.securitycontrol.common.core.utils.uuid.IdUtils.getuid;
/**
* @author：cwchen

6
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java → securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamQuEvalServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.securitycontrol.system.base.service.impl;
package com.securitycontrol.background.service.impl;
import com.securitycontrol.background.service.ITeamQuEvalService;
import com.securitycontrol.common.core.utils.StringUtils;
import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
import com.securitycontrol.common.core.utils.uuid.IdUtils;
@ -7,8 +8,7 @@ import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.common.security.utils.SecurityUtils;
import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;
import com.securitycontrol.entity.system.base.vo.TeamQuEvalVo;
import com.securitycontrol.system.base.mapper.ITeamQuEvalMapper;
import com.securitycontrol.system.base.service.ITeamQuEvalService;
import com.securitycontrol.background.mapper.ITeamQuEvalMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

6
securitycontrol-model/securitycontrol-background/src/main/resources/bootstrap.yml
View File

@ -39,6 +39,8 @@ jasypt:
property:
prefix: CodeSheep(
suffix: )
file:
# upload_path: /data/ahsbs/file
temp_file_path: E:\\tempFile
# 导出sql文件的位置

2
securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml → securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.securitycontrol.system.base.mapper.IProMapper">
<mapper namespace="com.securitycontrol.background.mapper.IProMapper">
<!--新增/修改 工程-->
<insert id="addOrUpdatePro">
<if test="type == 1">

2
securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml → securitycontrol-model/securitycontrol-background/src/main/resources/mapper/ProScheduleMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.securitycontrol.system.base.mapper.IProScheduleMapper">
<mapper namespace="com.securitycontrol.background.mapper.IProScheduleMapper">
<!--填报工序计划进度-->
<insert id="addGxPlanProgress">
INSERT INTO tb_project_progress

2
securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/TeamQuEvalMapper.xml → securitycontrol-model/securitycontrol-background/src/main/resources/mapper/TeamQuEvalMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.securitycontrol.system.base.mapper.ITeamQuEvalMapper">
<mapper namespace="com.securitycontrol.background.mapper.ITeamQuEvalMapper">
<!--新增/修改班组质量评价-->
<insert id="addOrUpdateTeamEval">
<if test="type == 1">

16
securitycontrol-model/securitycontrol-files/src/main/resources/bootstrap.yml
View File

@ -31,13 +31,21 @@ spring:
# 共享配置
shared-configs:
- vsc-dev.yml
# data:
# mongodb:
# host: 192.168.0.56
# port: 27017
# database: zhgd
# username: zhgd
# password: Bonus@admin123
data:
mongodb:
host: 192.168.0.56
host: 47.115.207.135
port: 27017
database: zhgd
username: zhgd
password: Bonus@admin123
database: admin
username: admin
password: Bonus@admin123!
#加密组件
jasypt:
encryptor:

19
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/AlarmMgeController.java
View File

@ -2,6 +2,7 @@ package com.securitycontrol.screen.controller;
import com.github.pagehelper.PageInfo;
import com.securitycontrol.common.core.constant.HttpStatus;
import com.securitycontrol.common.core.domain.Result;
import com.securitycontrol.common.core.web.controller.BaseController;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.common.core.web.page.TableDataInfo;
@ -15,10 +16,7 @@ import com.securitycontrol.entity.screen.vo.AlarmMgeVo;
import com.securitycontrol.screen.service.AlarmMgeService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
@ -51,4 +49,17 @@ public class AlarmMgeController extends BaseController {
}
}
@ApiOperation(value = "告警处理表")
@PostMapping("warnProcess")
@Log(title = "告警管理", menu = "告警管理->告警管理", grade = OperationType.QUERY_BUSINESS, details = "查询告警管理列表", type = "业务日志")
public Result<String> warnProcess(@RequestBody AlarmMgeDto dto) {
return service.warnProcess(dto);
}
}

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

@ -21,4 +21,11 @@ public interface AlarmMgeMapper {
* @return
*/
List<AlarmMgeVo> getAlarmMgeList(AlarmMgeDto dto);
/**
* 预警处理
* @param dto
* @return
*/
Integer warnProcess(AlarmMgeDto dto);
}

8
securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/AlarmMgeService.java
View File

@ -1,5 +1,6 @@
package com.securitycontrol.screen.service;
import com.securitycontrol.common.core.domain.Result;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.screen.dto.AlarmMgeDto;
import com.securitycontrol.entity.screen.dto.ScreenParamDto;
@ -18,4 +19,11 @@ public interface AlarmMgeService {
* @return
*/
List<AlarmMgeVo> getAlarmMgeList(AlarmMgeDto dto);
/**
* 告警处置管理
* @param dto
* @return
*/
Result<String> warnProcess(AlarmMgeDto dto);
}

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

@ -1,13 +1,17 @@
package com.securitycontrol.screen.service.impl;
import com.securitycontrol.common.core.domain.Result;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.common.security.utils.SecurityUtils;
import com.securitycontrol.entity.background.vo.DutyPlanVo;
import com.securitycontrol.entity.screen.dto.AlarmMgeDto;
import com.securitycontrol.entity.screen.dto.ScreenParamDto;
import com.securitycontrol.entity.screen.vo.AlarmMgeVo;
import com.securitycontrol.entity.system.SystemGlobal;
import com.securitycontrol.entity.system.base.vo.ProVo;
import com.securitycontrol.screen.mapper.AlarmMgeMapper;
import com.securitycontrol.screen.service.AlarmMgeService;
import com.securitycontrol.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -39,4 +43,26 @@ public class AlarmMgeServiceImpl implements AlarmMgeService {
}
return list;
}
/**
* 告警处置接口
* @param dto
* @return
*/
@Override
public Result<String> warnProcess(AlarmMgeDto dto) {
try{
LoginUser user= SecurityUtils.getLoginUser();
dto.setUserId(user.getUserid()+"");
dto.setUserName(user.getUsername());
int num= mapper.warnProcess(dto);
if(num> SystemGlobal.SUCCESS_NUM){
return Result.ok("操作成功","操作成功");
}
return Result.fail("操作失败");
}catch (Exception e){
log.error(e.toString(),e);
}
return Result.fail("操作失败");
}
}

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

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.securitycontrol.screen.mapper.AlarmMgeMapper">
<update id="warnProcess">
update tb_warn set user_id=#{userId},status=#{status},
remark=#{remark}
where warn_id=#{warnId}
</update>
<select id="getAlarmMgeList" resultType="com.securitycontrol.entity.screen.vo.AlarmMgeVo">
SELECT tw.warn_id as warnId,

3
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/VscSystemApplication.java
View File

@ -4,9 +4,6 @@ package com.securitycontrol.system;
import com.securitycontrol.common.security.annotation.EnableCustomConfig;
import com.securitycontrol.common.security.annotation.EnableRyFeignClients;
import com.securitycontrol.common.swagger.annotation.EnableCustomSwagger2;
import com.securitycontrol.system.base.service.ExportSqlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;

68
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ExportFileController.java
View File

@ -1,68 +0,0 @@
package com.securitycontrol.system.base.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.common.log.annotation.Log;
import com.securitycontrol.common.log.enums.OperationType;
import com.securitycontrol.entity.system.base.dto.ProDto;
import com.securitycontrol.system.export.entity.ProExportVo;
import com.securitycontrol.entity.system.base.vo.ProVo;
import com.securitycontrol.system.base.service.IProService;
import com.securitycontrol.common.core.utils.ExcelStyleUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
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.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
/**
* @author：cwchen
* @date：2024-03-11-14:55
* @version：1.0
* @description：导出文件-web层
*/
@RestController
@RequestMapping("/sys/export/")
@Slf4j
public class ExportFileController {
@Resource(name = "IProService")
private IProService service;
@GetMapping("exportProData")
@Log(title = "基础管理", menu = "基础管理->工程管理", grade = OperationType.EXPORT_BUSINESS, details = "导出工程", type = "业务日志")
public void exportData(HttpServletRequest request, HttpServletResponse response, ProDto dto) {
try {
List<ProExportVo> proExportVoList = new ArrayList<>();
List<ProVo> proLists = service.getProLists(dto);
for (int i = 0; i < proLists.size(); i++) {
proLists.get(i).setProId((i + 1) + "");
ProExportVo exportVo = new ProExportVo();
BeanUtils.copyProperties(proLists.get(i), exportVo);
proExportVoList.add(exportVo);
}
ExportParams exportParams = new ExportParams("工程列表", "工程列表", ExcelType.XSSF);
exportParams.setStyle(ExcelStyleUtil.class);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, ProExportVo.class, proExportVoList);
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("content-disposition", "attachment;fileName=" + URLEncoder.encode("工程列表" + ".xlsx", "UTF-8"));
ServletOutputStream outputStream = response.getOutputStream();
workbook.write(outputStream);
outputStream.close();
workbook.close();
} catch (Exception e) {
log.error("导出工程", e);
}
}
}

4
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/RoleController.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/RoleController.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.controller;
package com.securitycontrol.system.controller;
import com.securitycontrol.common.core.web.controller.BaseController;
import com.securitycontrol.common.core.web.domain.AjaxResult;
@ -7,7 +7,7 @@ import com.securitycontrol.common.log.annotation.Log;
import com.securitycontrol.common.log.enums.OperationType;
import com.securitycontrol.entity.system.dto.RoleDto;
import com.securitycontrol.entity.system.vo.RoleVo;
import com.securitycontrol.system.base.service.IRoleService;
import com.securitycontrol.system.service.IRoleService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

4
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SelectController.java
View File

@ -1,10 +1,10 @@
package com.securitycontrol.system.base.controller;
package com.securitycontrol.system.controller;
import com.securitycontrol.common.core.web.controller.BaseController;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.dto.MenuDto;
import com.securitycontrol.entity.system.dto.SelectDto;
import com.securitycontrol.system.base.service.ISelectService;
import com.securitycontrol.system.service.ISelectService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

9
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SysLogController.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/SysLogController.java
View File

@ -1,8 +1,7 @@
package com.securitycontrol.system.base.controller;
package com.securitycontrol.system.controller;
import com.securitycontrol.common.core.domain.Result;
import com.securitycontrol.common.core.utils.WordUtils;
import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
import com.securitycontrol.common.core.web.controller.BaseController;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.common.core.web.page.TableDataInfo;
@ -10,8 +9,8 @@ import com.securitycontrol.common.log.annotation.Log;
import com.securitycontrol.common.log.enums.OperationType;
import com.securitycontrol.entity.system.SystemGlobal;
import com.securitycontrol.system.api.domain.SysLog;
import com.securitycontrol.system.base.service.ExportSqlService;
import com.securitycontrol.system.base.service.ISysLogService;
import com.securitycontrol.system.service.ExportSqlService;
import com.securitycontrol.system.service.ISysLogService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -21,8 +20,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

4
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/UserController.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/controller/UserController.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.controller;
package com.securitycontrol.system.controller;
import com.securitycontrol.common.core.web.controller.BaseController;
import com.securitycontrol.common.core.web.domain.AjaxResult;
@ -7,7 +7,7 @@ import com.securitycontrol.common.log.annotation.Log;
import com.securitycontrol.common.log.enums.OperationType;
import com.securitycontrol.entity.system.dto.UserDto;
import com.securitycontrol.entity.system.vo.UserVo;
import com.securitycontrol.system.base.service.IUserService;
import com.securitycontrol.system.service.IUserService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IRoleMapper.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/IRoleMapper.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.mapper;
package com.securitycontrol.system.mapper;
import com.securitycontrol.entity.system.dto.RoleDto;
import com.securitycontrol.entity.system.vo.RoleVo;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/ISelectMapper.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.mapper;
package com.securitycontrol.system.mapper;
import com.securitycontrol.entity.system.dto.SelectDto;
import com.securitycontrol.entity.system.vo.SelectVo;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISysLogMapper.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/ISysLogMapper.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.mapper;
package com.securitycontrol.system.mapper;
import cn.afterturn.easypoi.excel.entity.ExportExcelItem;
import com.securitycontrol.system.api.domain.SysLog;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IUserMapper.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/mapper/IUserMapper.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.mapper;
package com.securitycontrol.system.mapper;
import com.securitycontrol.entity.system.dto.UserDto;
import com.securitycontrol.entity.system.vo.UserVo;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ExportSqlService.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ExportSqlService.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service;
package com.securitycontrol.system.service;
import com.securitycontrol.common.core.utils.aes.DateTimeHelper;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IRoleService.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/IRoleService.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service;
package com.securitycontrol.system.service;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.dto.RoleDto;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ISelectService.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service;
package com.securitycontrol.system.service;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.dto.MenuDto;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISysLogService.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/ISysLogService.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service;
package com.securitycontrol.system.service;
import com.securitycontrol.common.core.domain.Result;
import com.securitycontrol.common.core.web.domain.AjaxResult;

2
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IUserService.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/IUserService.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service;
package com.securitycontrol.system.service;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.dto.UserDto;

5
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/RoleServiceImpl.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/RoleServiceImpl.java
View File

@ -1,11 +1,10 @@
package com.securitycontrol.system.base.service.impl;
package com.securitycontrol.system.service;
import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.dto.RoleDto;
import com.securitycontrol.entity.system.vo.RoleVo;
import com.securitycontrol.system.base.mapper.IRoleMapper;
import com.securitycontrol.system.base.service.IRoleService;
import com.securitycontrol.system.mapper.IRoleMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

6
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SelectServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service.impl;
package com.securitycontrol.system.service;
import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.entity.system.TreeBuild;
@ -6,9 +6,7 @@ import com.securitycontrol.entity.system.dto.MenuDto;
import com.securitycontrol.entity.system.dto.SelectDto;
import com.securitycontrol.entity.system.vo.SelectVo;
import com.securitycontrol.entity.system.vo.TreeNode;
import com.securitycontrol.system.base.mapper.ISelectMapper;
import com.securitycontrol.system.base.service.ISelectService;
import io.swagger.models.auth.In;
import com.securitycontrol.system.mapper.ISelectMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;

9
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SysLogServiceImpl.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/SysLogServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service.impl;
package com.securitycontrol.system.service;
import com.google.common.collect.Maps;
import com.securitycontrol.common.core.domain.Result;
@ -12,22 +12,17 @@ import com.securitycontrol.common.security.utils.SecurityUtils;
import com.securitycontrol.entity.system.SystemGlobal;
import com.securitycontrol.system.api.domain.SysLog;
import com.securitycontrol.system.api.model.LoginUser;
import com.securitycontrol.system.base.mapper.ISysLogMapper;
import com.securitycontrol.system.base.service.ISysLogService;
import com.securitycontrol.system.mapper.ISysLogMapper;
import lombok.extern.slf4j.Slf4j;
import org.bouncycastle.est.CACertsResponse;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import sun.net.util.IPAddressUtil;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.security.Security;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
/**
* @author：cwchen

5
securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/UserServiceImpl.java → securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/service/UserServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.securitycontrol.system.base.service.impl;
package com.securitycontrol.system.service;
import com.securitycontrol.common.core.constant.Constant;
import com.securitycontrol.common.core.utils.StringUtils;
@ -7,8 +7,7 @@ import com.securitycontrol.common.core.web.domain.AjaxResult;
import com.securitycontrol.common.security.utils.SecurityUtils;
import com.securitycontrol.entity.system.dto.UserDto;
import com.securitycontrol.entity.system.vo.UserVo;
import com.securitycontrol.system.base.mapper.IUserMapper;
import com.securitycontrol.system.base.service.IUserService;
import com.securitycontrol.system.mapper.IUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

5
securitycontrol-model/securitycontrol-system/src/main/resources/bootstrap.yml
View File

@ -47,10 +47,7 @@ log:
my: debug
file: logs/sys-back.log
maxsize: 30MB
file:
# upload_path: /data/ahsbs/file
temp_file_path: E:\\tempFile
# 导出sql文件的位置
sql:
dbname: jj_zhgd # 数据库名
filePath: F:\\File\\ #导出sql文件的位置 win下会直接在项目所在磁盘下建立 data/sql文件

2
securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/RoleMapper.xml → securitycontrol-model/securitycontrol-system/src/main/resources/mapper/RoleMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.securitycontrol.system.base.mapper.IRoleMapper">
<mapper namespace="com.securitycontrol.system.mapper.IRoleMapper">
<!--新增/修改角色-->
<insert id="addOrUpdateRole">
<if test="type == 1">

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.securitycontrol.system.base.mapper.ISelectMapper">
<mapper namespace="com.securitycontrol.system.mapper.ISelectMapper">
<!--组织机构树-->
<select id="getOrgTree" resultType="com.securitycontrol.entity.system.vo.TreeNode">

2
securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SysLogMapper.xml → securitycontrol-model/securitycontrol-system/src/main/resources/mapper/SysLogMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.securitycontrol.system.base.mapper.ISysLogMapper">
<mapper namespace="com.securitycontrol.system.mapper.ISysLogMapper">
<!--保存系统日志-->
<insert id="saveLogs">

2
securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml → securitycontrol-model/securitycontrol-system/src/main/resources/mapper/UserMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.securitycontrol.system.base.mapper.IUserMapper">
<mapper namespace="com.securitycontrol.system.mapper.IUserMapper">
<!--新增/修改用户-->
<insert id="addOrUpdateUser">
<if test="type == 1">