diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml
index ced2d07..716dea2 100644
--- a/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml
+++ b/bonus-modules/bonus-app/src/main/resources/mapper/CraneMonitorMapper.xml
@@ -52,8 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tw.warn_content AS warnContent
FROM tb_warn tw
LEFT JOIN tb_device td ON tw.dev_id = td.id
- LEFT JOIN tb_dev_ly tdl ON td.id = tdl.dev_id
- WHERE tdl.team_id = #{id} AND td.dev_type = #{devType}
+ WHERE tw.team_id = #{id} AND td.dev_type = #{devType}
AND DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/PersonMgeController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/PersonMgeController.java
index 292f5a1..554c733 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/PersonMgeController.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/PersonMgeController.java
@@ -47,27 +47,27 @@ public class PersonMgeController extends BaseController {
@Resource(name = "PersonMgeMapper")
private PersonMgeMapper mapper;
-// @RequiresPermissions("basic:person:list")
+ // @RequiresPermissions("basic:person:list")
@GetMapping("list")
- @SysLog(title = "人员管理", businessType = OperaType.QUERY,logType = 0,module = "基础管理->人员管理",details ="查询人员列表")
+ @SysLog(title = "人员管理", businessType = OperaType.QUERY, logType = 0, module = "基础管理->人员管理", details = "查询人员列表")
public TableDataInfo list(BraceletParamsDto dto) {
- System.err.println("开始"+DateTimeHelper.getNowTime());
+ System.err.println("开始" + DateTimeHelper.getNowTime());
startPage();
TableDataInfo tableDataInfo = service.getPersonLists(dto);
- System.err.println("结束"+DateTimeHelper.getNowTime());
+ System.err.println("结束" + DateTimeHelper.getNowTime());
return tableDataInfo;
}
-// @RequiresPermissions("basic:person:add")
+ // @RequiresPermissions("basic:person:add")
@PostMapping("addPerson")
- @SysLog(title = "人员管理", businessType = OperaType.INSERT,logType = 0,module = "基础管理->人员管理",details ="新增人员" )
+ @SysLog(title = "人员管理", businessType = OperaType.INSERT, logType = 0, module = "基础管理->人员管理", details = "新增人员")
public AjaxResult add(HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file, String params) {
return service.addPerson(file, params);
}
-// @RequiresPermissions("basic:person:edit")
+ // @RequiresPermissions("basic:person:edit")
@PostMapping("editPerson")
- @SysLog(title = "人员管理", businessType = OperaType.INSERT,logType = 0,module = "基础管理->人员管理",details ="修改人员" )
+ @SysLog(title = "人员管理", businessType = OperaType.INSERT, logType = 0, module = "基础管理->人员管理", details = "修改人员")
public AjaxResult editPerson(HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file, String params) {
return service.editPerson(file, params);
}
@@ -77,31 +77,43 @@ public class PersonMgeController extends BaseController {
return service.getPersonInfo(dto);
}
-// @RequiresPermissions("basic:person:del")
+ // @RequiresPermissions("basic:person:del")
@PostMapping("delPerson")
- @SysLog(title = "人员管理", businessType = OperaType.DELETE,logType = 0,module = "基础管理->人员管理",details ="删除人员" )
+ @SysLog(title = "人员管理", businessType = OperaType.DELETE, logType = 0, module = "基础管理->人员管理", details = "删除人员")
public AjaxResult delPerson(@RequestBody BraceletParamsDto dto) {
return service.delPerson(dto);
}
// @RequiresPermissions("basic:person:push")
@PostMapping("pushFace")
- @SysLog(title = "人员管理", businessType = OperaType.DELETE,logType = 0,module = "基础管理->人员管理",details ="推送人脸库" )
+ @SysLog(title = "人员管理", businessType = OperaType.DELETE, logType = 0, module = "基础管理->人员管理", details = "推送人脸库")
public AjaxResult pushFace(@RequestBody BraceletParamsDto dto) {
return service.pushFace(dto);
}
@PostMapping("excelUpload")
// @RequiresPermissions("basic:person:excelUpload")
- @SysLog(title = "人员管理", businessType = OperaType.IMPORT,logType = 0,module = "基础管理->人员管理",details ="人员导入" )
- public AjaxResult excelUpload(MultipartFile file, HttpServletRequest request, HttpServletResponse response){
+ @SysLog(title = "人员管理", businessType = OperaType.IMPORT, logType = 0, module = "基础管理->人员管理", details = "人员导入")
+ public AjaxResult excelUpload(MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
String result = UploadCheckUtils.uploadExcelVerify(file);
- if(StringUtils.isNotBlank(result)){
+ if (StringUtils.isNotBlank(result)) {
return AjaxResult.error(result);
}
return service.excelUpload(file, request, response);
}
+ /**
+ * 获取人脸照片
+ * @param dto
+ * @return AjaxResult
+ * @author cwchen
+ * @date 2024/8/21 9:27
+ */
+ @GetMapping("getPersonFace")
+ public AjaxResult getPersonFace(BraceletParamsDto dto) {
+ return service.getPersonFace(dto);
+ }
+
/**
* 根据人员id获取证书详细信息
*/
@@ -116,57 +128,57 @@ public class PersonMgeController extends BaseController {
*/
@RequiresPermissions("bracelet:person:edit")
@PostMapping("updateCertificate")
- @SysLog(title = "人员管理", businessType = OperaType.UPDATE,module = "基础管理->人员管理")
+ @SysLog(title = "人员管理", businessType = OperaType.UPDATE, module = "基础管理->人员管理")
public AjaxResult editCertificate(@RequestParam(value = "highfile", required = false) MultipartFile[] highfile, @RequestParam(value = "electfile", required = false) MultipartFile[] electfile,
- @RequestParam(value = "elsefile", required = false) MultipartFile[] elsefile,Long id,@RequestParam(value = "delHighFileIdList", required = false) String[] delhighfile,
- @RequestParam(value = "delElectFileIdList", required = false) String[] delelectfile,@RequestParam(value = "delElseFileIdList", required = false) String[] delelsefile) {
- try{
- if(delhighfile != null) {
+ @RequestParam(value = "elsefile", required = false) MultipartFile[] elsefile, Long id, @RequestParam(value = "delHighFileIdList", required = false) String[] delhighfile,
+ @RequestParam(value = "delElectFileIdList", required = false) String[] delelectfile, @RequestParam(value = "delElseFileIdList", required = false) String[] delelsefile) {
+ try {
+ if (delhighfile != null) {
for (int i = 0; i < delhighfile.length; i++) {
String high = String.valueOf(delhighfile[i]);
Integer certicificateId = mapper.getHighId(high);
// if(certicificateId==null){
// return AjaxResult.error("被删除的高出作业证图片资源无法找到");
// }
- if(certicificateId!=null) {
+ if (certicificateId != null) {
mapper.delHigh(certicificateId);
mapper.delHighFile(high, certicificateId);
remoteFileService.delFile(high, SecurityConstants.INNER);
}
}
}
- if(delelectfile != null) {
+ if (delelectfile != null) {
for (int i = 0; i < delelectfile.length; i++) {
String elect = String.valueOf(delelectfile[i]);
- Integer certicificateId = mapper.getElectId(elect);
+ Integer certicificateId = mapper.getElectId(elect);
// if(certicificateId==null){
// return AjaxResult.error("被删除的电工作业证作业证图片资源无法找到");
// }
- if(certicificateId!=null) {
+ if (certicificateId != null) {
mapper.delElect(certicificateId);
mapper.delElectFile(elect, certicificateId);
remoteFileService.delFile(elect, SecurityConstants.INNER);
}
}
}
- if(delelsefile != null){
+ if (delelsefile != null) {
for (int i = 0; i < delelsefile.length; i++) {
String elseFile = String.valueOf(delelsefile[i]);
- Integer certicificateId = mapper.getElseId(elseFile);
+ Integer certicificateId = mapper.getElseId(elseFile);
// if(certicificateId==null){
// return AjaxResult.error("被删除的其他作业证作业证图片资源无法找到");
// }
- if(certicificateId!=null){
+ if (certicificateId != null) {
mapper.delElse(certicificateId);
- mapper.delElseFile(elseFile,certicificateId);
- remoteFileService.delFile(elseFile,SecurityConstants.INNER);
+ mapper.delElseFile(elseFile, certicificateId);
+ remoteFileService.delFile(elseFile, SecurityConstants.INNER);
}
}
}
- return service.updateCertificate(highfile,electfile,elsefile,id);
+ return service.updateCertificate(highfile, electfile, elsefile, id);
- }catch (Exception e){
- log.error(e.toString(),e);
+ } catch (Exception e) {
+ log.error(e.toString(), e);
}
return error("系统异常");
}
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java
index ddd66d6..cf7d3c2 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java
@@ -1,5 +1,6 @@
package com.bonus.bracelet.mapper;
+import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.entity.bracelet.BraceletParamsDto;
import com.bonus.common.entity.bracelet.vo.CertificateVo;
import com.bonus.common.entity.bracelet.vo.PersonVo;
@@ -261,4 +262,5 @@ public interface PersonMgeMapper {
* @date 2024/8/19 18:31
*/
List> mjCodeIsExist();
+
}
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IPersonMgeService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IPersonMgeService.java
index 7e58d14..12b57f0 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IPersonMgeService.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IPersonMgeService.java
@@ -110,4 +110,13 @@ public interface IPersonMgeService {
* @date 2024/8/12 14:11
*/
AjaxResult pushFace(BraceletParamsDto dto);
+
+ /**
+ * 获取人脸照片
+ * @param dto
+ * @return AjaxResult
+ * @author cwchen
+ * @date 2024/8/21 9:32
+ */
+ AjaxResult getPersonFace(BraceletParamsDto dto);
}
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java
index 265997f..80f22df 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java
@@ -517,6 +517,15 @@ public class PersonMgeServiceImpl implements IPersonMgeService {
return AjaxResult.success();
}
+ @Override
+ public AjaxResult getPersonFace(BraceletParamsDto dto) {
+ if (StringUtils.isBlank(dto.getFilePath())) {
+ return AjaxResult.success("查询成功",null);
+ }
+ String imgBase64 = getPersonImgBase64(dto.getFilePath());
+ return AjaxResult.success("查询成功",imgBase64);
+ }
+
/**
* 验证身份证号是否存在
*