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-18 16:37:12 +08:00
parent 5c86398b75
commit ee7981a462
7 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -302,4 +302,4 @@ qrCode:
url: http://192.168.110.151:7788
# 无人机大图
drone:
big-image: http://192.168.110.2:9512
url: http://192.168.110.2:9512

2
xinnengyuan/ruoyi-admin/src/main/resources/application-local.yml
View File

@ -292,4 +292,4 @@ qrCode:
url: http://xny.yj-3d.com:7171
# 无人机大图
drone:
big-image: http://192.168.110.2:9512
url: http://192.168.110.2:9512

4
xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -290,7 +290,7 @@ weather:
api-host: n35rk53njv.re.qweatherapi.com
# dxf转 geojson 执行文件名
dxf2GeoJson:
file-name: main
file-name: main.exe
ys7:
app-key: 3acf9f1a43dc4209841e0893003db0a2
app-secret: 4bbf3e9394f55d3af6e3af27b2d3db36
@ -309,4 +309,4 @@ qrCode:
url: http://xny.yj-3d.com:7788
# 无人机大图
drone:
big-image: http://192.168.110.2:9512
url: http://192.168.110.2:9512

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/recognizermanager/DroneBigImageProperties.java → xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/manager/dronemanager/DroneProperties.java
View File

@ -1,4 +1,4 @@
package org.dromara.manager.recognizermanager;
package org.dromara.manager.dronemanager;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ -11,11 +11,11 @@ import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "drone")
public class DroneBigImageProperties {
public class DroneProperties {
/**
* 大图请求地址
*/
private String bigImage;
private String url;
}

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

@ -24,7 +24,7 @@ import org.dromara.facility.domain.*;
import org.dromara.facility.domain.enums.FacFinishStatusEnum;
import org.dromara.facility.domain.enums.FacFinishTypeEnum;
import org.dromara.facility.service.*;
import org.dromara.manager.recognizermanager.DroneBigImageProperties;
import org.dromara.manager.dronemanager.DroneProperties;
import org.dromara.manager.recognizermanager.RecognizerManager;
import org.dromara.manager.recognizermanager.enums.RecognizerHasTargetEnum;
import org.dromara.manager.recognizermanager.enums.RecognizerTypeEnum;
@ -121,7 +121,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
private ISysOssService ossService;
@Resource
private DroneBigImageProperties droneBigImageProperties;
private DroneProperties droneBigImageProperties;
/**
* 分页查询进度计划详情列表
@ -922,8 +922,8 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
public Boolean insertNumberDetailByAI(PgsProgressPlanDetailAINumberReq req) {
String file = req.getFile();
String tif = req.getTif();
String fileUrl = droneBigImageProperties.getBigImage() + file;
String tifUrl = droneBigImageProperties.getBigImage() + tif;
String fileUrl = droneBigImageProperties.getUrl() + file;
String tifUrl = droneBigImageProperties.getUrl() + tif;
Long projectId = req.getProjectId();
// 识别类型：洞、桩、架、架子
List<RecognizerTypeEnum> enumList = List.of(RecognizerTypeEnum.HOLE, RecognizerTypeEnum.PHO,

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

@ -18,7 +18,6 @@ import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.dromara.common.core.constant.DateConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.MapstructUtils;
@ -32,7 +31,6 @@ import org.dromara.common.utils.JSTUtil;
import org.dromara.contractor.domain.SubConstructionUser;
import org.dromara.contractor.service.ISubConstructionUserService;
import org.dromara.contractor.service.ISubUserSalaryDetailService;
import org.dromara.gps.domain.vo.ConstructionUser;
import org.dromara.project.domain.*;
import org.dromara.project.domain.bo.BusAttendanceBo;
import org.dromara.project.domain.dto.attendance.*;
@ -1177,9 +1175,11 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
for (Map.Entry<Long, List<SubConstructionUser>> entry : teamUserMap.entrySet()) {
Long teamId = entry.getKey();
System.out.println("teamId:" + teamId);
List<SubConstructionUser> users = entry.getValue();
SubConstructionUser constructionUser = users.getFirst();
String teamName = constructionUser.getTeamName();
System.out.println("name:" + teamName);
Sheet sheet = workbook.createSheet(teamName);
// ==================== 设置列宽 ====================
@ -1400,7 +1400,4 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
}
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
View File

@ -423,14 +423,14 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
throw new ServiceException("添加部门失败", HttpStatus.ERROR);
}
if( SysDeptTypeEnum.PROJECT.getCode().equals(bo.getDeptType())){
/* if( SysDeptTypeEnum.PROJECT.getCode().equals(bo.getDeptType())){
SysRoleBo sysRoleBo = new SysRoleBo();
ConPerSysRoleDto conPerSysRoleDto = new ConPerSysRoleDto();
conPerSysRoleDto.setDeptId(dept.getDeptId());
BeanUtil.copyProperties(conPerSysRoleDto,sysRoleBo);
roleService.insertRole(sysRoleBo);
}
}*/