bonus
/
Bonus-Cloud-SafetyWarning
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

特殊字符限制及大屏日志

This commit is contained in:
mashuai 2024-11-08 16:00:02 +08:00
parent 6c0bada008
commit 25fc81b11f
30 changed files with 324 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java
View File

@ -146,4 +146,14 @@ public class Constants {
*/
public static final String DISALLOWED_REGEX = ".*[!~`@#$%^&*()\\-_,.?\":{}|<>+\\\\/%].*";
/**
* 百分号
*/
public static final String PERCENT_SIGN = "%";
/**
* 下划线
*/
public static final String UNDERLINE = "_";
}

4
bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbUserPostController.java
View File

@ -4,6 +4,8 @@ import com.bonus.base.basic.domain.TbUserPost;
import com.bonus.base.basic.service.TbUserPostService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -37,6 +39,7 @@ public class TbUserPostController extends BaseController {
@ApiOperation(value = "分页查询人员到岗到位信息")
@RequiresPermissions("base:user:list")
@GetMapping("/list")
@SysLog(title = "人员到岗到位管理", businessType = OperaType.QUERY, module = "大屏->人员到岗到位管理")
public AjaxResult list(TbUserPost tbUserPost) {
if (tbUserPost.getIsAll() != null && tbUserPost.getIsAll() == 0) {
List<TbUserPost> list = tbUserPostService.queryByPage(tbUserPost);
@ -57,6 +60,7 @@ public class TbUserPostController extends BaseController {
@ApiOperation(value = "新增人员到岗到位信息")
@RequiresPermissions("base:user:add")
@PostMapping
@SysLog(title = "人员到岗到位管理", businessType = OperaType.INSERT, module = "大屏->人员到岗到位管理")
public AjaxResult add(@RequestBody TbUserPost tbUserPost) {
return AjaxResult.success(tbUserPostService.insert(tbUserPost));
}

33
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdDeviceRecordServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.bonus.base.basic.service.impl;
import com.bonus.base.basic.config.Constants;
import com.bonus.base.basic.domain.TbBdDeviceRecord;
import com.bonus.base.basic.mapper.TbBdDeviceRecordMapper;
import com.bonus.base.basic.service.TbBdDeviceRecordService;
@ -80,6 +81,38 @@ public class TbBdDeviceRecordServiceImpl implements TbBdDeviceRecordService {
*/
@Override
public List<TbBdDeviceVo> getDeviceList(TbBdDeviceVo tbBdDeviceVo) {
if (tbBdDeviceVo.getProName() != null) {
String proName = tbBdDeviceVo.getProName();
if (Constants.UNDERLINE.equals(proName)) {
tbBdDeviceVo.setProName(proName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(proName)) {
tbBdDeviceVo.setProName(proName.replace("%", "/%"));
}
}
if (tbBdDeviceVo.getDepartName() != null) {
String departName = tbBdDeviceVo.getDepartName();
if (Constants.UNDERLINE.equals(departName)) {
tbBdDeviceVo.setDepartName(departName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(departName)) {
tbBdDeviceVo.setDepartName(departName.replace("%", "/%"));
}
}
if (tbBdDeviceVo.getDevName() != null) {
String devName = tbBdDeviceVo.getDevName();
if (Constants.UNDERLINE.equals(devName)) {
tbBdDeviceVo.setDevName(devName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devName)) {
tbBdDeviceVo.setDevName(devName.replace("%", "/%"));
}
}
if (tbBdDeviceVo.getDevCode() != null) {
String devCode = tbBdDeviceVo.getDevCode();
if (Constants.UNDERLINE.equals(devCode)) {
tbBdDeviceVo.setDevCode(devCode.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devCode)) {
tbBdDeviceVo.setDevCode(devCode.replace("%", "/%"));
}
}
List<TbBdDeviceVo> deviceList = tbBdDeviceRecordMapper.getDeviceList(tbBdDeviceVo);
if (deviceList != null && deviceList.size() > 0) {
for (TbBdDeviceVo bdDeviceVo : deviceList) {

24
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java
View File

@ -226,6 +226,30 @@ public class TbBdRecordServiceImpl implements TbBdRecordService {
@Override
public PageResultVo<TbBdRecord> getAll(TbBdRecord record){
if (record.getDepartName() != null) {
String departName = record.getDepartName();
if (Constants.UNDERLINE.equals(departName)) {
record.setDepartName(departName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(departName)) {
record.setDepartName(departName.replace("%", "/%"));
}
}
if (record.getProName() != null) {
String proName = record.getProName();
if (Constants.UNDERLINE.equals(proName)) {
record.setProName(proName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(proName)) {
record.setProName(proName.replace("%", "/%"));
}
}
if (record.getRelUser() != null) {
String relUser = record.getRelUser();
if (Constants.UNDERLINE.equals(relUser)) {
record.setRelUser(relUser.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(relUser)) {
record.setRelUser(relUser.replace("%", "/%"));
}
}
List<TbBdRecord> list;
if (isRedisCache) {
list = redisService.getCacheObject(Constants.TB_BD_RECORD_REDIS_KEY);

8
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDevAttributeServiceImpl.java
View File

@ -79,6 +79,14 @@ public class TbDevAttributeServiceImpl implements TbDevAttributeService {
*/
@Override
public PageResultVo<TbDevAttributeVo> queryAll(TbDevAttribute record) {
if (record.getDevName() != null) {
String devName = record.getDevName();
if (Constants.UNDERLINE.equals(devName)) {
record.setDevName(devName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devName)) {
record.setDevName(devName.replace("%", "/%"));
}
}
List<TbDevAttributeVo> list;
if (isRedisCache) {
//先从缓存中查询

16
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDeviceServiceImpl.java
View File

@ -133,6 +133,22 @@ public class TbDeviceServiceImpl implements TbDeviceService {
*/
@Override
public List<TbDevice> getAll(TbDevice record) {
if (record.getDevName() != null) {
String devName = record.getDevName();
if (Constants.UNDERLINE.equals(devName)) {
record.setDevName(devName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devName)) {
record.setDevName(devName.replace("%", "/%"));
}
}
if (record.getDevCode() != null) {
String devCode = record.getDevCode();
if (Constants.UNDERLINE.equals(devCode)) {
record.setDevCode(devCode.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devCode)) {
record.setDevCode(devCode.replace("%", "/%"));
}
}
return tbDeviceMapper.getAll(record);
}

8
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java
View File

@ -78,6 +78,14 @@ public class TbPeopleServiceImpl implements TbPeopleService {
*/
@Override
public List<TbPeople> queryByPage(TbPeople tbPeople) {
if (tbPeople.getRelName() != null) {
String relName = tbPeople.getRelName();
if (Constants.UNDERLINE.equals(relName)) {
tbPeople.setRelName(relName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(relName)) {
tbPeople.setRelName(relName.replace("%", "/%"));
}
}
List<TbPeople> peopleList = tbPeopleDao.queryByPage(tbPeople);
if (CollectionUtils.isNotEmpty(peopleList)) {
peopleList.forEach(people -> {

16
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProDepartServiceImpl.java
View File

@ -63,6 +63,22 @@ public class TbProDepartServiceImpl implements TbProDepartService {
*/
@Override
public List<TbProDepart> queryByPage(TbProDepart tbProDepart) {
if (tbProDepart.getDepartName() != null) {
String departName = tbProDepart.getDepartName();
if (Constants.UNDERLINE.equals(departName)) {
tbProDepart.setDepartName(departName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(departName)) {
tbProDepart.setDepartName(departName.replace("%", "/%"));
}
}
if (tbProDepart.getHeadUser() != null) {
String headUser = tbProDepart.getHeadUser();
if (Constants.UNDERLINE.equals(headUser)) {
tbProDepart.setHeadUser(headUser.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(headUser)) {
tbProDepart.setHeadUser(headUser.replace("%", "/%"));
}
}
List<TbProDepart> list = tbProDepartDao.queryByPage(tbProDepart);
if (CollectionUtils.isNotEmpty(list)) {
list.forEach(item -> {

8
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProPowerServiceImpl.java
View File

@ -66,6 +66,14 @@ public class TbProPowerServiceImpl implements TbProPowerService {
*/
@Override
public List<TbProPower> queryByPage(TbProPower tbProPower) {
if (tbProPower.getGtName() != null) {
String gtName = tbProPower.getGtName();
if (Constants.UNDERLINE.equals(gtName)) {
tbProPower.setGtName(gtName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(gtName)) {
tbProPower.setGtName(gtName.replace("%", "/%"));
}
}
return tbProPowerDao.queryByPage(tbProPower);
}

16
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java
View File

@ -58,6 +58,22 @@ public class TbProjectServiceImpl implements TbProjectService {
*/
@Override
public List<TbProjectVo> queryByPage(TbProject tbProject) {
if (tbProject.getDepartName() != null) {
String departName = tbProject.getDepartName();
if (Constants.UNDERLINE.equals(departName)) {
tbProject.setDepartName(departName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(departName)) {
tbProject.setDepartName(departName.replace("%", "/%"));
}
}
if (tbProject.getProName() != null) {
String proName = tbProject.getProName();
if (Constants.UNDERLINE.equals(proName)) {
tbProject.setProName(proName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(proName)) {
tbProject.setProName(proName.replace("%", "/%"));
}
}
return tbProjectDao.queryByPage(tbProject);
}

24
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbTeamServiceImpl.java
View File

@ -83,6 +83,30 @@ public class TbTeamServiceImpl implements TbTeamService {
*/
@Override
public List<TbTeam> queryByPage(TbTeam tbTeam) {
if (tbTeam.getTeamName() != null) {
String teamName = tbTeam.getTeamName();
if (Constants.UNDERLINE.equals(teamName)) {
tbTeam.setTeamName(teamName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(teamName)) {
tbTeam.setTeamName(teamName.replace("%", "/%"));
}
}
if (tbTeam.getRelName() != null) {
String relName = tbTeam.getRelName();
if (Constants.UNDERLINE.equals(relName)) {
tbTeam.setRelName(relName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(relName)) {
tbTeam.setRelName(relName.replace("%", "/%"));
}
}
if (tbTeam.getKeyWord() != null) {
String keyWord = tbTeam.getKeyWord();
if (Constants.UNDERLINE.equals(keyWord)) {
tbTeam.setKeyWord(keyWord.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(keyWord)) {
tbTeam.setKeyWord(keyWord.replace("%", "/%"));
}
}
List<TbTeam> teamList = tbTeamDao.queryByPage(tbTeam);
if (CollectionUtils.isNotEmpty(teamList)) {
for (TbTeam team : teamList) {

17
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbUserPostServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.bonus.base.basic.service.impl;
import cn.hutool.core.util.PhoneUtil;
import com.alibaba.nacos.common.utils.CollectionUtils;
import com.bonus.base.basic.config.Constants;
import com.bonus.base.basic.domain.TbUserPost;
import com.bonus.base.basic.mapper.TbUserPostMapper;
import com.bonus.base.basic.service.TbUserPostService;
@ -34,6 +35,22 @@ public class TbUserPostServiceImpl implements TbUserPostService {
*/
@Override
public List<TbUserPost> queryByPage(TbUserPost tbUserPost) {
if (tbUserPost.getPostName() != null) {
String postName = tbUserPost.getPostName();
if (Constants.UNDERLINE.equals(postName)) {
tbUserPost.setPostName(postName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(postName)) {
tbUserPost.setPostName(postName.replace("%", "/%"));
}
}
if (tbUserPost.getRelName() != null) {
String relName = tbUserPost.getRelName();
if (Constants.UNDERLINE.equals(relName)) {
tbUserPost.setRelName(relName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(relName)) {
tbUserPost.setRelName(relName.replace("%", "/%"));
}
}
List<TbUserPost> list = tbUserPostDao.queryByPage(tbUserPost);
if (CollectionUtils.isNotEmpty(list)) {
for (TbUserPost userPost : list) {

8
bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbWarnConfigServiceImpl.java
View File

@ -128,6 +128,14 @@ public class TbWarnConfigServiceImpl implements TbWarnConfigService {
@Override
public List<TbWarnConfig> getAll(TbWarnConfig record){
if (record.getConfigName() != null) {
String configName = record.getConfigName();
if (Constants.UNDERLINE.equals(configName)) {
record.setConfigName(configName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(configName)) {
record.setConfigName(configName.replace("%", "/%"));
}
}
List<TbWarnConfig> list = tbWarnConfigMapper.getAll(record);
if (list != null && list.size() > 0) {
for (TbWarnConfig tbWarnConfig : list) {

9
bonus-modules/base/src/main/java/com/bonus/base/screen/controller/ProjectDetailsViewController.java
View File

@ -4,6 +4,8 @@ import com.bonus.base.basic.service.TbPeopleService;
import com.bonus.base.screen.service.impl.ProjectDetailsViewServiceImpl;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -30,6 +32,7 @@ public class ProjectDetailsViewController extends BaseController {
* 根据工程id查询相对应类型下的设备信息
*/
@GetMapping("/queryDevInfoByProject")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "检测设备信息")
public AjaxResult queryDevInfoByProject(Integer proId, Integer powerId, Integer devType) {
return AjaxResult.success(projectDetailsViewService.queryDevInfoByProject(proId, powerId, devType));
}
@ -39,6 +42,7 @@ public class ProjectDetailsViewController extends BaseController {
* @param proId 工程id
*/
@GetMapping("/queryPeoplePositionByProject")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "查询工程人员安全帽定位信息")
public AjaxResult queryPeoplePositionByProject(Integer proId) {
return AjaxResult.success(tbPeopleService.queryPeoplePositionByProId(proId));
}
@ -49,6 +53,7 @@ public class ProjectDetailsViewController extends BaseController {
* @param devId 设备id
*/
@GetMapping("/getDevAttributeLatestInfoById")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "查询设备最新各项监测数据")
public AjaxResult getDevAttributeLatestInfoById(Integer devId) {
return AjaxResult.success(projectDetailsViewService.getDevAttributeLatestInfoById(devId));
}
@ -58,6 +63,7 @@ public class ProjectDetailsViewController extends BaseController {
* @param devId 设备id
*/
@GetMapping("/getDevAttributeRecordById")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "查询室外感知设备历史各项数据曲线图信息")
public AjaxResult getDevAttributeRecordByDevId(Integer devId) {
return projectDetailsViewService.getDevAttributeRecordByDevId(devId);
}
@ -67,6 +73,7 @@ public class ProjectDetailsViewController extends BaseController {
* @param proId 工程id
*/
@GetMapping("/getPowerDevAttributeRecordByWarn")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "查询室外感知设备报警记录信息")
public AjaxResult getPowerDevAttributeRecordByWarn(Integer proId) {
return projectDetailsViewService.getPowerDevAttributeRecordByWarn(proId);
}
@ -76,6 +83,7 @@ public class ProjectDetailsViewController extends BaseController {
* @param devId 设备id
*/
@GetMapping("/getPitDevAttributeRecordByDevice")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "查询基坑监测设备历史数据曲线图信息")
public AjaxResult getPitDevAttributeRecordByDevice(Integer devId) {
return projectDetailsViewService.getPitDevAttributeRecordByDeviceId(devId);
}
@ -122,6 +130,7 @@ public class ProjectDetailsViewController extends BaseController {
* @param proId 工程id
*/
@GetMapping("/getTowerDevAttributeRecordByDay")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "查询组塔监测设备当日监测数据")
public AjaxResult getTowerDevAttributeRecordByDay(Integer proId) {
return projectDetailsViewService.getTowerDevAttributeRecordByDay(proId);
}

11
bonus-modules/base/src/main/java/com/bonus/base/screen/controller/ProjectViewController.java
View File

@ -9,6 +9,8 @@ import com.bonus.base.screen.vo.DeviceWarnRecordVo;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -36,16 +38,19 @@ public class ProjectViewController extends BaseController {
@GetMapping("/getDeskConfigList")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "工作台->查询工作台信息")
public AjaxResult getDeskConfigList() {
return success(screenDeskConfigService.getAll());
}
@PostMapping("/setDeskConfig")
@SysLog(title = "大屏", businessType = OperaType.INSERT, module = "工作台->编辑保存工作台信息")
public AjaxResult setDeskConfig(@RequestBody List<ScreenDeskConfig> list) {
return success(screenDeskConfigService.insertList(list));
}
@GetMapping("/getProjectModelData")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "首页->工程信息")
public AjaxResult getProjectModelData() {
return success(projectViewService.getProjectView());
}
@ -56,11 +61,13 @@ public class ProjectViewController extends BaseController {
}
@GetMapping("/getSensingDeviceModelData")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "首页->感知设备")
public AjaxResult getSensingDeviceModelData() {
return success(projectViewService.getSensingDevice());
}
@GetMapping("/getDeviceWarnRecord")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "首页->施工风险实时预警")
public AjaxResult getDeviceWarnRecord(DeviceWarnRecordVo deviceWarnRecordVo) {
return success(projectViewService.getDeviceWarnRecord(deviceWarnRecordVo));
}
@ -73,7 +80,7 @@ public class ProjectViewController extends BaseController {
}
@GetMapping("/getDeviceModelDetailsPage")
public TableDataInfo getDeviceModelDetailsPage(@Valid TbDevice tbDevice) {
public TableDataInfo getDeviceModelDetailsPage(TbDevice tbDevice) {
startPage();
List<DeviceWarnRecordVo> list = projectViewService.getDeviceModelDetailsPage(tbDevice);
return getDataTable(list);
@ -86,6 +93,7 @@ public class ProjectViewController extends BaseController {
* @return
*/
@GetMapping("/getProjectListGroupAreaByTypeCode")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "首页->地图详情信息")
public AjaxResult getProjectListGroupAreaByTypeCode(Integer projectTypeCode, Integer areaId) {
return success(projectViewService.getProjectListGroupAreaByTypeCode(projectTypeCode, areaId));
}
@ -96,6 +104,7 @@ public class ProjectViewController extends BaseController {
}
@GetMapping("/getTeamPersonListByProId")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "人员检测类信息")
public AjaxResult getTeamPersonListByProId(Integer proId) {
return projectViewService.getTeamJoinPersonListByProId(proId);
}

7
bonus-modules/base/src/main/java/com/bonus/base/screen/controller/ProjectViewTwoController.java
View File

@ -7,7 +7,8 @@ import com.bonus.base.screen.vo.*;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.base.screen.vo.*;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -41,6 +42,7 @@ public class ProjectViewTwoController extends BaseController {
* @return
*/
@GetMapping("/getDeviceModelDataAmount")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "首页->边缘物联代理设备")
public AjaxResult getDeviceModelDataAmount() {
return success(projectViewService.getBdDeviceMapper());
}
@ -62,6 +64,7 @@ public class ProjectViewTwoController extends BaseController {
* @return
*/
@GetMapping("/getWarnPredictionRecord")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "首页->安全隐患预测记录")
public AjaxResult getWarnPredictionRecord(WarnPredictionRecordVo record) {
return success(projectViewService.getWarnPredictionRecord(record));
}
@ -72,6 +75,7 @@ public class ProjectViewTwoController extends BaseController {
* @return
*/
@GetMapping("/getWarnPredictionRecordAll")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "首页->安全隐患预测记录所有信息")
public TableDataInfo getWarnPredictionRecordAll(WarnPredictionRecordVo record) {
startPage();
List<WarnPredictionRecordVo> list = projectViewService.getWarnPredictionRecord(record);
@ -151,6 +155,7 @@ public class ProjectViewTwoController extends BaseController {
* @return
*/
@GetMapping("/getDevTypeCodeDetails")
@SysLog(title = "大屏", businessType = OperaType.QUERY, module = "查询当天预警信息")
public AjaxResult getDevTypeCodeDetails(DeviceWarnRecordVo record) {
return success(projectViewService.getDevTypeCodeDetails(record));
}

73
bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/ProjectViewServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.bonus.base.screen.service.impl;
import com.alibaba.nacos.common.utils.CollectionUtils;
import com.bonus.base.basic.config.Constants;
import com.bonus.base.basic.config.DeviceTypeEnum;
import com.bonus.base.basic.config.ProjectTypeEnum;
import com.bonus.base.basic.domain.TbDevice;
@ -87,6 +88,14 @@ public class ProjectViewServiceImpl {
}
public List<DeviceWarnRecordVo> getDeviceWarnRecord(DeviceWarnRecordVo deviceWarnRecordVo) {
if (deviceWarnRecordVo.getProName() != null) {
String proName = deviceWarnRecordVo.getProName();
if (Constants.UNDERLINE.equals(proName)) {
deviceWarnRecordVo.setProName(proName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(proName)) {
deviceWarnRecordVo.setProName(proName.replace("%", "/%"));
}
}
return tbDeviceDataRecord.getDeviceWarnRecord(deviceWarnRecordVo);
}
@ -96,6 +105,14 @@ public class ProjectViewServiceImpl {
* @return
*/
public List<WarnPredictionRecordVo> getWarnPredictionRecord(WarnPredictionRecordVo record) {
if (record.getProName() != null) {
String proName = record.getProName();
if (Constants.UNDERLINE.equals(proName)) {
record.setProName(proName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(proName)) {
record.setProName(proName.replace("%", "/%"));
}
}
return tbDeviceDataRecord.getWarnPredictionRecord(record);
}
@ -159,6 +176,22 @@ public class ProjectViewServiceImpl {
* @return
*/
public List<DeviceWarnRecordVo> getDeviceModelDetailsPage(TbDevice tbDevice) {
if (tbDevice.getDevName() != null) {
String devName = tbDevice.getDevName();
if (Constants.UNDERLINE.equals(devName)) {
tbDevice.setDevName(devName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devName)) {
tbDevice.setDevName(devName.replace("%", "/%"));
}
}
if (tbDevice.getDevCode() != null) {
String devCode = tbDevice.getDevCode();
if (Constants.UNDERLINE.equals(devCode)) {
tbDevice.setDevCode(devCode.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devCode)) {
tbDevice.setDevCode(devCode.replace("%", "/%"));
}
}
return tbDeviceMapper.getDeviceModelDetailsPage(tbDevice);
}
@ -168,6 +201,22 @@ public class ProjectViewServiceImpl {
* @return
*/
public List<TbBdDeviceRecordTwo> getDeviceModelDataAll(TbBdDeviceRecordTwo bdData) {
if (bdData.getDevName() != null) {
String devName = bdData.getDevName();
if (Constants.UNDERLINE.equals(devName)) {
bdData.setDevName(devName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devName)) {
bdData.setDevName(devName.replace("%", "/%"));
}
}
if (bdData.getDevCode() != null) {
String devCode = bdData.getDevCode();
if (Constants.UNDERLINE.equals(devCode)) {
bdData.setDevCode(devCode.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(devCode)) {
bdData.setDevCode(devCode.replace("%", "/%"));
}
}
return tbDeviceMapper.getDeviceModelDataAll(bdData);
}
@ -223,6 +272,22 @@ public class ProjectViewServiceImpl {
* @return
*/
public List<TeamRecord> getTeamDetails(TeamRecord record) {
if (record.getTeamName() != null) {
String teamName = record.getTeamName();
if (Constants.UNDERLINE.equals(teamName)) {
record.setTeamName(teamName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(teamName)) {
record.setTeamName(teamName.replace("%", "/%"));
}
}
if (record.getMasterName() != null) {
String masterName = record.getMasterName();
if (Constants.UNDERLINE.equals(masterName)) {
record.setMasterName(masterName.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(masterName)) {
record.setMasterName(masterName.replace("%", "/%"));
}
}
List<TeamRecord> list = new ArrayList<>();
list = teamRecord.getTeamDetails(record);
if(CollectionUtils.isNotEmpty(list)) {
@ -241,6 +306,14 @@ public class ProjectViewServiceImpl {
* @return
*/
public List<TeamRecord> getTeamPeopleDetails(TeamRecord record) {
if (record.getPeopleName() != null) {
String name = record.getPeopleName();
if (Constants.UNDERLINE.equals(name)) {
record.setPeopleName(name.replace("_", "/_"));
} else if (Constants.PERCENT_SIGN.equals(name)) {
record.setPeopleName(name.replace("%", "/%"));
}
}
List<TeamRecord> list = new ArrayList<>();
list = teamRecord.getTeamPeopleDetails(record);
if(CollectionUtils.isNotEmpty(list)) {

12
bonus-modules/base/src/main/resources/mapper/base/basic/TbBdDeviceRecordMapper.xml
View File

@ -267,20 +267,16 @@
where
b.audit_status = 1
<if test="proName != null and proName != ''">
and b.pro_name like concat('%',#{proName},'%')
and b.pro_name NOT LIKE '%_%' ESCAPE '/'
and b.pro_name like concat('%',#{proName},'%') ESCAPE '/'
</if>
<if test="departName != null and departName != ''">
and b.depart_name like concat('%',#{departName},'%')
and b.depart_name NOT LIKE '%_%' ESCAPE '/'
and b.depart_name like concat('%',#{departName},'%') ESCAPE '/'
</if>
<if test="devName != null and devName != ''">
and a.dev_name like concat('%',#{devName},'%')
and a.dev_name NOT LIKE '%_%' ESCAPE '/'
and a.dev_name like concat('%',#{devName},'%') ESCAPE '/'
</if>
<if test="devCode != null and devCode != ''">
and a.dev_code like concat('%',#{devCode},'%')
and a.dev_code NOT LIKE '%_%' ESCAPE '/'
and a.dev_code like concat('%',#{devCode},'%') ESCAPE '/'
</if>
</select>

9
bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml
View File

@ -38,16 +38,13 @@
left join tb_bd_device_record tbd on tbd.record_id = tbr.id
where del_flag = 0
<if test="departName != null and departName != ''">
and tbr.depart_name like concat('%',#{departName},'%')
and tbr.depart_name NOT LIKE '%_%' ESCAPE '/'
and tbr.depart_name like concat('%',#{departName},'%') ESCAPE '/'
</if>
<if test="proName != null and proName != ''">
and tbr.pro_name like concat('%',#{proName},'%')
and tbr.pro_name NOT LIKE '%_%' ESCAPE '/'
and tbr.pro_name like concat('%',#{proName},'%') ESCAPE '/'
</if>
<if test="relUser != null and relUser != ''">
and tbr.rel_user like concat('%',#{relUser},'%')
and tbr.rel_user NOT LIKE '%_%' ESCAPE '/'
and tbr.rel_user like concat('%',#{relUser},'%') ESCAPE '/'
</if>
<if test="applyTime != null and applyTime != ''">
and DATE_FORMAT(tbr.create_time, '%Y-%m-%d') = #{applyTime}

3
bonus-modules/base/src/main/resources/mapper/base/basic/TbDevAttributeMapper.xml
View File

@ -48,8 +48,7 @@
WHERE
tddr.is_warn = '1'
<if test="devName != null and devName != ''">
and tddr.dev_name like concat('%',#{devName},'%')
and tddr.dev_name NOT LIKE '%_%' ESCAPE '/'
and tddr.dev_name like concat('%',#{devName},'%') ESCAPE '/'
</if>
<if test="devType != null and devType != ''">
and tddr.dev_type = #{devType}

18
bonus-modules/base/src/main/resources/mapper/base/basic/TbDeviceMapper.xml
View File

@ -286,12 +286,10 @@
and td.dev_type = #{devType}
</if>
<if test="devName != null and devName != ''">
and td.dev_name like concat('%',#{devName},'%')
and td.dev_name NOT LIKE '%_%' ESCAPE '/'
and td.dev_name like concat('%',#{devName},'%') ESCAPE '/'
</if>
<if test="devCode != null and devCode != ''">
and td.dev_code like concat('%',#{devCode},'%')
and td.dev_code NOT LIKE '%_%' ESCAPE '/'
and td.dev_code like concat('%',#{devCode},'%') ESCAPE '/'
</if>
<if test="devStatus != null">
and td.dev_status = #{devStatus}
@ -345,12 +343,10 @@
and td.dev_type = #{devTypeCode}
</if>
<if test="devName != null and devName != ''">
and td.dev_name like concat('%',#{devName},'%')
and td.dev_name NOT LIKE '%_%' ESCAPE '/'
and td.dev_name like concat('%',#{devName},'%') ESCAPE '/'
</if>
<if test="devCode != null and devCode != ''">
and td.dev_code like concat('%',#{devCode},'%')
and td.dev_code NOT LIKE '%_%' ESCAPE '/'
and td.dev_code like concat('%',#{devCode},'%') ESCAPE '/'
</if>
</select>
@ -378,12 +374,10 @@
left join tb_bd_record tbr on tbdr.record_id = tbr.id and tbr.del_flag = 0
where tbr.audit_status = 1 and tp.del_flag = 0
<if test="devName != null and devName != ''">
and tbdr.dev_name like concat('%',#{devName},'%')
and tbdr.dev_name NOT LIKE '%_%' ESCAPE '/'
and tbdr.dev_name like concat('%',#{devName},'%') ESCAPE '/'
</if>
<if test="devCode != null and devCode != ''">
and tbdr.dev_code like concat('%',#{devCode},'%')
and tbdr.dev_code NOT LIKE '%_%' ESCAPE '/'
and tbdr.dev_code like concat('%',#{devCode},'%') ESCAPE '/'
</if>
<if test="devStatus != null ">
and tbdr.dev_status = #{devStatus}

3
bonus-modules/base/src/main/resources/mapper/base/basic/TbPeopleMapper.xml
View File

@ -20,8 +20,7 @@
and tp.team_id = #{id}
</if>
<if test="relName != null and relName != ''">
and tp.rel_name like concat('%',#{relName},'%')
and tp.rel_name NOT LIKE '%_%' ESCAPE '/'
and tp.rel_name like concat('%',#{relName},'%') ESCAPE '/'
</if>
<if test="sex != null">
and tp.sex = #{sex}

6
bonus-modules/base/src/main/resources/mapper/base/basic/TbProDepartMapper.xml
View File

@ -26,12 +26,10 @@
and tpd.area_id = #{areaId}
</if>
<if test="departName != null and departName != ''">
and tpd.depart_name like concat('%',#{departName},'%')
and tpd.depart_name NOT LIKE '%_%' ESCAPE '/'
and tpd.depart_name like concat('%',#{departName},'%') ESCAPE '/'
</if>
<if test="headUser != null and headUser != ''">
and tpd.head_user like concat('%',#{headUser},'%')
and tpd.head_user NOT LIKE '%_%' ESCAPE '/'
and tpd.head_user like concat('%',#{headUser},'%') ESCAPE '/'
</if>
ORDER BY tpd.create_time DESC
</select>

3
bonus-modules/base/src/main/resources/mapper/base/basic/TbProPowerMapper.xml
View File

@ -11,8 +11,7 @@
and tb.pro_id = #{id}
</if>
<if test="gtName != null and gtName != ''">
and tb.gt_name like concat('%',#{gtName},'%')
and tb.gt_name NOT LIKE '%_%' ESCAPE '/'
and tb.gt_name like concat('%',#{gtName},'%') ESCAPE '/'
</if>
</select>

6
bonus-modules/base/src/main/resources/mapper/base/basic/TbProjectMapper.xml
View File

@ -31,8 +31,7 @@
and tb.id = #{id}
</if>
<if test="proName != null and proName != ''">
and tb.pro_name like concat('%',#{proName},'%')
and tb.pro_name NOT LIKE '%_%' ESCAPE '/'
and tb.pro_name like concat('%',#{proName},'%') ESCAPE '/'
</if>
<if test="relId != null and relId != '' ">
and tb.rel_id = #{relId}
@ -44,8 +43,7 @@
and tb.pro_type = #{proType}
</if>
<if test="departName != null and departName != ''">
and tpd.depart_name like concat('%',#{departName},'%')
and tpd.depart_name NOT LIKE '%_%' ESCAPE '/'
and tpd.depart_name like concat('%',#{departName},'%') ESCAPE '/'
</if>
<if test="departId != null">
and tb.depart_id = #{departId}

14
bonus-modules/base/src/main/resources/mapper/base/basic/TbTeamMapper.xml
View File

@ -25,21 +25,19 @@
and id = #{id}
</if>
<if test="teamName != null and teamName != ''">
and tt.team_name like concat('%',#{teamName},'%')
and tt.team_name NOT LIKE '%_%' ESCAPE '/'
and tt.team_name like concat('%',#{teamName},'%') ESCAPE '/'
</if>
<if test="relName != null and relName != ''">
and tt.rel_name like concat('%',#{relName},'%')
and tt.rel_name NOT LIKE '%_%' ESCAPE '/'
and tt.rel_name like concat('%',#{relName},'%') ESCAPE '/'
</if>
<if test="keyWord != null and keyWord != ''">
and (
tt.team_name LIKE CONCAT('%', #{keyWord}, '%')
OR tt.rel_name LIKE CONCAT('%', #{keyWord}, '%')
OR tt.pro_name LIKE CONCAT('%', #{keyWord}, '%')
tt.team_name LIKE CONCAT('%', #{keyWord}, '%') ESCAPE '/'
OR tt.rel_name LIKE CONCAT('%', #{keyWord}, '%') ESCAPE '/'
OR tt.pro_name LIKE CONCAT('%', #{keyWord}, '%') ESCAPE '/'
OR
CASE WHEN tt.js_time IS NULL THEN '正常' ELSE '已解散' END
LIKE CONCAT('%', #{keyWord}, '%')
LIKE CONCAT('%', #{keyWord}, '%') ESCAPE '/'
)
</if>
GROUP BY tt.id

6
bonus-modules/base/src/main/resources/mapper/base/basic/TbUserPostMapper.xml
View File

@ -14,12 +14,10 @@
and create_time = #{createTime}
</if>
<if test="postName != null and postName != ''">
and post_name like concat('%',#{postName},'%')
and post_name NOT LIKE '%_%' ESCAPE '/'
and post_name like concat('%',#{postName},'%') ESCAPE '/'
</if>
<if test="relName != null and relName != ''">
and rel_name like concat('%',#{relName},'%')
and rel_name NOT LIKE '%_%' ESCAPE '/'
and rel_name like concat('%',#{relName},'%') ESCAPE '/'
</if>
</where>
</select>

3
bonus-modules/base/src/main/resources/mapper/base/basic/TbWarnConfigMapper.xml
View File

@ -410,8 +410,7 @@
and twc.configu_type = #{configuType}
</if>
<if test="configName != null and configName != ''">
and twc.config_name like concat('%',#{configName},'%')
and twc.config_name NOT LIKE '%_%' ESCAPE '/'
and twc.config_name like concat('%',#{configName},'%') ESCAPE '/'
</if>
<if test="devId != null">
and td.id = #{devId}

6
bonus-modules/base/src/main/resources/mapper/base/screen/TbDeviceDataRecordMapper.xml
View File

@ -41,8 +41,7 @@
and td.dev_type = #{devTypeCode}
</if>
<if test="proName != null and proName != ''">
and tp.pro_name like concat('%',#{proName},'%')
and tp.pro_name NOT LIKE '%_%' ESCAPE '/'
and tp.pro_name like concat('%',#{proName},'%') ESCAPE '/'
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[and DATE(tddr.create_time) BETWEEN #{startTime} AND #{endTime} ]]>
@ -128,8 +127,7 @@
where
tp.del_flag = 0
<if test="proName != null and proName != ''">
and tp.pro_name like concat('%',#{proName},'%')
and tp.pro_name NOT LIKE '%_%' ESCAPE '/'
and tp.pro_name like concat('%',#{proName},'%') ESCAPE '/'
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[and DATE(twp.create_time) BETWEEN #{startTime} AND #{endTime} ]]>

6
bonus-modules/base/src/main/resources/mapper/base/screen/TeamRecordMapper.xml
View File

@ -36,10 +36,10 @@
AND tt.pro_id = #{proId}
</if>
<if test="teamName != null and teamName != ''">
and tt.team_name like concat('%',#{teamName},'%')
and tt.team_name like concat('%',#{teamName},'%') ESCAPE '/'
</if>
<if test="masterName != null and masterName != ''">
and tt.rel_name like concat('%',#{masterName},'%')
and tt.rel_name like concat('%',#{masterName},'%') ESCAPE '/'
</if>
group by tt.id
</select>
@ -59,7 +59,7 @@
AND tt.pro_id = #{proId}
</if>
<if test="peopleName != null and peopleName != ''">
and tp.rel_name like concat('%',#{peopleName},'%')
and tp.rel_name like concat('%',#{peopleName},'%') ESCAPE '/'
</if>
<if test="postCode != null and postCode != ''">
and tp.post_code = #{postCode}