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

bug修复

Browse Source
This commit is contained in:
guo 2024-04-13 15:34:36 +08:00
parent cb6d110838
commit efcbf32425
7 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -666,6 +666,7 @@
INNER JOIN team_info g ON (w1.project_sn = g.project_sn and w1.team_id = g.id)
WHERE p.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
and w1.inService_type = 1
AND w1.person_type=1
and w1.project_sn = #{projectSn}
GROUP BY g.worker_type_id
) tp ON w.id = tp.worker_type_id
@ -676,6 +677,7 @@
INNER JOIN team_info b ON a.team_id = b.id
WHERE a.project_sn = #{projectSn}
and a.inService_type = 1
AND a.person_type=1
GROUP BY b.worker_type_id
) ap on w.id = ap.worker_type_id
WHERE w.project_sn = #{projectSn}

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

@ -1985,7 +1985,8 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
@Override
public void uploadWorkerInfoImgs(MultipartFile file, String projectSn) throws IOException {
String folder = basePath + "/" + IdUtil.simpleUUID();
new File(folder).mkdirs();
File folderFile = new File(folder);
folderFile.mkdirs();
String zipPath = folder + "/" + IdUtil.simpleUUID() + ".zip";
String unzipFolder = folder + "/" + IdUtil.simpleUUID();
file.transferTo(new File(zipPath));
@ -2015,6 +2016,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
msg = "失败的信息：" + failStr + formatStr;
}
noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, "更新人员图片成功", "2");
FileUtil.del(folderFile);
}
}

11
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzProjectOrgController.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.xz.controller;
import cn.hutool.db.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
@ -66,6 +67,16 @@ public class XzProjectOrgController {
return Result.success(xzProjectOrgService.treeList(paramMap));
}
@ApiOperation(value = "分页树形列表查询星纵-项目组织机构信息", notes = "分页树形列表查询星纵-项目组织机构信息", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "tree/page")
public Result<IPage<XzProjectOrg>> treePageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzProjectOrgService.treePageList(paramMap));
}
/**
* 添加
*

3
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzProjectOrgService.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.xz.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -26,4 +27,6 @@ public interface IXzProjectOrgService extends IService<XzProjectOrg> {
void delete(String id);
List<XzProjectOrg> treeList(HashMap<String, Object> paramMap);
IPage<XzProjectOrg> treePageList(HashMap<String, Object> paramMap);
}

39
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.rt.entity.RtRiskInventoryType;
import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
import com.zhgd.xmgl.modules.xz.mapper.XzProjectOrgMapper;
import com.zhgd.xmgl.modules.xz.service.IXzProjectOrgService;
@ -175,6 +176,44 @@ public class XzProjectOrgServiceImpl extends ServiceImpl<XzProjectOrgMapper, XzP
return treeList;
}
@Override
public IPage<XzProjectOrg> treePageList(HashMap<String, Object> paramMap) {
Integer status = MapUtils.getInteger(paramMap, "status");
String deptName = MapUtils.getString(paramMap, "deptName");
String projectSn = MapUtils.getString(paramMap, "projectSn");
if (StrUtil.isBlank(projectSn)) {
throw new OpenAlertException("projectSn不能为空");
}
List<XzProjectOrg> treeList = null;
if (status != null || StrUtil.isNotBlank(deptName)) {
//有查询条件，不组装tree
return this.queryPageList(paramMap);
} else {
int pageNo = Integer.parseInt(paramMap.getOrDefault("pageNo", 1).toString());
int pageSize = Integer.parseInt(paramMap.getOrDefault("pageSize", 10).toString());
List<XzProjectOrg> allList = queryList(paramMap);
//组装tree
//获取父节点
treeList = allList.stream()
.filter(m -> m.getParentId() == 0)
.peek(m -> m.setChildren(getChildren(m, allList)))//peek：执行类似map，但操作之后的数据并不返回到Stream中
.collect(Collectors.toList());
treeList.sort((o1, o2) -> {
if (o1.getOrderNum() == null || o2.getOrderNum() == null) {
return 0;
}
return o1.getOrderNum().compareTo(o2.getOrderNum());
});
IPage<XzProjectOrg> p = new Page<>();
int i = cn.hutool.core.util.PageUtil.getStart(pageNo - 1, pageSize);
p.setTotal(treeList.size());
p.setRecords(CollUtil.sub(treeList, i, i + pageSize));
p.setCurrent(pageNo);
p.setSize(pageSize);
return p;
}
}
private List<XzProjectOrg> getChildren(XzProjectOrg st, List<XzProjectOrg> allList) {
List<XzProjectOrg> list = allList.stream()
.filter(m -> Objects.equals(m.getParentId(), st.getId()))

4
src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
View File

@ -63,9 +63,9 @@ public class SafetyHatTask {
@RequestMapping("updateHelmetStatus")
public void updateHelmetStatus() {
try {
log.info("获取安全帽心跳");
List<Project> projectList = projectService.list(Wrappers.<Project>lambdaQuery().ne(Project::getHelmetUser, "").ne(Project::getHelmetPassword, ""));
if (CollUtil.isNotEmpty(projectList)) {
log.info("定时获取安全帽心跳");
for (Project project : projectList) {
log.info("安全帽user：{}", project.getHelmetUser());
SafetyHatWSClient client = SafetyHatWSClient.clientMap.get(project.getHelmetUser());
@ -101,9 +101,9 @@ public class SafetyHatTask {
@SchedulerLock(name = "getHelmetData", lockAtMostFor = 1000 * 60 * 2, lockAtLeastFor = 1000 * 10)
@RequestMapping("getHelmetData")
public void getHelmetData() {
log.info("定时2分钟获取安全帽数据任务开始");
List<Project> projectList = projectService.list(Wrappers.<Project>lambdaQuery().ne(Project::getHelmetUser, "").ne(Project::getHelmetPassword, ""));
if (CollUtil.isNotEmpty(projectList)) {
log.info("定时2分钟获取安全帽数据任务开始");
for (Project project : projectList) {
List<SafetyHatDev> devList = safetyHatDevMapper.selectList(new LambdaQueryWrapper<SafetyHatDev>()
.eq(SafetyHatDev::getProjectSn, project.getProjectSn()));

4
src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java
View File

@ -14,7 +14,6 @@ import com.zhgd.xmgl.modules.basicdata.mapper.HikvisionRequestRetryMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.Map;
@ -47,7 +46,8 @@ public class HikvisionUtil {
Map<String, String> headers = new HashMap();
headers.put("Accept", "*/*");
headers.put("Content-Type", "application/json");
Request request = new Request(Method.POST_STRING, host, path, appKey, appSecret, Constants.DEFAULT_TIMEOUT);
//Request request = new Request(Method.POST_STRING, host, path, appKey, appSecret, Constants.DEFAULT_TIMEOUT);
Request request = new Request(Method.POST_STRING, host, path, appKey, appSecret, Constants.DEFAULT_TIMEOUT * 10);
request.setHeaders(headers);
request.setQuerys(querys);
request.setStringBody(body);