lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
lcj
2025-09-19 20:28:48 +08:00
parent c7400d25fe
commit fc9b64fc36
14 changed files with 325 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/DemoTest.java
View File

@ -18,6 +18,7 @@ import org.dromara.facility.service.IFacMatrixService;
import org.dromara.facility.service.IFacPhotovoltaicPanelPartsService;
import org.dromara.progress.service.IPgsProgressCategoryService;
import org.dromara.progress.service.IPgsProgressCategoryTemplateService;
import org.dromara.progress.service.IPgsProgressPlanDetailService;
import org.dromara.project.service.IBusProjectService;
import org.dromara.system.service.ISysDeptService;
import org.dromara.tender.service.impl.TenderSupplierInputServiceImpl;
@ -46,6 +47,9 @@ public class DemoTest {
@Resource
private IPgsProgressCategoryTemplateService progressCategoryTemplateService;
@Resource
private IPgsProgressPlanDetailService progressPlanDetailService;
@Resource
private IFacMatrixService matrixService;
@ -69,6 +73,11 @@ public class DemoTest {
@Resource
private IdCardEncryptorUtil idCardEncryptorUtil;
@Test
void testConstructionValue() {
progressPlanDetailService.syncPlanDetail2ConstructionValue(LocalDate.now().minusDays(1), null);
}
@Test
void setIdCardEncryptorUtil() {
List<SubConstructionUser> list = constructionUserService.list();

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/domain/dto/matrix/FacFacilityPositionGisReq.java
View File

@ -27,4 +27,9 @@ public class FacFacilityPositionGisReq implements Serializable {
* 方阵id列表
*/
private List<Long> matrixIdList;
/**
* 类型
*/
private List<String> typeList;
}

21
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacMatrixServiceImpl.java
View File

@ -12,7 +12,6 @@ import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.utils.JSTUtil;
import org.dromara.facility.constant.FacRedisKeyConstant;
import org.dromara.facility.domain.*;
@ -296,8 +295,11 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
List<List<Double>> coordinatesList = JSTUtil.getTwoDimensionalCoordinates(geometry);
// 获取方阵名称
String nameStr = JSTUtil.findNearestPointText(coordinatesList, nameFeatures);
if (StringUtils.isBlank(nameStr)) {
continue;
}
String name = nameStr.split(" ")[0];
if (name == null) {
if (StringUtils.isBlank(name)) {
continue;
}
// 将位置信息转换为 JSON 字符串
@ -563,6 +565,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
public List<FacFacilityPositionGisVo> getPositionGis(FacFacilityPositionGisReq req) {
Long projectId = req.getProjectId();
List<Long> matrixIdList = req.getMatrixIdList();
List<String> typeList = req.getTypeList();
BusProject project = projectService.getById(projectId);
if (project == null) {
throw new ServiceException("项目信息不存在", HttpStatus.NOT_FOUND);
@ -575,6 +578,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
if (CollUtil.isEmpty(matrixList)) {
return result;
}
if (CollUtil.isEmpty(typeList) || typeList.contains("1")) {
List<FacFacilityPositionGisVo> matrixVoList = matrixList.stream().map(obj ->
FacFacilityPositionGisVo.obj2vo(
obj.getId(),
@ -585,7 +589,9 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
))
.toList();
result.addAll(matrixVoList);
}
// 获取光伏板立柱信息
if (CollUtil.isEmpty(typeList) || typeList.contains("2")) {
List<FacPhotovoltaicPanelColumn> columnList = photovoltaicPanelColumnService.lambdaQuery()
.select(
FacPhotovoltaicPanelColumn::getId,
@ -606,7 +612,9 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
))
.toList();
result.addAll(columnVoList);
}
// 获取光伏板点信息
if (CollUtil.isEmpty(typeList) || typeList.contains("3")) {
List<FacPhotovoltaicPanelPoint> pointList = photovoltaicPanelPointService.lambdaQuery()
.select(
FacPhotovoltaicPanelPoint::getId,
@ -627,7 +635,9 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
))
.toList();
result.addAll(pointVoList);
}
// 获取光伏板支架信息
if (CollUtil.isEmpty(typeList) || typeList.contains("4")) {
List<FacPhotovoltaicPanelSupport> supportList = photovoltaicPanelSupportService.lambdaQuery()
.select(
FacPhotovoltaicPanelSupport::getId,
@ -648,7 +658,9 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
))
.toList();
result.addAll(supporVotList);
}
// 获取光伏板信息
if (CollUtil.isEmpty(typeList) || typeList.contains("5")) {
List<FacPhotovoltaicPanel> panelList = photovoltaicPanelService.lambdaQuery()
.select(
FacPhotovoltaicPanel::getId,
@ -670,7 +682,9 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
))
.toList();
result.addAll(panelVoList);
}
// 获取箱变信息
if (CollUtil.isEmpty(typeList) || typeList.contains("6")) {
List<FacBoxTransformer> boxTransformerList = boxTransformerService.lambdaQuery()
.select(
FacBoxTransformer::getId,
@ -692,7 +706,9 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
))
.toList();
result.addAll(boxTransformerVoList);
}
// 获取逆变器信息
if (CollUtil.isEmpty(typeList) || typeList.contains("7")) {
List<FacInverter> inverterList = inverterService.lambdaQuery()
.select(
FacInverter::getId,
@ -714,6 +730,7 @@ public class FacMatrixServiceImpl extends ServiceImpl<FacMatrixMapper, FacMatrix
))
.toList();
result.addAll(inverterVoList);
}
return result;
}

