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

bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-04-26 20:36:24 +08:00
parent 865baee5bc
commit 8204095756
23 changed files with 789 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/HiddenDangerInspectRecordMapper.java
View File

@ -29,6 +29,9 @@ public interface HiddenDangerInspectRecordMapper extends BaseMapper<HiddenDanger
@DataScope(includeTable = "hidden_danger_inspection_record")
List<HiddenDangerInspectRecord> selectHiddenDangerInspectPage(Page<HiddenDangerInspectRecord> page, @Param("param") Map<String, Object> map);
@DataScope(includeTable = "hidden_danger_inspection_record")
List<HiddenDangerInspectRecord> selectHiddenDangerInspectPage(@Param("param") Map<String, Object> map);
EntityMap selectHiddenDangerInspectRecordById(Map<String, Object> map);
Map<String, Object> selectDangerInspectCountByTask(@Param("taskId") Long taskId);

3
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml
View File

@ -69,6 +69,9 @@
LEFT JOIN enterprise_info en ON en.id = wk.enterprise_id
left join hidden_danger_inspect_region ir on ir.id=a.hidden_danger_inspect_region_id
WHERE a.project_sn = #{param.projectSn}
<if test="param.changeUser != null and param.changeUser != ''">
and a.change_user = #{param.changeUser}
</if>
<if test="param.createUser != null and param.createUser != ''">
and a.create_user = #{param.createUser}
</if>

16
src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/HiddenDangerInspectRecordServiceImpl.java
View File

