fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/dto/PSnapDto.java
@@ -27,7 +27,11 @@ private String tags ; private Date snapTime; private Double weight = 0.0; private String name; private Date time; private String imgName;
@@ -13,6 +13,7 @@ import com.fzzy.igds.app.v1.util.PhoneRespUtil; import com.fzzy.igds.app.v1.util.PhoneUtil; import com.fzzy.igds.service.SysDeptService; import com.fzzy.igds.utils.Base64Util; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysDept; @@ -121,8 +122,8 @@ AsyncManager.me().execute(AsyncFactory.recordLogininfor(param.getUsername(), Constants.LOGIN_FAIL, MessageUtils.message("user.blocked"))); throw new UserBlockedException(); } passwordService.validate(user, param.getPassword()); String password = Base64Util.decodeBase64Password(param.getPassword()); passwordService.validate(user, password); AsyncManager.me().execute(AsyncFactory.recordLogininfor(param.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); PUserDto phoneUserDto = new PUserDto(); fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5108.java
@@ -11,12 +11,13 @@ import com.fzzy.igds.app.v1.dto.PSnapDto; import com.fzzy.igds.app.v1.service.PhoneService; import com.fzzy.igds.app.v1.util.PhoneRespUtil; import com.fzzy.igds.domain.Dept; import com.fzzy.igds.domain.PatrolRecord; import com.fzzy.igds.domain.SnapRecord; import com.fzzy.igds.domain.*; import com.fzzy.igds.mapper.SnapRecordMapper; import com.fzzy.igds.mapper.WeighbridgeSnapMapper; import com.fzzy.igds.service.CoreDeptService; import com.fzzy.igds.service.FileService; import com.fzzy.igds.service.InoutConfService; import com.fzzy.igds.service.SecCameraService; import com.fzzy.igds.utils.ContextUtil; import com.fzzy.igds.utils.DateUtil; import org.apache.commons.lang3.StringUtils; @@ -29,6 +30,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; /** * @Author: YYC @@ -39,9 +41,11 @@ public class ServiceImpl5108 implements PhoneService { @Resource private SnapRecordMapper snapRecordMapper; private WeighbridgeSnapMapper weighbridgeSnapMapper; @Resource private CoreDeptService deptService; @Resource private InoutConfService inoutConfService; @Override @@ -64,22 +68,31 @@ if (null == param.getDateTime()) { return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！"); } QueryWrapper<SnapRecord> queryWrapper = new QueryWrapper<>(); QueryWrapper<WeighbridgeSnap> queryWrapper = new QueryWrapper<>(); param.setCompanyId(ContextUtil.getCompanyId()); queryWrapper.eq("company_id", param.getCompanyId()); queryWrapper.likeRight("dept_id", param.getDeptId()); queryWrapper.ge("snap_time", DateUtil.getCurZero(param.getDateTime())); queryWrapper.le("snap_time", DateUtil.getNextZero(param.getDateTime())); queryWrapper.ge("time", DateUtil.getCurZero(param.getDateTime())); queryWrapper.le("time", DateUtil.getNextZero(param.getDateTime())); List<SnapRecord> list = snapRecordMapper.selectList(queryWrapper); List<WeighbridgeSnap> list = weighbridgeSnapMapper.selectList(queryWrapper); PSnapDto snapDto; Dept dept; List<PSnapDto> snapDtoList = new ArrayList<>(); for (SnapRecord snapRecord:list){ List<InoutConf> collect; //获取监控设备 List<InoutConf> inoutConfs = inoutConfService.getInoutConfList(ContextUtil.getCompanyId(), param.getDeptId()); for (WeighbridgeSnap weighbridgeSnap : list) { snapDto = new PSnapDto(); BeanUtils.copyProperties(snapRecord,snapDto); dept = deptService.getDeptById(snapRecord.getDeptId()); BeanUtils.copyProperties(weighbridgeSnap, snapDto); //映射监控设备名称 collect = inoutConfs.stream().filter(camera -> camera.getId().equals(weighbridgeSnap.getSerId())).collect(Collectors.toList()); if (!collect.isEmpty()) { snapDto.setCameraId(collect.get(0).getName()); } dept = deptService.getDeptById(weighbridgeSnap.getDeptId()); snapDto.setDeptName(dept.getKqmc()); snapDtoList.add(snapDto); } fzzy-igdss-inte/src/main/java/com/fzzy/igds/app/v1/service/impl/ServiceImpl5109.java
@@ -12,7 +12,9 @@ import com.fzzy.igds.app.v1.util.PhoneRespUtil; import com.fzzy.igds.domain.PatrolRecord; import com.fzzy.igds.domain.SnapRecord; import com.fzzy.igds.domain.WeighbridgeSnap; import com.fzzy.igds.mapper.SnapRecordMapper; import com.fzzy.igds.mapper.WeighbridgeSnapMapper; import com.fzzy.igds.service.FileService; import com.ruoyi.common.config.FrameworkConfig; import org.apache.commons.lang3.StringUtils; @@ -29,7 +31,7 @@ public class ServiceImpl5109 implements PhoneService { @Resource private SnapRecordMapper snapRecordMapper; private WeighbridgeSnapMapper weighbridgeSnapMapper; @Resource private FileService fileService; @@ -50,11 +52,11 @@ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！"); } param.setCompanyId(authUser.getCompanyId()); SnapRecord snapRecord = snapRecordMapper.selectById(param.getId()); if (StringUtils.isNotEmpty(snapRecord.getImgName())) { String imgData = Base64Util.getImageStr(snapRecord.getImgName().replace("/profile/", FrameworkConfig.getProfile())); snapRecord.setImgName(imgData); WeighbridgeSnap weighbridgeSnap = weighbridgeSnapMapper.selectById(param.getId()); if (StringUtils.isNotEmpty(weighbridgeSnap.getImgName())) { String imgData = Base64Util.getImageStr(weighbridgeSnap.getImgName().replace("/profile/", FrameworkConfig.getProfile())); weighbridgeSnap.setImgName(imgData); } return PhoneRespUtil.success(snapRecord, req); return PhoneRespUtil.success(weighbridgeSnap, req); } }
