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

Merge branch 'guoshengxiongtemp' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-06-06 09:30:14 +08:00
commit 2938a8624a
12 changed files with 298 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -988,7 +988,10 @@
<excludes>org.spring</excludes>
<libjars>wflow-server-1.0-SNAPSHOT.jar</libjars>
<code>
<!--鞍钢-->
A6F449ECD7E1024F703F37F2294AC8F2D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E
<!--中科安信-->
<!--A6F449ECD7E1024F703F37F2294AC8F2D41D8CD98F00B204E9800998ECF8427ED41D8CD98F00B204E9800998ECF8427E-->
</code>
</configuration>
<executions>

1
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -100,6 +100,7 @@ public class DataScopeHandler implements DataPermissionHandler {
tables.put("exam_train_record", "enterprise_id");
tables.put("exam_course_record", "enterprise_id");
tables.put("xz_worker_safe_watch_alarm", "enterprise_id");
tables.put("dangerous_engineering_record", "responsibility_company_id");
if (!environmentUtil.isBaise()) {
tables.put("car_info", "enterprise_id");
tables.put("enterprise_info", "id");

4
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -1412,7 +1412,7 @@ public class HikvisionCall {
JSONObject rs = addAlarmCarForHttp(project, addJo);
sendNoticeAndSetStatusForCarInfo("车辆添加黑名单到海康isc", rs.toJSONString(), carInfo, 7, null, null, true);
} else {
sendNoticeAndSetStatusForCarInfo("车辆取消布防（取消黑名单）到海康isc", null, carInfo, 7, null, true, false);
sendNoticeAndSetStatusForCarInfo("车辆取消黑名单到海康isc", null, carInfo, 7, null, true, false);
}
} else {
if (carInfo.getIsBlack() == 1) {
@ -1423,7 +1423,7 @@ public class HikvisionCall {
JSONObject deleteJo = new JSONObject();
deleteJo.put("alarmSyscodes", alarmSyscode);
JSONObject rs = this.deletionAlarmCarForHttp(project, deleteJo);
sendNoticeAndSetStatusForCarInfo("车辆取消布防（取消黑名单）到海康isc", rs.toJSONString(), carInfo, 7, null, null, true);
sendNoticeAndSetStatusForCarInfo("车辆取消黑名单到海康isc", rs.toJSONString(), carInfo, 7, null, null, true);
}
}
} else {

32
src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
View File

@ -14,7 +14,6 @@ import com.zhgd.xmgl.modules.car.entity.vo.CountCarModuleTypeVo;
import com.zhgd.xmgl.modules.car.service.ICarInfoService;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.MessageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@ -26,6 +25,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.ArrayList;
import java.util.HashMap;
@ -33,7 +33,7 @@ import java.util.List;
import java.util.Map;
/**
/**
* @Title: Controller
* @Description: 车辆黑白名单管理
* @author： pds
@ -93,6 +93,7 @@ public class CarInfoController {
/**
* 添加
*
* @param map
* @return
*/
@ -109,10 +110,10 @@ public class CarInfoController {
Integer carModuleType = MapUtils.getString(map, "carModuleType").equals("临时车辆") ? 2 : 3;
List<String> userIds = (List<String>) map.get("userIds");
CarInfo carInfo = new CarInfo();
if(driverWorkerId != null) {
if (driverWorkerId != null) {
carInfo.setDriverWorkerId(driverWorkerId.get(0).toString());
}
if(driverWorkerName != null) {
if (driverWorkerName != null) {
carInfo.setDriverWorkerName(driverWorkerName.toString());
}
if (alarmPushWorkerId != null) {
@ -206,11 +207,12 @@ public class CarInfoController {
/**
* 编辑
*
* @param carInfo
* @return
*/
@OperLog(operModul = "车辆管理",operType = "编辑车辆黑白名单管理",operDesc = "编辑车辆黑白名单管理信息")
@ApiOperation(value = "编辑车辆黑白名单管理信息", notes = "编辑车辆黑白名单管理信息" , httpMethod="POST")
@OperLog(operModul = "车辆管理", operType = "编辑车辆黑白名单管理", operDesc = "编辑车辆黑白名单管理信息")
@ApiOperation(value = "编辑车辆黑白名单管理信息", notes = "编辑车辆黑白名单管理信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<CarInfo> edit(@RequestBody CarInfo carInfo) {
carInfoService.editCarInfo(carInfo);
@ -219,14 +221,15 @@ public class CarInfoController {
/**
* 通过id删除
*
* @param
* @return
*/
@OperLog(operModul = "车辆管理",operType = "删除车辆黑白名单管理",operDesc = "删除车辆黑白名单管理信息")
@OperLog(operModul = "车辆管理", operType = "删除车辆黑白名单管理", operDesc = "删除车辆黑白名单管理信息")
@ApiOperation(value = "删除车辆黑白名单管理信息", notes = "删除车辆黑白名单管理信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "车辆黑白名单管理ID", paramType = "body", required = true, dataType = "Integer")
@PostMapping(value = "/delete")
public Result<CarInfo> delete(@RequestBody Map<String,Object> map) {
public Result<CarInfo> delete(@RequestBody Map<String, Object> map) {
carInfoService.delete(map);
return Result.ok();
}
@ -234,6 +237,7 @@ public class CarInfoController {
/**
* 通过id查询
*
* @param
* @return
*/
@ -241,7 +245,7 @@ public class CarInfoController {
@ApiOperation(value = "通过id查询车辆黑白名单管理信息", notes = "通过id查询车辆黑白名单管理信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "车辆黑白名单管理ID", paramType = "body", required = true, dataType = "Integer")
@PostMapping(value = "/queryById")
public Result<CarInfo> queryById(@RequestBody Map<String,Object> map) {
public Result<CarInfo> queryById(@RequestBody Map<String, Object> map) {
String id = MapUtils.getString(map, "id");
return Result.success(carInfoService.queryById(id));
}
@ -264,5 +268,13 @@ public class CarInfoController {
return Result.success(carInfoService.countCarModuleType(map));
}
@ApiOperation(value = "更新车辆二维码，如果为空", notes = "更新车辆二维码，如果为空", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/updateCarQrCode")
public Result updateCarQrCode(@ApiIgnore @RequestBody Map<String, Object> param) {
carInfoService.updateCarQrCode(param);
return Result.ok();
}
}

6
src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java
View File

@ -132,6 +132,8 @@ public class CarInfo implements Serializable {
private Integer sendSuccessStatus;
@ApiModelProperty(value = "外来车人员身份证号")
private java.lang.String outsideDriverIdCard;
@ApiModelProperty(value = "车辆二维码")
private java.lang.String carQrCode;
@TableField(exist = false)
@ApiModelProperty(value = "企业名称")
@ -146,4 +148,8 @@ public class CarInfo implements Serializable {
private String hikvisionVehicleId;
@TableField(exist = false)
private String carTypeName;
@TableField(exist = false)
@ApiModelProperty(value = "项目名称")
private String projectName;
}

5
src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml
View File

@ -29,8 +29,11 @@
t.send_success_status,
t.create_by,
b.car_type_name,
ei.enterprise_name
ei.enterprise_name,
p.project_name,
t.car_qr_code
FROM car_info t
join project p on p.project_sn = t.project_sn
LEFT JOIN car_type b ON (t.car_type = b.id and t.project_sn = b.project_sn)
left join enterprise_info ei on ei.id = t.enterprise_id
left join worker_info wi

2
src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java
View File

@ -46,4 +46,6 @@ public interface ICarInfoService extends IService<CarInfo> {
void deleteCarInfoForHikvision(CarInfo carInfo, boolean isSetBlack);
void editCarInfoForHikvision(CarInfo carInfo, CarInfo old);
void updateCarQrCode(Map<String, Object> param);
}

39
src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
View File

@ -2,16 +2,22 @@ package com.zhgd.xmgl.modules.car.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gexin.fastjson.JSON;
import com.gexin.fastjson.JSONObject;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.redis.lock.redisson.DistributedLock;
import com.zhgd.xmgl.async.AsyncHikvision;
import com.zhgd.xmgl.async.AsyncWorker;
import com.zhgd.xmgl.constant.Cts;
import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
import com.zhgd.xmgl.modules.car.entity.*;
import com.zhgd.xmgl.modules.car.entity.vo.CountCarModuleTypeVo;
@ -25,6 +31,7 @@ import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync;
import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionSyncMapper;
import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.PathUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -124,6 +131,9 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
}
} else {
carInfoMapper.insert(c);
// 生成指定url对应的二维码到文件，宽和高都是300像素
setQrCode(c);
carInfoMapper.updateById(c);
addCarInfoForApprovalFlowIf(c);
//同步海康
addCarInfoForHikvision(c, asyncHikvision);
@ -197,6 +207,18 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
editCar(carInfo);
}
private void setQrCode(CarInfo carInfo) {
// 生成指定url对应的二维码到文件，宽和高都是300像素
String url = UUID.randomUUID() + ".jpg";
String path = PathUtil.getBasePath() + "/" + url;
log.info(path);
carInfo.setCarQrCode(url);
JSONObject jsonObject = new JSONObject();
jsonObject.put("id", carInfo.getId().toString());
QrCodeUtil.generate(JSON.toJSONString(jsonObject), 300, 300, FileUtil.file(path));
}
private void editCar(CarInfo carInfo) {
CarInfo old = carInfoMapper.selectById(carInfo.getId());
carInfoMapper.updateById(carInfo);
@ -355,9 +377,13 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
if (!hikvisionConfig) {
return;
}
if (!isSetBlack || Objects.equals(carInfo.getCarModuleType(), 1)) {
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(3).setWhoId(carInfo.getId()).setBigType(2).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(3).setWhoId(carInfo.getId()).setBigType(2).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
}
if (!isSetBlack || !Objects.equals(carInfo.getCarModuleType(), 1)) {
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(3).setWhoId(carInfo.getId()).setBigType(2).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
}
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(7).setOperate(isSetBlack ? 1 : 3).setWhoId(carInfo.getId()).setBigType(2).setCreateDate(getSyncTimeWithInitIfAbsent(2, carInfo.getId())));
asyncHikvision.deleteCarInfoForHikvisionAsync(carInfo, isSetBlack);
}
@ -384,4 +410,17 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
asyncHikvision.editCarInfoForHikvisionAsync(carInfo, old);
}
}
@Override
public void updateCarQrCode(Map<String, Object> param) {
String projectSn = MapUtils.getString(param, Cts.PROJECT_SN);
List<CarInfo> carInfos = carInfoMapper.selectList(new LambdaQueryWrapper<CarInfo>()
.eq(CarInfo::getProjectSn, projectSn));
for (CarInfo carInfo : carInfos) {
if (StrUtil.isBlank(carInfo.getCarQrCode())) {
this.setQrCode(carInfo);
baseMapper.updateById(carInfo);
}
}
}
}

2
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java
View File

@ -18,7 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @version： V1.0
*/
@Mapper
@DataScope
@DataScope(includeTable = "dangerous_engineering_record")
public interface DangerousEngineeringRecordMapper extends BaseMapper<DangerousEngineeringRecord> {
List<EntityMap> queryDangerousEngineeringPageList(Page<EntityMap> page, @Param("param")Map<String, Object> map);

3
src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
View File

@ -81,9 +81,6 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
Page<EntityMap> page = new Page<>(pageNo, pageSize);
if (systemUserService.isSubProject()) {
map.put("personLiableId", SecurityUtils.getUser().getUserId());
}
List<EntityMap> list = dangerousEngineeringRecordMapper.queryDangerousEngineeringPageList(page, map);
if (list.size() > 0) {
for (EntityMap data : list) {

1
src/main/java/com/zhgd/xmgl/security/RequestIdFilter.java
View File

@ -19,7 +19,6 @@ public class RequestIdFilter implements Filter {
RequestIdUtil.setRequestId("-i");
ThreadLocalUtil.addInKey(Cts.TL_IS_FROM_WEB, true);
ThreadLocalUtil.addInKey(Cts.TL_AUTH_USER, SecurityUtils.getUser());
log.info("接口开始...");
try {
filterChain.doFilter(servletRequest, servletResponse);
} finally {

28
src/main/java/com/zhgd/xmgl/task/WorkerTask.java
View File

@ -9,7 +9,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.basicdata.entity.Notice;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemLogoConfigMapper;
@ -22,7 +21,6 @@ import com.zhgd.xmgl.modules.project.entity.ProjectExternalSystemService;
import com.zhgd.xmgl.modules.project.mapper.ProjectExternalSystemServiceMapper;
import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService;
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
import com.zhgd.xmgl.modules.worker.entity.WorkerAttendance;
import com.zhgd.xmgl.modules.worker.entity.WorkerBlacklist;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
@ -52,7 +50,6 @@ import com.zhgd.xmgl.modules.xz.service.impl.XzCertificateExpireAlarmRecordServi
import com.zhgd.xmgl.util.ElecardUtil;
import lombok.extern.slf4j.Slf4j;
import net.javacrumbs.shedlock.core.SchedulerLock;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@ -292,7 +289,7 @@ public class WorkerTask {
@RequestMapping("/workerSafeWatchAlarm")
public void workerSafeWatchAlarm() {
log.info("开始执行对人员未履职情况进行监测");
String [] typeName = {"人员日常考勤", "每个项目自检任务", "一个月内缺勤超过", "一个月内迟到超过"};
String[] typeName = {"人员日常考勤", "每个项目自检任务", "一个月内缺勤超过", "一个月内迟到超过"};
List<Project> projects = projectMapper.selectList(Wrappers.<Project>lambdaQuery().eq(Project::getStatus, 2));
int day = DateUtil.dayOfMonth(new Date());
for (Project project : projects) {
@ -331,7 +328,7 @@ public class WorkerTask {
XzSecurityInspectTaskRecord xzSecurityInspectTaskRecord = xzSecurityInspectTaskRecords.stream().filter(s -> s.getId().toString().equals(data.getTaskId().toString())).collect(Collectors.toList()).get(0);
SystemUser systemUser = systemUserMapper.selectById(xzSecurityInspectTaskRecord.getInspectUser());
WorkerInfo workerInfo = workerInfoMapper.selectById(systemUser.getWorkerId());
if(workerInfo != null) {
if (workerInfo != null) {
int count = 0;
if (xzSecurityInspectTaskRecord.getType() == 1) {
count = hiddenDangerInspectRecordService.count(Wrappers.<HiddenDangerInspectRecord>lambdaQuery()
@ -359,7 +356,7 @@ public class WorkerTask {
while (iterator.hasNext()) {
String value = obj.getString(iterator.next());
if (value.equals("0")) {
number ++ ;
number++;
}
if (number > dayNum) {
personSn.add(workerMonthAttendanceStatistics.getPersonSn());
@ -379,7 +376,7 @@ public class WorkerTask {
while (iterator.hasNext()) {
String value = obj.getString(iterator.next());
if (value.equals("2")) {
number ++ ;
number++;
}
if (number > dayNum) {
personSn.add(workerMonthAttendanceStatistics.getPersonSn());
@ -496,6 +493,7 @@ public class WorkerTask {
}
}
/**
* 添加通知
*
@ -560,4 +558,20 @@ public class WorkerTask {
}
}
/**
* （定制）安全履职预警增加规则，一、二、三、四级安全隐患预警规则，分级对未整改、未复查、未核验超过多少时间进行循环通知。
*/
@Scheduled(cron = "0 0/1 * * * ?")
@RequestMapping("/workerSafeWatchAlarmForHidden")
public void workerSafeWatchAlarmForHidden() {
//List<XzWorkerSafeWatchConfig> list = xzWorkerSafeWatchConfigService.list(Wrappers.<XzWorkerSafeWatchConfig>lambdaQuery()
// .eq(XzWorkerSafeWatchConfig::getProjectSn, project.getProjectSn()));
// xzSecurityQualityInspectionRecordMapper.getWorkerSafeWatchAlarmList();
//有一条四级未整改安全隐患预警，设置超时的时间是4分钟
//SELECT * FROM xz_security_quality_inspection_record WHERE inspect_time = '2024-05-16 22:21:42';
//
//select timestampdiff(MINUTE,'2024-05-16 22:21:42','2024-05-16 22:57:45') % 5;
}
}