36
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
View File

@ -201,7 +201,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
}
// 获取项目下方阵信息
List<FacMatrix> matrixList = matrixService.lambdaQuery()
.select(FacMatrix::getId, FacMatrix::getPositions)
.select(FacMatrix::getId, FacMatrix::getPositions, FacMatrix::getMatrixName)
.eq(FacMatrix::getProjectId, projectId).list();
if (CollUtil.isEmpty(matrixList)) {
throw new ServiceException("项目下无方阵数据，请先创建方阵信息后再添加光伏板信息", HttpStatus.NOT_FOUND);
@ -292,7 +292,10 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
FacProperties nameProperties = nameFeature.getProperties();
String name = nameProperties.getText();
// ① 获取名称
if (StringUtils.isBlank(name)) return Collections.emptyList();
if (StringUtils.isBlank(name)) {
log.info("名称为空，跳过");
return Collections.emptyList();
}
// if (!name.startsWith("G")) return Collections.emptyList();
List<FacPhotovoltaicPanel> panelList = new ArrayList<>();
// ② 找到该点对应的 polygon（优先包含，否则最近）
@ -301,8 +304,33 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
// ③ 获取 geometry 坐标
List<List<Double>> coordinates = matchedPolygon.getGeometry().getCoordinates().getFirst();
// ④ 判断所属方阵
FacMatrix matrix = matrixService.getMatrixIdBy2Coordinates(matrixList, coordinates);
if (matrix == null) return Collections.emptyList();
/* FacMatrix matrix = matrixService.getMatrixIdBy2Coordinates(matrixList, coordinates);
if (matrix == null) {
log.info("所属方阵为空，跳过");
return Collections.emptyList();
}
Long matrixId = matrix.getId();*/
// 去掉首字母 (T/G)
String withoutPrefix = name.substring(1);
// 如果包含"."，只取第一个"."前的数字
int dotIndex = withoutPrefix.indexOf(".");
if (dotIndex != -1) {
withoutPrefix = withoutPrefix.substring(0, dotIndex);
}
FacMatrix matrix = null;
for (FacMatrix facMatrix : matrixList) {
String matrixName = facMatrix.getMatrixName();
String matrixName1 = matrixName.substring(1);
if (withoutPrefix.equals(matrixName1)) {
matrix = facMatrix;
break;
}
}
if (matrix == null) {
log.info("所属方阵为空，跳过");
return Collections.emptyList();
}
Long matrixId = matrix.getId();
// ⑤ 获取进度类别
List<PgsProgressCategory> progressCategoryListByMatrix = progressCategoryMap.get(matrixId);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/weathermanager/WeatherConstant.java
View File

@ -124,7 +124,7 @@ public interface WeatherConstant {
*/
static Map<String, List<String>> getWeatherStatusMap() {
Map<String, List<String>> weatherStatusMap = new HashMap<>();
weatherStatusMap.put("sunny", SUNNY);
weatherStatusMap.put("Sunny", SUNNY);
weatherStatusMap.put("manyCloud", MANY_CLOUD);
weatherStatusMap.put("cloudy", CLOUDY);
weatherStatusMap.put("smallRain", SMALL_RAIN);

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsConstructionSchedulePlanServiceImpl.java
View File

@ -255,7 +255,7 @@ public class PgsConstructionSchedulePlanServiceImpl extends ServiceImpl<PgsConst
// 主 Sheet 设置表头
Row sheetRow = mainSheet.createRow(0);
String[] headers = {"编号（格式：1，1-1，1-1-1。用于进行父子结构关联）", "节点名称", "对应项目结构", "对应项目结构编码",
"预计开始时间（格式：2025-09-06）", "预计结束时间", "实际开始时间", "实际结束时间", "状态", "状态编码", "备注"};
"预计开始时间（输入格式：2025-09-06）", "预计结束时间", "实际开始时间", "实际结束时间", "状态", "状态编码", "备注"};
for (int i = 0; i < headers.length; i++) {
Cell cell = sheetRow.createCell(i);
cell.setCellValue(headers[i]);
@ -333,11 +333,11 @@ public class PgsConstructionSchedulePlanServiceImpl extends ServiceImpl<PgsConst
// 调整列宽
mainSheet.setColumnWidth(0, 20 * 256);
mainSheet.setColumnWidth(0, 20 * 320);
mainSheet.setColumnWidth(1, 20 * 280);
mainSheet.setColumnWidth(2, 20 * 280);
mainSheet.setColumnWidth(3, 20 * 400);
mainSheet.setColumnWidth(4, 20 * 200);
mainSheet.setColumnWidth(3, 20 * 360);
mainSheet.setColumnWidth(4, 20 * 320);
mainSheet.setColumnWidth(5, 20 * 200);
mainSheet.setColumnWidth(6, 20 * 200);
mainSheet.setColumnWidth(7, 20 * 200);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
View File

@ -1066,7 +1066,6 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
for (FacMatrix matrix : matrixList) {
map.put(matrix.getId(), "方阵：" + matrix.getMatrixName());
}
}
// 获取分项工程
List<PgsProgressCategory> progressCategoryList = progressCategoryService.lambdaQuery()
.in(PgsProgressCategory::getMatrixId, matrixList.stream().map(FacMatrix::getId).toList())
@ -1082,6 +1081,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
}
}
}
}
return map;
}

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java
View File

