admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

鞍钢优化

Browse Source
This commit is contained in:
pengjie 2025-05-13 10:50:12 +08:00
parent 786f404a83
commit 87535054aa
11 changed files with 150 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
View File

@ -124,13 +124,6 @@ public class CarInfoController {
Object alarmPushWorkerId = map.get("alarmPushWorkerId");
String userId = String.valueOf(map.get("enterpriseId"));
Object driverWorkerName = map.get("driverWorkerName");
List<String> carType = new ArrayList<>();
try {
carType = (List<String>) map.get("carType");
} catch (Exception e) {
log.error("", e);
carType = Arrays.asList("1787328649423364098");
}
List<String> driverWorkerId = (List<String>) map.get("driverWorkerId");
Integer carModuleType = "临时车辆".equals(MapUtils.getString(map, "carModuleType")) ? 2 : 3;
List<String> userIds = (List<String>) map.get("userIds");
@ -164,7 +157,13 @@ public class CarInfoController {
if (carColor != null) {
carInfo.setCarColor(String.valueOf(carColor));
}
try {
List<String> carType = (List<String>) map.get("carType");
carInfo.setCarType(Long.valueOf(carType.get(0).toString()));
} catch (Exception e) {
log.error("", e);
carInfo.setCarType(Long.valueOf("1787328649423364098"));
}
carInfo.setDriverTelephone(String.valueOf(map.get("driverTelephone")));
List<Map<String, Object>> carPhotosUrl = (List<Map<String, Object>>) map.get("carPhotosUrl");
List<Map<String, Object>> carPhotosUrls = new ArrayList<>();

80
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java
View File

@ -1,5 +1,7 @@
package com.zhgd.xmgl.modules.xz.special.controller;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.basicdata.enums.SystemUserAccountTypeEnum;
@ -16,6 +18,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.PostMapping;
@ -53,6 +56,10 @@ public class CountApiController {
@Lazy
@Resource
IXzSpecialOperationFireSafetyService iXzSpecialOperationFireSafetyService;
@Lazy
@Resource
IXzSpecialOperationFireSafetyNewService xzSpecialOperationFireSafetyNewService;
@Lazy
@Resource
IXzTemporaryElectricitySafeService xzTemporaryElectricitySafeService;
@ -174,5 +181,76 @@ public class CountApiController {
return Result.success(rtVo);
}
@ApiOperation(value = "统计特殊作业情况", notes = "统计特殊作业情况", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countSpecialByData")
public Result<List<CountSpecialVo>> countSpecialByData(@ApiIgnore @RequestBody Map<String, Object> param) {
String projectSn = MapUtils.getString(param, "projectSn");
String startTime = MapUtils.getString(param, "startTime");
String endTime = MapUtils.getString(param, "endTime");
List<String> enterpriseIds = userEnterpriseService.getEnterpriseIdsIfSubProject();
Integer accountType = SecurityUtils.getUser().getAccountType();
boolean isSubAccount = Objects.equals(accountType, SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue());
List<XzBlindPlatePlugSafe> n1 = xzBlindPlatePlugSafeService.list(new LambdaQueryWrapper<XzBlindPlatePlugSafe>()
.eq(XzBlindPlatePlugSafe::getProjectSn, projectSn)
.in(isSubAccount, XzBlindPlatePlugSafe::getJobApplicationUnit, enterpriseIds)
);
List<XzGroundSafet> n2 = iXzGroundSafetService.list(new LambdaQueryWrapper<XzGroundSafet>()
.eq(XzGroundSafet::getProjectSn, projectSn)
.in(isSubAccount, XzGroundSafet::getJobApplicationUnit, enterpriseIds)
);
List<XzHighJobSafe> n3 = iXzHighJobSafeService.list(new LambdaQueryWrapper<XzHighJobSafe>()
.eq(XzHighJobSafe::getProjectSn, projectSn)
.in(isSubAccount, XzHighJobSafe::getJobApplicationUnit, enterpriseIds)
);
List<XzHoistSafetyWork> n4 = iXzHoistSafetyWorkService.list(new LambdaQueryWrapper<XzHoistSafetyWork>()
.eq(XzHoistSafetyWork::getProjectSn, projectSn)
.in(isSubAccount, XzHoistSafetyWork::getJobApplicationUnit, enterpriseIds)
);
List<XzLimitSpaceSafe> n5 = iXzLimitSpaceSafeService.list(new LambdaQueryWrapper<XzLimitSpaceSafe>()
.eq(XzLimitSpaceSafe::getProjectSn, projectSn)
.in(isSubAccount, XzLimitSpaceSafe::getJobApplicationUnit, enterpriseIds)
);
List<XzOpenCircuitSafe> n6 = iXzOpenCircuitSafeService.list(new LambdaQueryWrapper<XzOpenCircuitSafe>()
.eq(XzOpenCircuitSafe::getProjectSn, projectSn)
.in(isSubAccount, XzOpenCircuitSafe::getJobApplicationUnit, enterpriseIds)
);
List<XzSpecialOperationFireSafetyNew> n7 = xzSpecialOperationFireSafetyNewService.list(new LambdaQueryWrapper<XzSpecialOperationFireSafetyNew>()
.eq(XzSpecialOperationFireSafetyNew::getProjectSn, projectSn)
.in(isSubAccount, XzSpecialOperationFireSafetyNew::getJobApplicationUnit, enterpriseIds)
);
List<XzTemporaryElectricitySafe> n8 = xzTemporaryElectricitySafeService.list(new LambdaQueryWrapper<XzTemporaryElectricitySafe>()
.eq(XzTemporaryElectricitySafe::getProjectSn, projectSn)
.in(isSubAccount, XzTemporaryElectricitySafe::getJobApplicationUnit, enterpriseIds)
);
List<CountSpecialVo> list = new ArrayList<>();
long betweenDay = DateUtil.betweenDay(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), true);
for (int i = 0; i < betweenDay; i++) {
CountSpecialVo vo = new CountSpecialVo();
DateTime dateTime = DateUtil.offsetDay(DateUtil.parseDate(startTime), i);
vo.setDate(DateUtil.format(dateTime, "MM-dd"));
vo.setXzBlindPlatePlugSafeNum((int) n1.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
&& n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
vo.setXzGroundSafetNum((int) n2.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
&& n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
vo.setXzHighJobSafeNum((int) n3.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
&& n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
vo.setXzHoistSafetyWorkNum((int) n4.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
&& n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
vo.setXzLimitSpaceSafeNum((int) n5.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
&& n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
vo.setXzOpenCircuitSafeNum((int) n6.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
&& n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
vo.setXzSpecialOperationFireSafetyNum((int) n7.stream().filter(n -> n.getHotWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
&& n.getHotWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
vo.setXzTemporaryElectricitySafeNum((int) n8.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
&& n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
list.add(vo);
}
return Result.success(list);
}
}

7
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java
View File

@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -69,6 +71,11 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl<XzBlindPlatePlu
public IPage<XzBlindPlatePlugSafe> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzBlindPlatePlugSafe> queryWrapper = getQueryWrapper(paramMap);
Page<XzBlindPlatePlugSafe> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzBlindPlatePlugSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;

7
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java
View File

@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -68,6 +70,11 @@ public class XzGroundSafetServiceImpl extends ServiceImpl<XzGroundSafetMapper, X
public IPage<XzGroundSafet> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzGroundSafet> queryWrapper = getQueryWrapper(paramMap);
Page<XzGroundSafet> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzGroundSafet> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;

7
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java
View File

@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -68,6 +70,11 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl<XzHighJobSafeMapper, X
public IPage<XzHighJobSafe> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzHighJobSafe> queryWrapper = getQueryWrapper(paramMap);
Page<XzHighJobSafe> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzHighJobSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;

7
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java
View File

@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -68,6 +70,11 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl<XzHoistSafetyWorkM
public IPage<XzHoistSafetyWork> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzHoistSafetyWork> queryWrapper = getQueryWrapper(paramMap);
Page<XzHoistSafetyWork> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzHoistSafetyWork> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;

7
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java
View File

@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -68,6 +70,11 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl<XzLimitSpaceSafeMap
public IPage<XzLimitSpaceSafe> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzLimitSpaceSafe> queryWrapper = getQueryWrapper(paramMap);
Page<XzLimitSpaceSafe> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzLimitSpaceSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;

7
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java
View File

@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -68,6 +70,11 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl<XzOpenCircuitSafeM
public IPage<XzOpenCircuitSafe> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzOpenCircuitSafe> queryWrapper = getQueryWrapper(paramMap);
Page<XzOpenCircuitSafe> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzOpenCircuitSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;

8
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyNewServiceImpl.java
View File

@ -27,8 +27,11 @@ import com.zhgd.xmgl.modules.xz.special.service.IXzSpecialOperationFireSafetyNew
import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.MapUtil;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -70,6 +73,11 @@ public class XzSpecialOperationFireSafetyNewServiceImpl extends ServiceImpl<XzSp
public IPage<XzSpecialOperationFireSafetyNew> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzSpecialOperationFireSafetyNew> queryWrapper = getQueryWrapper(paramMap);
Page<XzSpecialOperationFireSafetyNew> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzSpecialOperationFireSafetyNew> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;

7
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzSpecialOperationFireSafetyServiceImpl.java
View File

@ -28,6 +28,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -69,6 +71,11 @@ public class XzSpecialOperationFireSafetyServiceImpl extends ServiceImpl<XzSpeci
public IPage<XzSpecialOperationFireSafety> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzSpecialOperationFireSafety> queryWrapper = getQueryWrapper(paramMap);
Page<XzSpecialOperationFireSafety> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzSpecialOperationFireSafety> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;

7
src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java
View File

@ -27,6 +27,8 @@ import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MapBuilder;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -68,6 +70,11 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl<XzTempora
public IPage<XzTemporaryElectricitySafe> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzTemporaryElectricitySafe> queryWrapper = getQueryWrapper(paramMap);
Page<XzTemporaryElectricitySafe> page = PageUtil.getPage(paramMap);
String keywords = MapUtils.getString(paramMap, "keywords");
if (StringUtils.isNotBlank(keywords)) {
queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or()
.like("su.real_name", keywords));
}
IPage<XzTemporaryElectricitySafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;