@ -33,6 +33,8 @@ import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.JxlExcelUtils;
import com.zhgd.xmgl.util.MessageUtil;
@ -56,6 +58,8 @@ import java.util.stream.Collectors;
@Service
@Transactional(rollbackFor = Exception.class)
public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDangerInspectRecordMapper, HiddenDangerInspectRecord> implements IHiddenDangerInspectRecordService {
@Autowired
XzDeductScoreRecordMapper xzDeductScoreRecordMapper;
@Autowired
IHiddenDangerInspectionStatisticsService hiddenDangerInspectionStatisticsService;
@Autowired
@ -177,6 +181,9 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
}
private void deductScoreIf(HiddenDangerInspectRecord hiddenDangerInspectRecord) {
if (hiddenDangerInspectRecord.getRecordType() == null || hiddenDangerInspectRecord.getRecordType() == 1) {
return;
}
Long inspectHiddenDangerItemRecordId = hiddenDangerInspectRecord.getInspectHiddenDangerItemRecordId();
InspectHiddenDangerItemRecord item = inspectHiddenDangerItemRecordMapper.selectById(inspectHiddenDangerItemRecordId);
if (item == null) {
@ -199,6 +206,15 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
map.put("id", workerInfo.getId());
map.put("deductScore", ds);
workerInfoMapper.updateScore(map);
//存记录
XzDeductScoreRecord vo = new XzDeductScoreRecord();
vo.setTypeName(hiddenDangerInspectRecord.getInspectTypeName());
vo.setDeductScore(workerInfo.getSafeScore() - hiddenDangerInspectRecord.getDeductScore());
vo.setCreateDate(DateUtil.parse(hiddenDangerInspectRecord.getCreateTime()));
vo.setType(1);
vo.setDeductReason(StrUtil.format("您在{}发现安全隐患({}-{})扣{}分", DateUtil.format(vo.getCreateDate(), "yyyy年MM月dd日HH:mm:ss"), "安全检査", vo.getTypeName() == null ? "无" : vo.getTypeName(), hiddenDangerInspectRecord.getDeductScore()));
xzDeductScoreRecordMapper.insert(vo);
}
private void saveHiddenDangerInspectionStatistics(HiddenDangerInspectRecord hdir) {

14
src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java
View File

@ -91,17 +91,9 @@ public class AiAnalyseHardWareAlarmRecordController {
*/
@ApiOperation(value = "添加AI分析硬件设备报警记录信息", notes = "添加AI分析硬件设备报警记录信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<AiAnalyseHardWareAlarmRecord> add(@RequestBody AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord) {
Result<AiAnalyseHardWareAlarmRecord> result = new Result<>();
try {
aiAnalyseHardWareAlarmRecordService.save(aiAnalyseHardWareAlarmRecord);
result.successMsg(MessageUtil.get("addSucess"));
} catch (Exception e) {
log.error("error：", e);
log.info(e.getMessage());
result.error500(MessageUtil.get("failErr"));
}
return result;
public Result add(@RequestBody AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord) {
aiAnalyseHardWareAlarmRecordService.add(aiAnalyseHardWareAlarmRecord);
return Result.ok();
}
/**

2
src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java
View File

@ -52,4 +52,6 @@ public interface IAiAnalyseHardWareAlarmRecordService extends IService<AiAnalyse
void callback(HashMap<String, Object> paramMap);
int batchInsert(List<AiAnalyseHardWareAlarmRecord> list);
void add(AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord);
}

41
src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
View File

@ -3,10 +3,12 @@ package com.zhgd.xmgl.modules.video.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.xuyanwu.spring.file.storage.FileInfo;
import cn.xuyanwu.spring.file.storage.FileStorageService;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -41,6 +43,8 @@ import com.zhgd.xmgl.modules.video.mapper.WorkerInfoToAiAnalyseHardWareAlarmReco
import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.JinqianmaoUtil;
import com.zhgd.xmgl.util.MessageUtil;
@ -67,6 +71,10 @@ import java.util.stream.Collectors;
@Service
@Slf4j
public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnalyseHardWareAlarmRecordMapper, AiAnalyseHardWareAlarmRecord> implements IAiAnalyseHardWareAlarmRecordService {
@Autowired
private XzDeductScoreRecordMapper xzDeductScoreRecordMapper;
@Autowired
private IDictionaryItemService dictionaryItemService;
@Autowired
private WorkerInfoMapper workerInfoMapper;
@Autowired
@ -79,8 +87,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
private AsyncAiAnalyse asyncAiAnalyse;
@Autowired
private ISystemUserService systemUserService;
@Autowired
private IDictionaryItemService dictionaryItemService;
@Autowired
private WorkerInfoToAiAnalyseHardWareAlarmRecordMapper workerInfoToAiAnalyseHardWareAlarmRecordMapper;
@ -508,6 +515,36 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
return baseMapper.batchInsert(list);
}
@Override
public void add(AiAnalyseHardWareAlarmRecord record) {
baseMapper.insert(record);
if (record.getRectificationPersonId() != null) {
WorkerInfo workerInfo = workerInfoMapper.selectOne(new LambdaQueryWrapper<WorkerInfo>()
.eq(WorkerInfo::getId, record.getRectificationPersonId()));
if (workerInfo == null) {
throw new OpenAlertException("未找到对应的人员信息");
}
List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, record.getProjectSn());
try {
Map<String, DictionaryItem> typeMap = dictList.stream().collect(Collectors.toMap(DictionaryItem::getData, Function.identity(), (dictionaryItem, dictionaryItem2) -> dictionaryItem));
DictionaryItem item = typeMap.get(record.getAlarmType() + "");
XzDeductScoreRecord vo = new XzDeductScoreRecord();
if (item != null) {
vo.setTypeName(item.getName());
}
vo.setDeductScore(record.getDeductScore());
vo.setCreateDate(DateUtil.parse(record.getCreateTime()));
vo.setType(2);
vo.setCurScore(workerInfo.getSafeScore() - record.getDeductScore());
vo.setDeductReason(StrUtil.format("您在{}发现安全隐患({}-{})扣{}分", DateUtil.format(vo.getCreateDate(), "yyyy年MM月dd日HH:mm:ss"), "Al违章", vo.getTypeName() == null ? "无" : vo.getTypeName(), record.getDeductScore()));
xzDeductScoreRecordMapper.insert(vo);
} catch (Exception e) {
log.error("error：", e);
}
}
}
private Integer getAlarmType(Integer algorithmId) {
/*
4 行人闯入

13
src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java
View File

@ -621,7 +621,6 @@ public class WorkerInfoController {
return Result.success(workerInfoService.getSpecialWorkerStatics(map));
}
/**
* 统计人员年龄
*
@ -660,13 +659,13 @@ public class WorkerInfoController {
return Result.ok("导入中，请耐心等待通知！");
}
@ApiOperation(value = "查询劳务人员安全扣分记录", notes = "查询劳务人员安全扣分记录", httpMethod = "POST")
@ApiOperation(value = "根据身份证号查询劳务人员", notes = "根据身份证号查询劳务人员", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "workerId", value = "劳务人员id", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "idCard", value = "身份证号", paramType = "body", required = false, dataType = "String"),
})
@PostMapping(value = "/getWorkerInfoDeductScores")
public Result<GetWorkerInfoDeductScoreVo> getWorkerInfoDeductScores(@ApiIgnore @RequestBody Map<String, Object> paramMap) {
return Result.success(workerInfoService.getWorkerInfoDeductScores(paramMap));
@PostMapping(value = "/selectWorkerInfoByIdCard")
public Result<WorkerInfo> selectWorkerInfoByIdCard(@RequestBody Map<String, Object> map) {
return Result.success(workerInfoService.selectWorkerInfoByIdCard(map));
}
}

4
src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
View File

@ -339,6 +339,8 @@ public class WorkerInfo implements Serializable {
private String ufaceDevGroupId;
@ApiModelProperty(value = "安全分数")
private Double safeScore;
@ApiModelProperty(value = "下发状态：1成功2失败3部分成功")
private Integer sendSuccessStatus;
@TableField(exist = false)
@ApiModelProperty(value = "人脸分数")
@ -392,10 +394,10 @@ public class WorkerInfo implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "证书类型名称")
private String certificateTypeName;
@TableField(exist = false)
/**
* 通知的人员id
*/
@TableField(exist = false)
private Long noticeUserId;
public String toExistString() {

16
src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/GetWorkerInfoDeductScoreVo.java
View File

@ -1,16 +0,0 @@
package com.zhgd.xmgl.modules.worker.entity.vo;
import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord;
import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
import lombok.Data;
import java.util.List;
@Data
public class GetWorkerInfoDeductScoreVo {
private WorkerInfo workerInfo;
private List<AiAnalyseHardWareAlarmRecord> aiAnalyseHardWareAlarmRecords;
private List<HiddenDangerInspectRecord> hiddenDangerInspectRecords;
}

3
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java
View File

@ -130,6 +130,7 @@ public interface IWorkerInfoService extends IService<WorkerInfo> {
void uploadWorkerInfoImgs(MultipartFile file, String projectSn) throws IOException;
GetWorkerInfoDeductScoreVo getWorkerInfoDeductScores(Map<String, Object> paramMap);
WorkerInfo selectWorkerInfoByIdCard(Map<String, Object> map);
}

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

@ -25,17 +25,21 @@ import com.zhgd.xmgl.async.AsyncHikvision;
import com.zhgd.xmgl.async.AsyncJiLianDa;
import com.zhgd.xmgl.async.AsyncWorker;
import com.zhgd.xmgl.call.HikvisionCall;
import com.zhgd.xmgl.modules.basicdata.constant.DictionaryConstant;
import com.zhgd.xmgl.modules.basicdata.entity.Company;
import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.mapper.CompanyMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.basicdata.service.ICompanyService;
import com.zhgd.xmgl.modules.basicdata.service.IDictionaryItemService;
import com.zhgd.xmgl.modules.basicdata.service.UploadFileService;
import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl;
import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord;
import com.zhgd.xmgl.modules.dangerous.mapper.HiddenDangerInspectRecordMapper;
import com.zhgd.xmgl.modules.govtapi.GovtOpenApiService;
import com.zhgd.xmgl.modules.inspection.mapper.InspectTaskRecordMapper;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise;
import com.zhgd.xmgl.modules.project.entity.bo.ProjectStatisticsCountBo;
@ -72,6 +76,7 @@ import java.nio.charset.Charset;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
@ -84,6 +89,10 @@ import java.util.stream.Collectors;
@Slf4j
@Transactional(rollbackFor = Exception.class)
public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerInfo> implements IWorkerInfoService {
@Autowired
private IDictionaryItemService dictionaryItemService;
@Autowired
private InspectTaskRecordMapper inspectTaskRecordMapper;
@Autowired
private XzSupplierQualificationApplyServiceImpl xzSupplierQualificationApplyService;
@Autowired
@ -2098,22 +2107,17 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
}
@Override
public GetWorkerInfoDeductScoreVo getWorkerInfoDeductScores(Map<String, Object> paramMap) {
GetWorkerInfoDeductScoreVo vo = new GetWorkerInfoDeductScoreVo();
String workerId = MapUtils.getString(paramMap, "workerId");
if (StrUtil.isBlank(workerId)) {
throw new OpenAlertException("workerId不能为空");
public WorkerInfo selectWorkerInfoByIdCard(Map<String, Object> map) {
String idCard = MapUtils.getString(map, "idCard");
if (StrUtil.isBlank(idCard)) {
throw new OpenAlertException("idCard不能为空");
}
WorkerInfo workerInfo = workerInfoMapper.selectById(workerId);
if (workerInfo == null) {
throw new OpenAlertException("劳务人员不存在");
List<WorkerInfo> workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
.eq(WorkerInfo::getIdCard, idCard));
if (CollUtil.isEmpty(workerInfos)) {
return null;
}
vo.setWorkerInfo(workerInfo);
List<AiAnalyseHardWareAlarmRecord> aiAnalyseHardWareAlarmRecords = aiAnalyseHardWareAlarmRecordMapper.selectList(new LambdaQueryWrapper<AiAnalyseHardWareAlarmRecord>().eq(AiAnalyseHardWareAlarmRecord::getRectificationPersonId, workerId));
List<HiddenDangerInspectRecord> hiddenDangerInspectRecords = hiddenDangerInspectRecordMapper.selectList(new LambdaQueryWrapper<HiddenDangerInspectRecord>().eq(HiddenDangerInspectRecord::getChangeUser, workerId));
vo.setAiAnalyseHardWareAlarmRecords(aiAnalyseHardWareAlarmRecords);
vo.setHiddenDangerInspectRecords(hiddenDangerInspectRecords);
return vo;
return workerInfos.get(0);
}
/**

128
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzDeductScoreRecordController.java Normal file
View File

@ -0,0 +1,128 @@
package com.zhgd.xmgl.modules.xz.controller;
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
import com.zhgd.xmgl.modules.xz.service.IXzDeductScoreRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiImplicitParams;
import java.util.HashMap;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import com.zhgd.jeecg.common.api.vo.Result;
import org.apache.commons.collections.MapUtils;
import org.simpleframework.xml.core.Validate;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @Title: Controller
* @Description: 星纵-准入二维码扣分记录
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
@RestController
@RequestMapping("/xmgl/xzDeductScoreRecord")
@Slf4j
@Api(tags = "星纵-准入二维码扣分记录相关Api")
public class XzDeductScoreRecordController {
@Autowired
private IXzDeductScoreRecordService xzDeductScoreRecordService;
/**
* 分页列表查询
*
* @return
*/
@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 = "/page")
public Result<IPage<XzDeductScoreRecord>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzDeductScoreRecordService.queryPageList(paramMap));
}
/**
* 列表查询
*
* @return
*/
@ApiOperation(value = "列表查询星纵-准入二维码扣分记录信息", notes = "列表查询星纵-准入二维码扣分记录信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<XzDeductScoreRecord>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzDeductScoreRecordService.queryList(paramMap));
}
/**
* 添加
*
* @param xzDeductScoreRecord
* @return
*/
@ApiOperation(value = "添加星纵-准入二维码扣分记录信息", notes = "添加星纵-准入二维码扣分记录信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<XzDeductScoreRecord> add(@RequestBody @Validate XzDeductScoreRecord xzDeductScoreRecord) {
xzDeductScoreRecordService.add(xzDeductScoreRecord);
return Result.ok();
}
/**
* 编辑
*
* @param xzDeductScoreRecord
* @return
*/
@ApiOperation(value = "编辑星纵-准入二维码扣分记录信息", notes = "编辑星纵-准入二维码扣分记录信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<XzDeductScoreRecord> edit(@RequestBody XzDeductScoreRecord xzDeductScoreRecord) {
xzDeductScoreRecordService.edit(xzDeductScoreRecord);
return Result.ok();
}
/**
* 通过id删除
*
* @return
*/
@ApiOperation(value = "删除星纵-准入二维码扣分记录信息", notes = "删除星纵-准入二维码扣分记录信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-准入二维码扣分记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<XzDeductScoreRecord> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
xzDeductScoreRecordService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}
/**
* 通过id查询
*
* @param id
* @return
*/
@ApiOperation(value = "通过id查询星纵-准入二维码扣分记录信息", notes = "通过id查询星纵-准入二维码扣分记录信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "星纵-准入二维码扣分记录ID", paramType = "query", required = true, dataType = "Integer")
@GetMapping(value = "/queryById")
public Result<XzDeductScoreRecord> queryById(@RequestParam(name = "id", required = true) String id) {
Result<XzDeductScoreRecord> result = new Result<XzDeductScoreRecord>();
XzDeductScoreRecord xzDeductScoreRecord = xzDeductScoreRecordService.getById(id);
if (xzDeductScoreRecord == null) {
result.error500("未找到对应实体");
} else {
result.setResult(xzDeductScoreRecord);
result.setSuccess(true);
}
return result;
}
}

128
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzHikvisionSyncController.java Normal file
View File

@ -0,0 +1,128 @@
package com.zhgd.xmgl.modules.xz.controller;
import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync;
import com.zhgd.xmgl.modules.xz.service.IXzHikvisionSyncService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiImplicitParams;
import java.util.HashMap;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
import com.zhgd.jeecg.common.api.vo.Result;
import org.apache.commons.collections.MapUtils;
import org.simpleframework.xml.core.Validate;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @Title: Controller
* @Description: 星纵-海康同步数据
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
@RestController
@RequestMapping("/xmgl/xzHikvisionSync")
@Slf4j
@Api(tags = "星纵-海康同步数据相关Api")
public class XzHikvisionSyncController {
@Autowired
private IXzHikvisionSyncService xzHikvisionSyncService;
/**
* 分页列表查询
*
* @return
*/
@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 = "/page")
public Result<IPage<XzHikvisionSync>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzHikvisionSyncService.queryPageList(paramMap));
}
/**
* 列表查询
*
* @return
*/
@ApiOperation(value = "列表查询星纵-海康同步数据信息", notes = "列表查询星纵-海康同步数据信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<XzHikvisionSync>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzHikvisionSyncService.queryList(paramMap));
}
/**
* 添加
*
* @param xzHikvisionSync
* @return
*/
@ApiOperation(value = "添加星纵-海康同步数据信息", notes = "添加星纵-海康同步数据信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<XzHikvisionSync> add(@RequestBody @Validate XzHikvisionSync xzHikvisionSync) {
xzHikvisionSyncService.add(xzHikvisionSync);
return Result.ok();
}
/**
* 编辑
*
* @param xzHikvisionSync
* @return
*/
@ApiOperation(value = "编辑星纵-海康同步数据信息", notes = "编辑星纵-海康同步数据信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<XzHikvisionSync> edit(@RequestBody XzHikvisionSync xzHikvisionSync) {
xzHikvisionSyncService.edit(xzHikvisionSync);
return Result.ok();
}
/**
* 通过id删除
*
* @return
*/
@ApiOperation(value = "删除星纵-海康同步数据信息", notes = "删除星纵-海康同步数据信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "星纵-海康同步数据ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<XzHikvisionSync> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
xzHikvisionSyncService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}
/**
* 通过id查询
*
* @param id
* @return
*/
@ApiOperation(value = "通过id查询星纵-海康同步数据信息", notes = "通过id查询星纵-海康同步数据信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "星纵-海康同步数据ID", paramType = "query", required = true, dataType = "Integer")
@GetMapping(value = "/queryById")
public Result<XzHikvisionSync> queryById(@RequestParam(name = "id", required = true) String id) {
Result<XzHikvisionSync> result = new Result<XzHikvisionSync>();
XzHikvisionSync xzHikvisionSync = xzHikvisionSyncService.getById(id);
if (xzHikvisionSync == null) {
result.error500("未找到对应实体");
} else {
result.setResult(xzHikvisionSync);
result.setSuccess(true);
}
return result;
}
}

88
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDeductScoreRecord.java Normal file
View File

@ -0,0 +1,88 @@
package com.zhgd.xmgl.modules.xz.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description: 星纵-准入二维码扣分记录
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
@Data
@TableName("xz_deduct_score_record")
@ApiModel(value = "XzDeductScoreRecord实体类", description = "XzDeductScoreRecord")
public class XzDeductScoreRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**
* 扣分原因
*/
@Excel(name = "扣分原因", width = 15)
@ApiModelProperty(value = "扣分原因")
private java.lang.String deductReason;
@ApiModelProperty(value = "劳务人员id")
private java.lang.Long workerId;
/**
* 扣分值
*/
@Excel(name = "扣分值", width = 15)
@ApiModelProperty(value = "扣分值")
private java.lang.Double deductScore;
/**
* 当前安全评分分值
*/
@Excel(name = "当前安全评分分值", width = 15)
@ApiModelProperty(value = "当前安全评分分值")
private java.lang.Double curScore;
/**
* 1安全检查 2AI违章
*/
@Excel(name = "1安全检查 2AI违章", width = 15)
@ApiModelProperty(value = "1安全检查 2AI违章")
private java.lang.Integer type;
/**
* 违章类型名称或隐患类型名称
*/
@Excel(name = "违章类型名称或隐患类型名称", width = 15)
@ApiModelProperty(value = "违章类型名称或隐患类型名称")
private java.lang.String typeName;
/**
* 所属项目SN
*/
@Excel(name = "所属项目SN", width = 15)
@ApiModelProperty(value = "所属项目SN")
private java.lang.String projectSn;
/**
* 扣分时间
*/
@Excel(name = "扣分时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "扣分时间")
private java.util.Date createDate;
/**
* 更新时间
*/
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateDate;
}

86
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionSync.java Normal file
View File

@ -0,0 +1,86 @@
package com.zhgd.xmgl.modules.xz.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @Description: 星纵-海康同步数据
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
@Data
@TableName("xz_hikvision_sync")
@ApiModel(value = "XzHikvisionSync实体类", description = "XzHikvisionSync")
public class XzHikvisionSync implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**
* 所属项目SN
*/
@Excel(name = "所属项目SN", width = 15)
@ApiModelProperty(value = "所属项目SN")
private java.lang.String projectSn;
/**
* 1人员2人员照片3人员权限
*/
@Excel(name = "1人员2人员照片3人员权限", width = 15)
@ApiModelProperty(value = "1人员2人员照片3人员权限")
private java.lang.Integer type;
/**
* 1新增2修改3删除
*/
@Excel(name = "1新增2修改3删除", width = 15)
@ApiModelProperty(value = "1新增2修改3删除")
private java.lang.Integer operate;
/**
* 设备sn
*/
@Excel(name = "设备sn", width = 15)
@ApiModelProperty(value = "设备sn")
private java.lang.String deviceSn;
/**
* 人员/车辆的id
*/
@Excel(name = "人员/车辆的id", width = 15)
@ApiModelProperty(value = "人员/车辆的id")
private java.lang.Long whoId;
/**
* 是否成功
*/
@Excel(name = "是否成功", width = 15)
@ApiModelProperty(value = "是否成功")
private java.lang.Integer isSuccess;
/**
* 创建时间
*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private java.util.Date createDate;
/**
* 更新时间
*/
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private java.util.Date updateDate;
}

16
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzDeductScoreRecordMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.zhgd.xmgl.modules.xz.mapper;
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 星纵-准入二维码扣分记录
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
@Mapper
public interface XzDeductScoreRecordMapper extends BaseMapper<XzDeductScoreRecord> {
}

16
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzHikvisionSyncMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.zhgd.xmgl.modules.xz.mapper;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 星纵-海康同步数据
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
@Mapper
public interface XzHikvisionSyncMapper extends BaseMapper<XzHikvisionSync> {
}

4
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDeductScoreRecordMapper.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper">
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.xz.mapper.XzHikvisionSyncMapper">
</mapper>

27
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzDeductScoreRecordService.java Normal file
View File

@ -0,0 +1,27 @@
package com.zhgd.xmgl.modules.xz.service;
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 星纵-准入二维码扣分记录
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
public interface IXzDeductScoreRecordService extends IService<XzDeductScoreRecord> {
IPage<XzDeductScoreRecord> queryPageList(HashMap<String, Object> paramMap);
List<XzDeductScoreRecord> queryList(HashMap<String, Object> paramMap);
void add(XzDeductScoreRecord xzDeductScoreRecord);
void edit(XzDeductScoreRecord xzDeductScoreRecord);
void delete(String id);
}

27
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java Normal file
View File

@ -0,0 +1,27 @@
package com.zhgd.xmgl.modules.xz.service;
import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.HashMap;
import java.util.List;
/**
* @Description: 星纵-海康同步数据
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
public interface IXzHikvisionSyncService extends IService<XzHikvisionSync> {
IPage<XzHikvisionSync> queryPageList(HashMap<String, Object> paramMap);
List<XzHikvisionSync> queryList(HashMap<String, Object> paramMap);
void add(XzHikvisionSync xzHikvisionSync);
void edit(XzHikvisionSync xzHikvisionSync);
void delete(String id);
}

85
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDeductScoreRecordServiceImpl.java Normal file
View File

@ -0,0 +1,85 @@
package com.zhgd.xmgl.modules.xz.service.impl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
import com.zhgd.xmgl.modules.xz.service.IXzDeductScoreRecordService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.util.PageUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.HashMap;
import java.util.List;
import com.zhgd.xmgl.util.RefUtil;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: 星纵-准入二维码扣分记录
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class XzDeductScoreRecordServiceImpl extends ServiceImpl<XzDeductScoreRecordMapper, XzDeductScoreRecord> implements IXzDeductScoreRecordService {
@Autowired
private XzDeductScoreRecordMapper xzDeductScoreRecordMapper;
@Override
public IPage<XzDeductScoreRecord> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzDeductScoreRecord> queryWrapper = getQueryWrapper(paramMap);
Page<XzDeductScoreRecord> page = PageUtil.getPage(paramMap);
IPage<XzDeductScoreRecord> pageList = this.page(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@Override
public List<XzDeductScoreRecord> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzDeductScoreRecord> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper));
}
private QueryWrapper<XzDeductScoreRecord> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
QueryWrapper<XzDeductScoreRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(XzDeductScoreRecord.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzDeductScoreRecord::getCreateDate));
return queryWrapper;
}
private List<XzDeductScoreRecord> dealList(List<XzDeductScoreRecord> list) {
return list;
}
@Override
public void add(XzDeductScoreRecord xzDeductScoreRecord) {
xzDeductScoreRecord.setId(null);
baseMapper.insert(xzDeductScoreRecord);
}
@Override
public void edit(XzDeductScoreRecord xzDeductScoreRecord) {
XzDeductScoreRecord oldXzDeductScoreRecord = baseMapper.selectById(xzDeductScoreRecord.getId());
if (oldXzDeductScoreRecord == null) {
throw new OpenAlertException("未找到对应实体");
}
baseMapper.updateById(xzDeductScoreRecord);
}
@Override
public void delete(String id) {
XzDeductScoreRecord xzDeductScoreRecord = baseMapper.selectById(id);
if (xzDeductScoreRecord == null) {
throw new OpenAlertException("未找到对应实体");
}
baseMapper.deleteById(id);
}
}

85
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java Normal file
View File

@ -0,0 +1,85 @@
package com.zhgd.xmgl.modules.xz.service.impl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.xmgl.modules.xz.entity.XzHikvisionSync;
import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionSyncMapper;
import com.zhgd.xmgl.modules.xz.service.IXzHikvisionSyncService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.util.PageUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.HashMap;
import java.util.List;
import com.zhgd.xmgl.util.RefUtil;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: 星纵-海康同步数据
* @author： pds
* @date： 2024-04-26
* @version： V1.0
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class XzHikvisionSyncServiceImpl extends ServiceImpl<XzHikvisionSyncMapper, XzHikvisionSync> implements IXzHikvisionSyncService {
@Autowired
private XzHikvisionSyncMapper xzHikvisionSyncMapper;
@Override
public IPage<XzHikvisionSync> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzHikvisionSync> queryWrapper = getQueryWrapper(paramMap);
Page<XzHikvisionSync> page = PageUtil.getPage(paramMap);
IPage<XzHikvisionSync> pageList = this.page(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@Override
public List<XzHikvisionSync> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzHikvisionSync> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper));
}
private QueryWrapper<XzHikvisionSync> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
QueryWrapper<XzHikvisionSync> queryWrapper = QueryGenerator.initPageQueryWrapper(XzHikvisionSync.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzHikvisionSync::getId));
return queryWrapper;
}
private List<XzHikvisionSync> dealList(List<XzHikvisionSync> list) {
return list;
}
@Override
public void add(XzHikvisionSync xzHikvisionSync) {
xzHikvisionSync.setId(null);
baseMapper.insert(xzHikvisionSync);
}
@Override
public void edit(XzHikvisionSync xzHikvisionSync) {
XzHikvisionSync oldXzHikvisionSync = baseMapper.selectById(xzHikvisionSync.getId());
if (oldXzHikvisionSync == null) {
throw new OpenAlertException("未找到对应实体");
}
baseMapper.updateById(xzHikvisionSync);
}
@Override
public void delete(String id) {
XzHikvisionSync xzHikvisionSync = baseMapper.selectById(id);
if (xzHikvisionSync == null) {
throw new OpenAlertException("未找到对应实体");
}
baseMapper.deleteById(id);
}
}