@ -15,13 +15,12 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo;
import org.dromara.project.service.IBusProjectTeamService;
import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionCreateReq;
import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionGisReq;
import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionQueryReq;
import org.dromara.quality.domain.dto.qualityinspection.QltQualityInspectionUpdateReq;
import org.dromara.quality.domain.QltQualityInspection;
import org.dromara.quality.domain.dto.qualityinspection.*;
import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionListGisVo;
import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo;
import org.dromara.quality.service.IQltQualityInspectionService;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -43,6 +42,13 @@ public class QltQualityInspectionController extends BaseController {
private final IBusProjectTeamService busProjectTeamService;
@PutMapping("/test/add")
public R<Boolean> testAdd(QltQualityInspectionUpdateFileReq req) {
QltQualityInspection qualityInspection = new QltQualityInspection();
BeanUtils.copyProperties(req, qualityInspection);
return R.ok(qualityInspectionService.updateById(qualityInspection));
}
/**
* 查询质量-检查工单列表
*/

42
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/dto/qualityinspection/QltQualityInspectionUpdateFileReq.java Normal file
View File

@ -0,0 +1,42 @@
package org.dromara.quality.domain.dto.qualityinspection;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* @author lilemy
* @date 2025-09-19 14:45
*/
@Data
public class QltQualityInspectionUpdateFileReq implements Serializable {
@Serial
private static final long serialVersionUID = 4892385858816127150L;
/**
* 主键
*/
private Long id;
/**
* 巡检附件
*/
private String inspectionFile;
/**
* 巡检图片附件
*/
private String inspectionImgFile;
/**
* 整改附件
*/
private String rectificationFile;
/**
* 整改图片附件
*/
private String rectificationImgFile;
}

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java
View File

@ -13,10 +13,12 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.safety.domain.HseSafetyInspection;
import org.dromara.safety.domain.dto.safetyinspection.*;
import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo;
import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo;
import org.dromara.safety.service.IHseSafetyInspectionService;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -36,6 +38,13 @@ public class HseSafetyInspectionController extends BaseController {
private final IHseSafetyInspectionService safetyInspectionService;
@PutMapping("/test/add")
public R<Boolean> testAdd(@Validated @RequestBody HseSafetyInspectionUpdateFileReq req) {
HseSafetyInspection inspection = new HseSafetyInspection();
BeanUtils.copyProperties(req, inspection);
return R.ok(safetyInspectionService.updateById(inspection));
}
/**
* 查询安全巡检工单列表
*/

32
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateFileReq.java Normal file
View File

@ -0,0 +1,32 @@
package org.dromara.safety.domain.dto.safetyinspection;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* @author lilemy
* @date 2025-09-19 14:49
*/
@Data
public class HseSafetyInspectionUpdateFileReq implements Serializable {
@Serial
private static final long serialVersionUID = 3900623694038061296L;
/**
* 主键ID
*/
private Long id;
/**
* 检查附件
*/
private String checkFile;
/**
* 整改附件
*/
private String rectificationFile;
}

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.servlet.http.HttpServletResponse;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.quality.domain.vo.qualityinspection.QltQualityInspectionVo;
import org.dromara.safety.domain.HseSafetyInspection;
import org.dromara.safety.domain.dto.safetyinspection.*;
import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
View File

@ -312,9 +312,11 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
safetyInspectionVo.setRectificationName(contractor.getName());
} else if (rectificationUnit.equals(InspectionRectificationUnitType.TEAM.getValue())) {
BusProjectTeam team = projectTeamService.getById(rectificationId);
if (team != null) {
safetyInspectionVo.setRectificationName(team.getTeamName());
}
}
}
return safetyInspectionVo;
}

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
View File

@ -61,6 +61,20 @@ public class SysOssController extends BaseController {
return R.ok(list);
}
/**
* 上传OSS对象存储
*
*/
@PostMapping(value = "/uploadFileUrl")
public R<SysOssUploadVo> uploadFileUrl(String url, String fileName) {
SysOssVo oss = ossService.uploadFileUrl(url, fileName);
SysOssUploadVo uploadVo = new SysOssUploadVo();
uploadVo.setUrl(oss.getUrl());
uploadVo.setFileName(oss.getOriginalName());
uploadVo.setOssId(oss.getOssId().toString());
return R.ok(uploadVo);
}
/**
* 上传OSS对象存储
*