From 25c48baa86a7c53dc22a345ec0be0359d2d27131 Mon Sep 17 00:00:00 2001 From: zc Date: Mon, 14 Jul 2025 15:48:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E5=AE=89=E4=BC=98=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dcsoft/auth/service/SysLoginService.java | 8 +-- .../file/controller/SysFileController.java | 52 +++++++++++++++++-- .../SysEmpowerRecordController.java | 8 +-- .../controller/SysPeopleController.java | 1 - .../system/domain/SysEmpowerRecord.java | 2 +- .../com/dcsoft/system/domain/SysPeople.java | 2 +- .../mapper/SysPeopleEquipmentMapper.java | 2 +- .../service/ISysPeopleEquipmentService.java | 2 +- .../impl/SysPeopleEquipmentServiceImpl.java | 2 +- .../uniubi/controller/SysSdkController.java | 2 +- .../service/impl/SysApiServiceImpl.java | 4 +- .../service/impl/SysSdkServiceImpl.java | 6 +-- .../controller/VisCarryStuffController.java | 9 ++-- .../visitor/controller/VisitorController.java | 8 +++ .../mapper/system/SysEmpowerRecordMapper.xml | 2 +- .../mapper/system/SysPeopleMapper.xml | 3 ++ 16 files changed, 84 insertions(+), 29 deletions(-) diff --git a/dcsoft-auth/src/main/java/com/dcsoft/auth/service/SysLoginService.java b/dcsoft-auth/src/main/java/com/dcsoft/auth/service/SysLoginService.java index 054d216..865547c 100644 --- a/dcsoft-auth/src/main/java/com/dcsoft/auth/service/SysLoginService.java +++ b/dcsoft-auth/src/main/java/com/dcsoft/auth/service/SysLoginService.java @@ -362,10 +362,10 @@ public class SysLoginService smsDTO.setTemplateId(smsProperties.getTemplate11()); smsDTO.setCaptcha(smsCode); smsDTO.setPhone(register.getPhone()); -// AjaxResult ajaxResult = remoteUserService.sendMessage(smsDTO, SecurityConstants.INNER); -// if (!ajaxResult.isSuccess()) { -// throw new ServiceException(ajaxResult.get("msg").toString()); -// } + AjaxResult ajaxResult = remoteUserService.sendMessage(smsDTO, SecurityConstants.INNER); + if (!ajaxResult.isSuccess()) { + throw new ServiceException(ajaxResult.get("msg").toString()); + } //缓存次数 int i = 1; diff --git a/dcsoft-modules/dcsoft-file/src/main/java/com/dcsoft/file/controller/SysFileController.java b/dcsoft-modules/dcsoft-file/src/main/java/com/dcsoft/file/controller/SysFileController.java index 3087728..27a632a 100644 --- a/dcsoft-modules/dcsoft-file/src/main/java/com/dcsoft/file/controller/SysFileController.java +++ b/dcsoft-modules/dcsoft-file/src/main/java/com/dcsoft/file/controller/SysFileController.java @@ -294,10 +294,54 @@ public class SysFileController throw new RuntimeException(e); } } -// initFlowRules(); -// //上传前进行人脸检测 -// String imgBase64 = MinioUtil.getBase64String(file); -// checkPhoto(imgBase64); + initFlowRules(); + //上传前进行人脸检测 + String imgBase64 = MinioUtil.getBase64String(file); + checkPhoto(imgBase64); + + // 上传并返回访问地址 + String fileNames = FileUploadUtils.uploadMinio(file, this.bucketName1, fileName); + SysFile sysFile = new SysFile(); + sysFile.setName(FileUtils.getName(fileNames)); + fileNames = fileNames.replace(miniourl, miniogwurl); + sysFile.setUrl(fileNames); + return R.ok(sysFile); + } catch (Exception e) { + log.error("上传文件失败", e); + return R.fail(e.getMessage()); + } + } + + /** + * 文件非证件照上传请求 + */ + @PostMapping("uploadMinio3") + public R uploadMinio3(MultipartFile file, String fileName) { + try { + //判断压缩图片 + if ((1024 * 1024 * 0.1) <= file.getSize()) { + // 小于 1M 的 + try { + String fileNames1 = file.getOriginalFilename(); + File newFile = new File(fileNames1); + if ((1024 * 1024 * 0.1) <= file.getSize() && file.getSize() <= (1024 * 1024)) { + Thumbnails.of(file.getInputStream()).scale(1f).outputQuality(0.4f).toFile(newFile); + } + // 1 - 2M 的 + else if ((1024 * 1024) < file.getSize() && file.getSize() <= (1024 * 1024 * 2)) { + Thumbnails.of(file.getInputStream()).scale(1f).outputQuality(0.2f).toFile(newFile); + } + // 2M 以上的 + else if ((1024 * 1024 * 2) < file.getSize()) { + Thumbnails.of(file.getInputStream()).scale(1f).outputQuality(0.1f).toFile(newFile); + } + // 转为 MultipartFile + file = PictureUtils.getMultipartFile(newFile); + newFile.delete(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } // 上传并返回访问地址 String fileNames = FileUploadUtils.uploadMinio(file, this.bucketName1, fileName); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysEmpowerRecordController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysEmpowerRecordController.java index bb71829..696bf01 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysEmpowerRecordController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysEmpowerRecordController.java @@ -148,7 +148,7 @@ public class SysEmpowerRecordController extends BaseController if("true".equals(cloud)){ for(Long id:ids){ SysEmpowerRecord record=sysEmpowerRecordService.selectSysEmpowerRecordById(id); - String data=sysApiService.authDeviceRevoke(equipmentService.selectSysEquipmentById(record.getEquipmentId()),peopleService.selectSysPeopleById(Long.parseLong(record.getPeopleId()))); + String data=sysApiService.authDeviceRevoke(equipmentService.selectSysEquipmentById(record.getEquipmentId()),peopleService.selectSysPeopleById(record.getPeopleId())); JSONObject json= JSONObject.parseObject(data); if(!"1".equals(json.get("result")+"")){ return error(json.get("msg")+""); @@ -204,13 +204,13 @@ public class SysEmpowerRecordController extends BaseController SysEmpowerRecord record = sysEmpowerRecordService.selectSysEmpowerRecordById(id); record.setStatus(type); if ("1".equals(type)) {//禁用 - String data = sysApiService.authDeviceRevoke(equipmentService.selectSysEquipmentById(record.getEquipmentId()), peopleService.selectSysPeopleById(Long.parseLong(record.getPeopleId()))); + String data = sysApiService.authDeviceRevoke(equipmentService.selectSysEquipmentById(record.getEquipmentId()), peopleService.selectSysPeopleById(record.getPeopleId())); JSONObject json = JSONObject.parseObject(data); if (!"1".equals(json.get("result") + "")) { return error(json.get("msg") + ""); } } else { - String data = sysApiService.authDevice(ruleService.selectSysRuleById(record.getRuleId()), peopleService.selectSysPeopleById(Long.parseLong(record.getPeopleId())), equipmentService.selectSysEquipmentById(record.getEquipmentId())); + String data = sysApiService.authDevice(ruleService.selectSysRuleById(record.getRuleId()), peopleService.selectSysPeopleById(record.getPeopleId()), equipmentService.selectSysEquipmentById(record.getEquipmentId())); JSONObject json = JSONObject.parseObject(data); if (!"1".equals(json.get("result") + "")) { return error(json.get("msg") + ""); @@ -230,7 +230,7 @@ public class SysEmpowerRecordController extends BaseController sdkService.personDelete(peopleEquipment.getGuid(), equipment.getIp(), equipment.getPassword()); } } else { - String data = sdkService.authDevice(ruleService.selectSysRuleById(record.getRuleId()), peopleService.selectSysPeopleById(Long.parseLong(record.getPeopleId())), equipmentService.selectSysEquipmentById(record.getEquipmentId())); + String data = sdkService.authDevice(ruleService.selectSysRuleById(record.getRuleId()), peopleService.selectSysPeopleById(record.getPeopleId()), equipmentService.selectSysEquipmentById(record.getEquipmentId())); JSONObject json = JSONObject.parseObject(data); if (!"1".equals(json.get("result") + "")) { return error(json.get("msg") + ""); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java index 66d26fd..cc42438 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java @@ -471,7 +471,6 @@ public class SysPeopleController extends BaseController } } - SysPeople peopleInfo = sysPeopleService.selectSysPeopleById(sysPeople.getId()); return toAjax(sysPeopleService.updateSysPeople(sysPeople)); } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysEmpowerRecord.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysEmpowerRecord.java index cbcef93..b4058dc 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysEmpowerRecord.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysEmpowerRecord.java @@ -28,7 +28,7 @@ public class SysEmpowerRecord extends BaseEntity /** 人员id */ @Excel(name = "人员id") - private String peopleId; + private Long peopleId; /** 信息下发（0成功 1失败） */ @Excel(name = "信息下发", readConverterExp = "0=成功,1=失败") diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeople.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeople.java index 6a5140d..8a41cab 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeople.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeople.java @@ -120,7 +120,7 @@ public class SysPeople extends BaseEntity private String visitorRegisterId; /** - * 携物出门审核人员，0：否，1：一级审核人2：二级审核人3：三级审核人 + * 携物出门审核人员，1：一级审核人2：二级审核人3：三级审核人 */ private String carryStuffExamine; diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/mapper/SysPeopleEquipmentMapper.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/mapper/SysPeopleEquipmentMapper.java index 0db7c74..9115b37 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/mapper/SysPeopleEquipmentMapper.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/mapper/SysPeopleEquipmentMapper.java @@ -61,7 +61,7 @@ public interface SysPeopleEquipmentMapper public SysPeopleEquipment selectSysPeopleEquipmentByGuId(String guid); - public List selectSysPeopleEquipmentByPeopleId(String peopleId); + public List selectSysPeopleEquipmentByPeopleId(Long peopleId); public List selectSysPeopleEquipmentByVisitorId(Long visitorId); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/ISysPeopleEquipmentService.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/ISysPeopleEquipmentService.java index 64c6af3..1c3c10d 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/ISysPeopleEquipmentService.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/ISysPeopleEquipmentService.java @@ -73,7 +73,7 @@ public interface ISysPeopleEquipmentService * @param id 人员设备下发信息主键 * @return 人员设备下发信息 */ - public List selectSysPeopleEquipmentByPeopleId(String peopleId); + public List selectSysPeopleEquipmentByPeopleId(Long peopleId); public List selectSysPeopleEquipmentByVisitorId(Long visitorId); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/impl/SysPeopleEquipmentServiceImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/impl/SysPeopleEquipmentServiceImpl.java index 04e78e4..1349bd7 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/impl/SysPeopleEquipmentServiceImpl.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/impl/SysPeopleEquipmentServiceImpl.java @@ -110,7 +110,7 @@ public class SysPeopleEquipmentServiceImpl implements ISysPeopleEquipmentService * @return 人员设备下发信息 */ @Override - public List selectSysPeopleEquipmentByPeopleId(String peopleId) + public List selectSysPeopleEquipmentByPeopleId(Long peopleId) { return sysPeopleEquipmentMapper.selectSysPeopleEquipmentByPeopleId(peopleId); } diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/controller/SysSdkController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/controller/SysSdkController.java index 341c68c..05c125a 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/controller/SysSdkController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/controller/SysSdkController.java @@ -186,7 +186,7 @@ public class SysSdkController { Visitor visitor1 = visitorService.selectVisitorById(Long.parseLong(split[0])); SysEmpowerRecord sysEmpowerRecord=new SysEmpowerRecord(); sysEmpowerRecord.setEquipmentId(equipment.getId()); - sysEmpowerRecord.setPeopleId(String.valueOf(visitor1.getUserId())); + sysEmpowerRecord.setPeopleId(visitor1.getUserId()); List sysEmpowerRecordList = sysEmpowerRecordService.selectSysEmpowerRecordList(sysEmpowerRecord); if(!CollectionUtils.isEmpty(sysEmpowerRecordList)){ SysRule rule=sysRuleService.selectSysRuleById(sysEmpowerRecordList.get(0).getRuleId()); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysApiServiceImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysApiServiceImpl.java index a17306c..3b07266 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysApiServiceImpl.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysApiServiceImpl.java @@ -357,7 +357,7 @@ public class SysApiServiceImpl implements ISysApiService { JSONObject json= JSONObject.parseObject(response); if("1".equals(json.get("result")+"")){//授权记录保存 SysEmpowerRecord manageRecordDto=new SysEmpowerRecord(); - manageRecordDto.setPeopleId(people.getId()+""); + manageRecordDto.setPeopleId(people.getId()); manageRecordDto.setEmpower(rule.getType()); manageRecordDto.setEquipmentId(e.getId()); manageRecordDto.setStatus("0"); @@ -366,7 +366,7 @@ public class SysApiServiceImpl implements ISysApiService { empowerRecordService.insertSysEmpowerRecord(manageRecordDto); }else{ SysEmpowerRecord manageRecordDto=new SysEmpowerRecord(); - manageRecordDto.setPeopleId(people.getId()+""); + manageRecordDto.setPeopleId(people.getId()); manageRecordDto.setEmpower(rule.getType()); manageRecordDto.setEquipmentId(e.getId()); manageRecordDto.setStatus("0"); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java index 6cc4c20..e0e67e0 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/service/impl/SysSdkServiceImpl.java @@ -375,7 +375,7 @@ public class SysSdkServiceImpl implements ISysSdkService { //授权记录保存 if("1".equals(jsons.get("result")+"")){ SysEmpowerRecord manageRecordDto=new SysEmpowerRecord(); - manageRecordDto.setPeopleId(people.getId()+""); + manageRecordDto.setPeopleId(people.getId()); manageRecordDto.setEmpower(rule.getType()); manageRecordDto.setEquipmentId(e.getId()); manageRecordDto.setStatus("0"); @@ -384,7 +384,7 @@ public class SysSdkServiceImpl implements ISysSdkService { empowerRecordService.insertSysEmpowerRecord(manageRecordDto); }else{ SysEmpowerRecord manageRecordDto=new SysEmpowerRecord(); - manageRecordDto.setPeopleId(people.getId()+""); + manageRecordDto.setPeopleId(people.getId()); manageRecordDto.setEmpower(rule.getType()); manageRecordDto.setEquipmentId(e.getId()); manageRecordDto.setStatus("0"); @@ -608,7 +608,7 @@ public class SysSdkServiceImpl implements ISysSdkService { sysPeopleEquipment.setFaceGuid(people.getFaceGuid()); peopleEquipmentService.insertSysPeopleEquipment(sysPeopleEquipment); SysEmpowerRecord manageRecordDto=new SysEmpowerRecord(); - manageRecordDto.setPeopleId(people.getId()+""); + manageRecordDto.setPeopleId(people.getId()); manageRecordDto.setEmpower(rule.getType()); manageRecordDto.setEquipmentId(e.getId()); manageRecordDto.setStatus("0"); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java index a1cb96d..67183b2 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisCarryStuffController.java @@ -202,7 +202,7 @@ public class VisCarryStuffController extends BaseController { //发送企微信息 try { - visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); +// visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); } catch (Exception e) { log.error("出门证申请add-sendWeCom异常：", e); throw new ServiceException("系统异常，请重新提交或联系管理员！"); @@ -308,10 +308,10 @@ public class VisCarryStuffController extends BaseController { //发送企微信息 try { - visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); +// visitorController.sendWeCom(people.getPhone(), url + " --访客姓名：" + vo.getName()); } catch (Exception e) { log.error("出门证申请add-sendWeCom异常：", e); - throw new ServiceException("系统异常，请重新提交或联系管理员！"); + throw new ServiceException("系统异常，请重新审核或联系管理员！"); } //审核拒绝 @@ -320,9 +320,10 @@ public class VisCarryStuffController extends BaseController { visVisitorExamineService.insertVisVisitorExamine(examine); try { - visitorController.sendWeCom(telephone, vo.getName() + "的访客审核已驳回"); +// visitorController.sendWeCom(telephone, vo.getName() + "的访客审核已驳回"); } catch (Exception e) { log.error("访客approve-sendWeCom驳回异常", e); + throw new ServiceException("系统异常，请重新审核或联系管理员！"); } // 申请人发送短信（审核不通过） SysPeople sysPeople1 = sysPeopleService.selectSysPeopleById(stuffVo.getUserId()); diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java index 80d7148..b1092a0 100644 --- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java +++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java @@ -1580,6 +1580,14 @@ public class VisitorController extends BaseController { return AjaxResult.success(); } + + @PostMapping("/test") + public AjaxResult test(@RequestBody JSONObject js) throws Exception { + String code = js.getString("code"); + String template = js.getString("template"); + return sendMessage("15155304840", code, template); + } + /** * 查询访客记录列表 * diff --git a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysEmpowerRecordMapper.xml b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysEmpowerRecordMapper.xml index 4218163..b86c4e3 100644 --- a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysEmpowerRecordMapper.xml +++ b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysEmpowerRecordMapper.xml @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ser.name like concat('%', #{name}, '%') - and ser.people_id = #{peopleId} + and ser.people_id = #{peopleId} and p.name like concat('%', #{peopleName}, '%') and ser.info_down = #{infoDown} and ser.empower = #{empower} diff --git a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysPeopleMapper.xml b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysPeopleMapper.xml index 3838fd9..00a6c76 100644 --- a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysPeopleMapper.xml +++ b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysPeopleMapper.xml @@ -139,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" join_time, down, del_flag, + carry_stuff_examine, #{name}, @@ -163,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{joinTime}, #{down}, #{delFlag}, + #{carryStuffExamine}, @@ -192,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" down = #{down}, del_flag = #{delFlag}, openid = #{openid}, + carry_stuff_examine = #{carryStuffExamine}, where id = #{id}