From 603441b25ea31336bee85e8a81cff4e5495756b3 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 02 十二月 2021 16:24:07 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java
index ae5dc60..839450e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java
@@ -2,22 +2,35 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.context.CustomerInspectContextHolder;
import com.sandu.ximon.admin.param.MissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.LampMission;
import com.sandu.ximon.dao.domain.LampPost;
import com.sandu.ximon.dao.domain.LightAdjust;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.LampMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
@Service
@AllArgsConstructor
public class LampMissionService extends BaseServiceImpl<LampMissionMapper, LampMission> {
+ private final LightAdjustService lightAdjustService;
public boolean addLampMission(MissionParam MissionParam){
LampMission lampMission=new LampMission();
- lampMission.setId(SecurityUtils.getUserId());
+ //Long customerId = CustomerInspectContextHolder.getCustomerId();
+ //lampMission.setId(SecurityUtils.getUserId());
+ /* Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
+ if(!AdministratorEnums.ADMIN.getCode().equals(administratorIdentity) ){
+ lampMission.setUserId(SecurityUtils.getUserId());
+ }*/
+ Long clientId = SecurityUtils.getClientId();
+ lampMission.setUserId(clientId);
lampMission.setWeeks(MissionParam.getWeeks());
lampMission.setInitial(MissionParam.getInitial());
lampMission.setOffTime(MissionParam.getOffTime());
@@ -25,13 +38,16 @@
if(MissionParam.getAdjusts()!=null){
//LightAdjust adjust=new LightAdjust();
// adjust.setId(lampMission.getId());
+ List<LightAdjust> missions=new ArrayList<>();
for (LightAdjust adjust:MissionParam.getAdjusts()
) {
LightAdjust lightAdjust=new LightAdjust();
lightAdjust.setMissionId(lampMission.getId());
lightAdjust.setAdjustTime(adjust.getAdjustTime());
lightAdjust.setLuminance(adjust.getLuminance());
+ missions.add(lightAdjust);
}
+ lightAdjustService.saveBatch(missions);
// lampMission.setAdjusts(MissionParam.getAdjusts());
}
@@ -46,7 +62,8 @@
throw new BusinessException("鏈壘鍒拌鐏潌");
}
LampMission lampMission=new LampMission();
- lampMission.setId(SecurityUtils.getUserId());
+ Long clientId = SecurityUtils.getClientId();
+ lampMission.setUserId(clientId);
lampMission.setWeeks(MissionParam.getWeeks());
lampMission.setInitial(MissionParam.getInitial());
lampMission.setOffTime(MissionParam.getOffTime());
--
Gitblit v1.9.3