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

大屏接口修改

Browse Source
This commit is contained in:
dfdg
2025-10-14 14:57:54 +08:00
parent 3879ce28b6
commit 2f4bec42a3
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -519,7 +519,7 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService {
app.put("id", item.getUserId()); app.put("id", item.getUserId());
app.put("userId", item.getUserId()); app.put("userId", item.getUserId());
app.put("label", item.getUserId()); app.put("label", item.getUserId());
app.put("name", item.getDeviceName()); app.put("name", item.getUserName());
app.put("type", "app"); app.put("type", "app");
app.put("lat", item.getLocLatitude()); app.put("lat", item.getLocLatitude());
app.put("lng", item.getLocLongitude()); app.put("lng", item.getLocLongitude());

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/mapper/GpsEquipmentSonMapper.java
View File

@ -25,7 +25,7 @@ public interface GpsEquipmentSonMapper extends BaseMapperPlus<GpsEquipmentSon, G
" gps_equipment_son \n" + " gps_equipment_son \n" +
"WHERE \n" + "WHERE \n" +
"project_id = #{projectId} \n " + "project_id = #{projectId} \n " +
// "AND create_time BETWEEN #{startTime} AND #{endTime}\n" + "AND create_time BETWEEN #{startTime} AND #{endTime}\n" +
")\n" + ")\n" +
"SELECT\n" + "SELECT\n" +
" *\n" + " *\n" +
@ -67,12 +67,13 @@ public interface GpsEquipmentSonMapper extends BaseMapperPlus<GpsEquipmentSon, G
"WHERE \n" + "WHERE \n" +
"project_id = #{projectId}\n " + "project_id = #{projectId}\n " +
"AND client_id IS NULL \n" + "AND client_id IS NULL \n" +
// "AND create_time BETWEEN #{startTime} AND #{endTime} \n" + "AND create_time BETWEEN #{startTime} AND #{endTime} \n" +
")\n" + ")\n" +
"SELECT\n" + "SELECT\n" +
" *\n" + " r.*,su.nick_name as userName\n" +
"FROM\n" + "FROM\n" +
" RankedData\n" + " RankedData r " +
"LEFT JOIN sys_user su ON r.user_id=su.user_id\n" +
"WHERE\n" + "WHERE\n" +
" rn = 1;") " rn = 1;")
List<GpsEquipmentSonVo> getUserListByProjectId(@Param("projectId") Long projectId, @Param("startTime") LocalDateTime startOfDay, @Param("endTime") LocalDateTime now); List<GpsEquipmentSonVo> getUserListByProjectId(@Param("projectId") Long projectId, @Param("startTime") LocalDateTime startOfDay, @Param("endTime") LocalDateTime now);

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

@ -1196,7 +1196,9 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
renyuan.put("name", byUserId.getUserName() != null ? byUserId.getUserName():""); renyuan.put("name", byUserId.getUserName() != null ? byUserId.getUserName():"");
renyuan.put("teamName", byUserId.getTeamName() != null ? byUserId.getTeamName():""); renyuan.put("teamName", byUserId.getTeamName() != null ? byUserId.getTeamName():"");
renyuan.put("phone", byUserId.getPhone() != null ? byUserId.getPhone():""); renyuan.put("phone", byUserId.getPhone() != null ? byUserId.getPhone():"");
if (byUserId.getTypeOfWork() !=null){
renyuan.put("typeOfWork", dictDataService.selectDictLabel("type_of_work", byUserId.getTypeOfWork())); renyuan.put("typeOfWork", dictDataService.selectDictLabel("type_of_work", byUserId.getTypeOfWork()));
}
renyuan.put("contractorNmae",byUserId.getContractorId() != null ? contractorService.getById(byUserId.getContractorId()).getName():""); renyuan.put("contractorNmae",byUserId.getContractorId() != null ? contractorService.getById(byUserId.getContractorId()).getName():"");
} }
map.put("renyuan", renyuan); map.put("renyuan", renyuan);