From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 15:51:13 +0800
Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index 401cd20..56546b7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -23,6 +23,7 @@
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
+import enumeration.ErrorType;
import lombok.RequiredArgsConstructor;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils;
@@ -65,14 +66,16 @@
// 鏂板杩愮淮浜哄憳璐﹀彿
SysUser sysUser = new SysUser();
sysUser.setDeptId(null);
+ sysUser.setUnitId(entity.getId());
sysUser.setUserName(entity.getUnitAdminAccount());
sysUser.setNickName(entity.getUnitContact());
sysUser.setPhonenumber(entity.getUnitContactPhone());
- sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
+ sysUser.setPassword(SecurityUtils.encryptPassword(form.getPassword()));
+ sysUser.setDelFlag(0);
sysUserMapper.insertUser(sysUser);
// 鑾峰彇杩愮淮浜哄憳瑙掕壊
SysRole sysRole = sysRoleMapper.selectRoleByKey("yw_user");
- if (Objects.isNull(sysRole)) { return Result.error("杩愮淮瑙掕壊涓嶅瓨鍦�"); }
+ if (Objects.isNull(sysRole)) { throw new RuntimeException("杩愮淮瑙掕壊涓嶅瓨鍦�"); }
// 缁戝畾璐﹀彿瑙掕壊鍏崇郴
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(sysRole.getRoleId());
@@ -214,8 +217,38 @@
@Override
public Result workList(DistributeWorkOrderQuery query) {
- List<YwUnitVO> entities = baseMapper.workList(query);
- return Result.ok().data(entities);
+ if(query.getStart()!=null) {
+ query.setStart(DateUtils.getDayStart(query.getStart()));
+ }
+ if(query.getEnd()!=null) {
+ query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ }
+ if (query.getErrorType() != null) {
+ List<String> errorTypeList = new ArrayList<>();
+ errorTypeList.add(query.getErrorType());
+ if (ErrorType.ABNORMAL_PIC.getValue().equals(query.getErrorType())) {
+ //List娣诲姞涔嬪墠鍑犵宸ュ崟绫诲瀷
+ errorTypeList.add(ErrorType.SIGNAL_LOSS.getValue());
+ errorTypeList.add(ErrorType.SCREEN_COLOR_DEVIATION.getValue());
+ errorTypeList.add(ErrorType.SNOW_STORM.getValue());
+ errorTypeList.add(ErrorType.STRIPE_INTERFERENCE.getValue());
+ errorTypeList.add(ErrorType.SCREEN_OCCLUSION.getValue());
+ errorTypeList.add(ErrorType.ABNORMAL_CLARITY.getValue());
+ }
+ query.setErrorTypeList(errorTypeList);
+ }
+ List<YwUnit> ywUnits = baseMapper.selectList(null);
+ List<YwUnitVO> lists = ywUnits.stream().map(item -> {
+ YwUnitVO vo = new YwUnitVO();
+ BeanUtils.copyProperties(item, vo);
+ return vo;
+ }).collect(Collectors.toList());
+ for (YwUnitVO ywUnit : lists) {
+ query.setUnitId(ywUnit.getId());
+ Integer workOrderNum = baseMapper.workList(query);
+ ywUnit.setWorkOrderCount(workOrderNum);
+ }
+ return Result.ok().data(lists);
}
@Override
--
Gitblit v1.8.0