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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
青云
2025-09-29 15:19:59 +08:00
parent 9fe3cd494f 2c554321bb
commit 3eae13e67a
15 changed files with 183 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,9 +57,9 @@ spring:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.110.2:13386/zmkgdev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: zmkgdev
password: JhYxREf25AXdy3h8
url: jdbc:mysql://192.168.110.2:13386/zmkgc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: zmkgc
password: nWKDKRNRT48tFBdh
slave1:
lazy: true
type: ${spring.datasource.type}
@ -67,6 +67,13 @@ spring:
url: jdbc:mysql://192.168.110.2:13386/zmkgprod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: zmkgprod
password: MaY8nehwWkJriWPm
slave2:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.110.2:13386/zmkgdev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: zmkgdev
password: JhYxREf25AXdy3h8
# oracle:
# type: ${spring.datasource.type}
# driverClassName: oracle.jdbc.OracleDriver

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/mapper/ProjectBigScreenMapper.java
View File

@ -13,7 +13,7 @@ import java.util.List;
* @author lilemy
* @date 2025-09-10 19:32
*/
@DS("slave")
@DS("slave2")
@Mapper
public interface ProjectBigScreenMapper {

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java
View File

@ -134,4 +134,9 @@ public class DesVolumeCatalogVo implements Serializable {
*/
private Long fileCount;
/**
* 待提交审核数量
*/
private Long reviewCount;
}

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java
View File

@ -252,14 +252,15 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
// 判断是否重名
Long count = this.lambdaQuery()
.eq(DesVolumeCatalog::getProjectId, oldVolumeCatalog.getProjectId())
.and(lqw -> lqw
.eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber())
.or()
.eq(DesVolumeCatalog::getDocumentName, req.getDocumentName()))
.eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber())
// .and(lqw -> lqw
// .eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber())
// .or()
// .eq(DesVolumeCatalog::getDocumentName, req.getDocumentName()))
.ne(DesVolumeCatalog::getDesign, req.getDesign())
.count();
if (count > 0) {
throw new ServiceException("卷册目录已存在", HttpStatus.BAD_REQUEST);
throw new ServiceException("卷册号已存在", HttpStatus.BAD_REQUEST);
}
// 修改数据
DesVolumeCatalog volumeCatalog = new DesVolumeCatalog();
@ -390,6 +391,13 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
fileQueryWrapper.eq(DesVolumeFile::getVolumeCatalogId, desVolumeCatalogVo.getDesign());
List<DesVolumeFile> list = volumeFileService.list(fileQueryWrapper);
if (list != null && !list.isEmpty()) {
long count = 0;
for (DesVolumeFile file : list) {
if (BusinessStatusEnum.DRAFT.getStatus().equals(file.getAuditStatus())) {
count++;
}
}
desVolumeCatalogVo.setReviewCount(count);
desVolumeCatalogVo.setFileCount((long) list.size());
} else {
desVolumeCatalogVo.setFileCount(0L);

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

@ -312,10 +312,10 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
}
Long matrixId = matrix.getId();*/
// 去掉首字母 (T/G)
String withoutPrefix = name.substring(1);
String withoutPrefix = name.substring(2);
// 如果包含"."，只取第一个"."前的数字
int dotIndex = withoutPrefix.indexOf(".");
int dotIndex = withoutPrefix.indexOf("#");
if (dotIndex != -1) {
withoutPrefix = withoutPrefix.substring(0, dotIndex);
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/domain/OthYs7Device.java
View File

@ -101,6 +101,11 @@ public class OthYs7Device implements Serializable {
*/
private Integer videoEncrypted;
/**
* 设备详情
*/
private String detail;
/**
* 备注
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/domain/dto/ys7device/OthYs7DeviceUpdateReq.java
View File

@ -35,6 +35,11 @@ public class OthYs7DeviceUpdateReq implements Serializable {
*/
private String deviceVersion;
/**
* 设备详情
*/
private String detail;
/**
* 备注
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/domain/vo/ys7device/OthYs7DeviceVo.java
View File

@ -87,6 +87,11 @@ public class OthYs7DeviceVo implements Serializable {
@ExcelProperty(value = "视频加密(0关闭 1开启)")
private Integer videoEncrypted;
/**
* 设备详情
*/
private String detail;
/**
* 备注
*/

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceServiceImpl.java
View File

@ -14,7 +14,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.manager.ys7manager.Ys7Constant;
import org.dromara.manager.ys7manager.Ys7Manager;
import org.dromara.manager.ys7manager.enums.DeviceOnOffLineEnum;

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

@ -308,7 +308,6 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
// 取分组中的第一条记录的排序字段作为当前VO的排序值
List<PgsProgressCategory> value = entry.getValue();
PgsProgressCategory first = value.getFirst();
topVo.setId(first.getId());
topVo.setSort(first.getSort());
// 转换为方阵结构的VO列表
List<PgsProgressCategoryMatrixStructureTopVo> matrixVoList = value.stream().map(category -> {

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

@ -166,7 +166,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
}
// 判断当前详情是否已提交
if (progressPlanDetail.getStatus().equals("3")) {
throw new ServiceException("当前详情已在施工产值中提交，无法提交", HttpStatus.BAD_REQUEST);
throw new ServiceException("当前详情已在施工产值中审核完成，无法提交", HttpStatus.BAD_REQUEST);
}
Long progressPlanId = progressPlanDetail.getProgressPlanId();
PgsProgressPlan progressPlan = progressPlanService.getById(progressPlanId);
@ -174,11 +174,11 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
throw new ServiceException("进度计划信息不存在", HttpStatus.NOT_FOUND);
}
BigDecimal oldFinishedNumber = progressPlan.getFinishedNumber();
// 判断完成时间是否大于当前时间
// todo 判断完成时间是否大于当前时间
LocalDate planDate = progressPlanDetail.getDate();
if (planDate.isAfter(LocalDate.now())) {
/* if (planDate.isAfter(LocalDate.now())) {
throw new ServiceException("完成时间不能大于当前时间", HttpStatus.BAD_REQUEST);
}
}*/
Long projectId = progressPlanDetail.getProjectId();
Long progressCategoryId = progressPlanDetail.getProgressCategoryId();
PgsProgressCategory progressCategory = progressCategoryService.getById(progressCategoryId);
@ -361,11 +361,11 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
if (progressPlanDetail == null) {
throw new ServiceException("进度计划详情信息不存在", HttpStatus.NOT_FOUND);
}
// 判断完成时间是否大于当前时间
// todo 判断完成时间是否大于当前时间
LocalDate date = progressPlanDetail.getDate();
if (date.isAfter(LocalDate.now())) {
/* if (date.isAfter(LocalDate.now())) {
throw new ServiceException("完成时间不能大于当前时间", HttpStatus.BAD_REQUEST);
}
}*/
// 判断当前详情是否已提交
if (progressPlanDetail.getStatus().equals("3")) {
throw new ServiceException("当前详情已在施工产值中提交，无法提交", HttpStatus.BAD_REQUEST);

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/domain/vo/qualityconstructionlog/QltQualityConstructionLogVo.java
View File

@ -84,12 +84,12 @@ public class QltQualityConstructionLogVo implements Serializable {
* 创建者
*/
@ExcelProperty(value = "创建者")
private String createBy;
private Long createBy;
/**
* 创建者名称
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME)
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
private String createByName;
/**

50
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/controller/TransferDataController.java
View File

@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.contractor.domain.SubConstructionUser;
import org.dromara.contractor.service.ISubConstructionUserService;
import org.dromara.project.domain.BusAttendanceRule;
import org.dromara.project.service.IBusAttendanceService;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.transferData.domain.ConstructionUserCopy;
import org.dromara.transferData.domain.OldAttendance;
@ -48,7 +49,12 @@ public class TransferDataController {
@Resource
private TransferDataService transferDataService;
@Resource
private IBusAttendanceService attendanceService;
private static final String slave = "zmkgc";
private static final String slave1 = "zmkgprod";
// 两个候选基础URL
@ -59,10 +65,16 @@ public class TransferDataController {
@RequestMapping("/transferAttendance")
public void transferAttendance() {
public void transferAttendance(String name) {
List<BusAttendance> arrs = new ArrayList<>();
List<OldAttendance> data = transferDataMapper.getData();
List<OldAttendance> data;
if(slave.equals(name)){
data = transferDataMapper.getData0();
}else if(slave1.equals(name)) {
data = transferDataMapper.getData();
}else {
return;
}
List<BusAttendanceRule> list = attendanceRuleService.list(Wrappers.<BusAttendanceRule>lambdaQuery()
.in(BusAttendanceRule::getProjectId, Arrays.asList(1897160897167638529L, 1897161054676336641L)));
@ -75,16 +87,16 @@ public class TransferDataController {
continue;
}
LocalDate clockDate = LocalDate.parse(oldAttendance.getPrintingDate());
// //判定是否重读
// List<BusAttendance> list = attendanceService.list(Wrappers.lambdaQuery(BusAttendance.class)
// .eq(BusAttendance::getUserId, constructionUserCopy.getSysUserId())
// .eq(BusAttendance::getProjectId, constructionUserCopy.getProjectId())
// .eq(BusAttendance::getClockDate, clockDate)
// .eq(BusAttendance::getClockType, oldAttendance.getCommuter())
// );
// if(CollectionUtil.isNotEmpty(list)){
// continue;
// }
//判定是否重复
List<BusAttendance> list1 = attendanceService.list(Wrappers.lambdaQuery(BusAttendance.class)
.eq(BusAttendance::getUserId, constructionUserCopy.getSysUserId())
.eq(BusAttendance::getProjectId, constructionUserCopy.getProjectId())
.eq(BusAttendance::getClockDate, clockDate)
.eq(BusAttendance::getClockType, oldAttendance.getCommuter())
);
if(CollectionUtil.isNotEmpty(list1)){
continue;
}
BusAttendance busAttendance = new BusAttendance();
@ -162,10 +174,10 @@ public class TransferDataController {
// attendanceService.saveBatch(arrs);
// transferDataMapper.saveBatchCopy(arrs);
//更新施工人员图片
transferDataService.renYuan();
//更新附件图片
transferDataService.renYuanFuJiang();
// //更新施工人员图片
// transferDataService.renYuan();
// //更新附件图片
// transferDataService.renYuanFuJiang();
}
@ -204,8 +216,8 @@ public class TransferDataController {
@GetMapping("/userTransfer")
private void userTransfer() {
transferDataService.userTransfer();
private void userTransfer(String name) {
transferDataService.userTransfer(name);
}

19
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/mapper/TransferDataMapper.java
View File

@ -18,10 +18,19 @@ public interface TransferDataMapper {
@Select("select * from bus_attendance where project_id in (59,60)")
List<OldAttendance> getData();
@DS("slave")
@Select("select * from bus_attendance where project_id in (59,60)")
List<OldAttendance> getData0();
@DS("slave1")
@Select("select * from bus_construction_user where project_id in (59,60) and deleted_at is null")
List<User> getUserList();
@DS("slave")
@Select("select * from bus_construction_user where project_id in (59,60) and deleted_at is null")
List<User> getUserList0();
@Select("select id,sys_user_id,project_id,user_name from sub_construction_user where go_openid = #{openId}")
ConstructionUserCopy getConstructionUserCopy(@Param("openId") String openId);
@ -60,6 +69,16 @@ public interface TransferDataMapper {
List<OldFile> getOldFileList1(List<Long> userIds);
@DS("slave")
@Select("<script>" +
"SELECT * FROM bus_construction_user_file " +
"WHERE user_id IN " +
"<foreach collection='userIds' item='userId' open='(' separator=',' close=')'>" +
"#{userId}" +
"</foreach>" +
"</script>")
List<OldFile> getOldFileList0(List<Long> userIds);
@DS("slave2")
@Select("<script>" +
"SELECT * FROM bus_construction_user_file " +
"WHERE user_id IN " +

87
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java
View File

@ -19,8 +19,12 @@ import org.dromara.contractor.domain.SubConstructionUserFile;
import org.dromara.contractor.service.ISubConstructionUserFileService;
import org.dromara.contractor.service.ISubConstructionUserService;
import org.dromara.project.domain.BusAttendance;
import org.dromara.project.domain.BusProjectTeamMember;
import org.dromara.project.domain.BusUserProjectRelevancy;
import org.dromara.project.service.IBusAttendanceRuleService;
import org.dromara.project.service.IBusAttendanceService;
import org.dromara.project.service.IBusProjectTeamMemberService;
import org.dromara.project.service.IBusUserProjectRelevancyService;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.domain.vo.SysUserVo;
@ -83,6 +87,14 @@ public class TransferDataService {
private ISysUserService userService;
@Resource
private IdCardEncryptorUtil idCardEncryptorUtil;
@Resource
private IBusProjectTeamMemberService projectTeamMemberService;
@Resource
private IBusUserProjectRelevancyService relevancyService;
private static final String slave = "zmkgc";
private static final String slave1 = "zmkgprod";
// 两个候选基础URL
@ -91,6 +103,7 @@ public class TransferDataService {
"http://192.168.110.2:7363"
};
/**
* 异步处理照片并批量保存（修复线程安全 + 性能优化）
*
@ -461,8 +474,15 @@ public class TransferDataService {
}
public void userTransfer() {
List<User> userList = transferDataMapper.getUserList();
public void userTransfer(String name) {
List<User> userList;
if(slave.equals(name)){
userList = transferDataMapper.getUserList0();
}else if(slave1.equals(name)) {
userList = transferDataMapper.getUserList();
}else {
return;
}
log.info("开始处理用户数据，数量：{}", userList.size());
// 设置每批处理的数据量
@ -482,7 +502,7 @@ public class TransferDataService {
batches.parallelStream().forEach(batch -> {
try {
log.info("开始处理批次，数据量：{}", batch.size());
handleUser(batch);
handleUser(batch,name);
log.info("批次处理完成");
} catch (Exception e) {
log.error("处理批次时发生错误，数据量：{}", batch.size(), e);
@ -493,10 +513,17 @@ public class TransferDataService {
}
public void handleUser(List<User> userList) {
public void handleUser(List<User> userList,String name) {
//查询附件
List<Long> list1 = userList.stream().map(User::getId).toList();
List<OldFile> oldFileList = transferDataMapper.getOldFileList1(list1);
List<OldFile> oldFileList;
if(slave.equals(name)){
oldFileList = transferDataMapper.getOldFileList0(list1);
}else if(slave1.equals(name)) {
oldFileList = transferDataMapper.getOldFileList1(list1);
}else {
oldFileList = new ArrayList<>();
}
// 将 oldFileList1 转换为 Map<Long, Map<String, String>> 结构
Map<Long, Map<String, String>> oldFileMap = oldFileList.stream()
@ -510,12 +537,26 @@ public class TransferDataService {
));
ArrayList<SubConstructionUser> userAddList = new ArrayList<>();
List<SubConstructionUserFile> fileAddList = new ArrayList<>();
//人员与班组关联
List<BusProjectTeamMember> teamMemberAddList = new ArrayList<>();
//人员与项目关联
List<BusUserProjectRelevancy> relevancyAddList = new ArrayList<>();
for (User user : userList) {
String phone = user.getPhone();
if(StrUtil.isBlank(phone)){
continue;
}
List<SubConstructionUser> list2 = constructionUserService.list(Wrappers.<SubConstructionUser>lambdaQuery()
.eq(SubConstructionUser::getPhone, user.getPhone())
);
if(CollectionUtil.isNotEmpty(list2)){
continue;
}
//获取sysUserId
Long sysUserId;
SysUserVo sysUserVo = userService.selectUserByPhonenumber(phone);
@ -531,16 +572,44 @@ public class TransferDataService {
sysUserId = sysUserVo.getUserId();
}
Map<String, String> map = oldFileMap.get(user.getId());
//创建施工人员
SubConstructionUser constructUser = createConstructUser(user, sysUserId,map);
userAddList.add(constructUser);
//处理附件
List<SubConstructionUserFile> subConstructionUserFiles = handle4to10ConstructionUser(map, sysUserId, user.getId());
fileAddList.addAll(subConstructionUserFiles);
}
constructionUserService.saveBatch(userAddList);
constructionUserFileService.saveBatch(fileAddList);
//项目关联
if(constructUser.getProjectId() != null){
BusUserProjectRelevancy relevancy = new BusUserProjectRelevancy();
relevancy.setUserId(constructUser.getSysUserId());
relevancy.setProjectId(constructUser.getProjectId());
relevancyAddList.add(relevancy);
}
//班组关联
if(constructUser.getTeamId() != null){
BusProjectTeamMember teamMember = new BusProjectTeamMember();
teamMember.setTeamId(constructUser.getTeamId());
teamMember.setMemberId(constructUser.getSysUserId());
teamMember.setPostId("0");
teamMember.setProjectId(constructUser.getProjectId());
teamMemberAddList.add(teamMember);
}
}
if(CollectionUtil.isNotEmpty(userAddList)){
constructionUserService.saveBatch(userAddList);
}
if(CollectionUtil.isNotEmpty(fileAddList)){
constructionUserFileService.saveBatch(fileAddList);
}
if(CollectionUtil.isNotEmpty(teamMemberAddList)){
projectTeamMemberService.saveBatch(teamMemberAddList);
}
if(CollectionUtil.isNotEmpty(relevancyAddList)){
relevancyService.saveBatch(relevancyAddList);
}
}
@ -581,7 +650,7 @@ public class TransferDataService {
constructionUser.setEntryDate(stringToDate(user.getEntryDate(), "yyyy-MM-dd HH:mm:ss"));
constructionUser.setLeaveDate(stringToDate(user.getLeaveDate(), "yyyy-MM-dd HH:mm:ss"));
constructionUser.setSalary(user.getSalary());
constructionUser.setUserRole("1");
constructionUser.setUserRole("0");
constructionUser.setExitStatus(user.getProjectRecord());
constructionUser.setRemark("GoLand");
constructionUser.setGoId(user.getId());