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

优化

Browse Source
This commit is contained in:
pengjie 2025-04-17 18:11:05 +08:00
parent 2e49465729
commit 717be14f19
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ModelTalkController.java
View File

@ -132,8 +132,9 @@ public class ModelTalkController {
.baseUrl(url) .baseUrl(url)
.build(); .build();
Map<String, Object> param = new HashMap<>(16); Map<String, Object> param = new HashMap<>(16);
String[] split = fileUrl.split(",");
List<Map<String, Object>> files = new ArrayList<>(); List<Map<String, Object>> files = new ArrayList<>();
if(StringUtils.isNotBlank(fileUrl)) {
String[] split = fileUrl.split(",");
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
Map<String, Object> file = new HashMap<>(16); Map<String, Object> file = new HashMap<>(16);
file.put("type", "image"); file.put("type", "image");
@ -141,6 +142,7 @@ public class ModelTalkController {
file.put("url", split[i]); file.put("url", split[i]);
files.add(file); files.add(file);
} }
}
param.put("inputs", new JSONObject()); param.put("inputs", new JSONObject());
param.put("query", query); param.put("query", query);
param.put("response_mode", "streaming"); param.put("response_mode", "streaming");

5
src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
View File

@ -2,9 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDataMapper"> <mapper namespace="com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDataMapper">
<select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData"> <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData">
select shd.*, CONCAT(IFNULL(wi.worker_name, ''), IFNULL(shd.worker_info_name, '')) worker_name select shd.*, CONCAT(IFNULL(wi.worker_name, ''), IFNULL(shd.worker_info_name, '')) worker_name, ei.enterprise_name, wi.phone_number, wt.type_name workerTypeName
from safety_hat_data shd from safety_hat_data shd
left join worker_info wi on wi.id = shd.worker_info_id left join worker_info wi on wi.id = shd.worker_info_id
left join team_info ti on wi.team_id = ti.id
left join worker_type wt on ti.worker_type_id = wt.id
left join enterprise_info ei on wi.enterprise_id = ei.id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>

15
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -56,7 +56,9 @@ import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService; import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService;
import com.zhgd.xmgl.modules.quality.service.IQualityRegionService; import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev;
import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper;
import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper; import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper;
import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService; import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService;
import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper; import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
@ -180,6 +182,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
private WorkerInfoMapper workerInfoMapper; private WorkerInfoMapper workerInfoMapper;
@Lazy @Lazy
@Autowired @Autowired
private SafetyHatDevMapper safetyHatDevMapper;
@Lazy
@Autowired
private WorkerSafeEducationWorkerMapper workerSafeEducationWorkerMapper; private WorkerSafeEducationWorkerMapper workerSafeEducationWorkerMapper;
@Lazy @Lazy
@Autowired @Autowired
@ -1347,11 +1352,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
} }
} }
if (StringUtils.isNotBlank(MapUtils.getString(map, "locationCardno"))) { if (StringUtils.isNotBlank(MapUtils.getString(map, "locationCardno"))) {
List<WorkerInfo> workerInfoList = workerInfoMapper.selectList(Wrappers.<WorkerInfo>lambdaQuery() List<SafetyHatDev> safetyHatDevs = safetyHatDevMapper.selectList(Wrappers.<SafetyHatDev>lambdaQuery()
.eq(WorkerInfo::getLocationCardno, MapUtils.getString(map, "locationCardno")) .eq(SafetyHatDev::getDevSn, MapUtils.getString(map, "locationCardno"))
.eq(WorkerInfo::getProjectSn, MapUtils.getString(map, "projectSn"))); .eq(SafetyHatDev::getProjectSn, MapUtils.getString(map, "projectSn")));
if (workerInfoList.size() > 0) { if (safetyHatDevs.size() > 0) {
map.put("workerId", workerInfoList.get(0).getId()); map.put("workerId", safetyHatDevs.get(0).getWorkerInfoId());
} }
} }
if (StringUtils.isNotBlank(MapUtils.getString(map, "workerName"))) { if (StringUtils.isNotBlank(MapUtils.getString(map, "workerName"))) {