From 6881da4400dba323d6e11a810de0571a7453cfd7 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 25 二月 2022 15:03:18 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java | 91 ++++++++++++++++++++++++++++++---------------
1 files changed, 60 insertions(+), 31 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 e1ea852..064cd59 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,11 +2,9 @@
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.mapper.LampMissionMapper;
import lombok.AllArgsConstructor;
@@ -15,74 +13,105 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * 宸插純鐢�
+ */
@Service
@AllArgsConstructor
public class LampMissionService extends BaseServiceImpl<LampMissionMapper, LampMission> {
private final LightAdjustService lightAdjustService;
+ // private final Snowflake snowflake;
- public boolean addLampMission(MissionParam MissionParam){
- LampMission lampMission=new LampMission();
- Long customerId = CustomerInspectContextHolder.getCustomerId();
- //lampMission.setId(SecurityUtils.getUserId());
- Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
- if(administratorIdentity==0){
- if(customerId==null){
-
- }
- } lampMission.setUserId(SecurityUtils.getUserId());
-
+ public boolean addLampMission(MissionParam MissionParam) {
+ LampMission lampMission = new LampMission();
+ Long clientId = SecurityUtils.getClientId();
+ // lampMission.setId(snowflake.nextId());
+ lampMission.setUserId(clientId);
lampMission.setWeeks(MissionParam.getWeeks());
lampMission.setInitial(MissionParam.getInitial());
lampMission.setOffTime(MissionParam.getOffTime());
lampMission.setOnTime(MissionParam.getOnTime());
- if(MissionParam.getAdjusts()!=null){
+ boolean b1 = save(lampMission);
+ // LampMission one = getOne(Wrappers.lambdaQuery(LampMission.class).last("limit 1"));
+ // Long id = one.getId();
+ boolean b = false;
+ 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();
+ // adjust.setId(lampMission.getId());
+ List<LightAdjust> missions = new ArrayList<>();
+ for (LightAdjust adjust : MissionParam.getAdjusts()
+ ) {
+ LightAdjust lightAdjust = new LightAdjust();
+ lightAdjust.setId(lampMission.getId());
lightAdjust.setMissionId(lampMission.getId());
lightAdjust.setAdjustTime(adjust.getAdjustTime());
lightAdjust.setLuminance(adjust.getLuminance());
missions.add(lightAdjust);
}
- lightAdjustService.saveBatch(missions);
+ b = lightAdjustService.saveBatch(missions);
- // lampMission.setAdjusts(MissionParam.getAdjusts());
+ // lampMission.setAdjusts(MissionParam.getAdjusts());
}
- return save(lampMission);
+ if (MissionParam.getAdjusts() != null) {
+ return b;
+ } else {
+ return b1;
+ }
}
- public boolean updateLampMission(Long id, MissionParam MissionParam){
+ public boolean updateLampMission(Long id, MissionParam MissionParam) {
LampMission byId = getById(id);
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}
- LampMission lampMission=new LampMission();
- lampMission.setUserId(SecurityUtils.getUserId());
+ LampMission lampMission = new LampMission();
+ Long clientId = SecurityUtils.getClientId();
+ lampMission.setUserId(clientId);
lampMission.setWeeks(MissionParam.getWeeks());
lampMission.setInitial(MissionParam.getInitial());
lampMission.setOffTime(MissionParam.getOffTime());
lampMission.setOnTime(MissionParam.getOnTime());
- if(MissionParam.getAdjusts()!=null){
- // lampMission.setAdjusts(MissionParam.getAdjusts());
+ boolean b1 = updateById(lampMission);
+ boolean b = false;
+ if (MissionParam.getAdjusts() != null) {
+ // lightAdjustService.deleteByMissionId(id);//鍒犻櫎鍘熷厛鐨勫畾鏃朵换鍔�
+ List<LightAdjust> missions = new ArrayList<>();
+ //璁剧疆鏂扮殑瀹氭椂浠诲姟
+ for (LightAdjust adjust : MissionParam.getAdjusts()
+ ) {
+ LightAdjust lightAdjust = new LightAdjust();
+ lightAdjust.setId(adjust.getId());
+ lightAdjust.setMissionId(id);
+ lightAdjust.setAdjustTime(adjust.getAdjustTime());
+ lightAdjust.setLuminance(adjust.getLuminance());
+ missions.add(lightAdjust);
+ }
+ b = lightAdjustService.updateBatchById(missions);
}
- return updateById(lampMission);
+ if (MissionParam.getAdjusts() != null) {
+ return b;
+ } else {
+ return b1;
+ }
+
+
}
- public boolean deleteMission(Long id){
+ public boolean deleteMission(Long id) {
LampMission byId = getById(id);
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鐏潌");
}
- return removeById(id);
+ boolean removeById = removeById(id);
+ if(removeById){
+ return lightAdjustService.deleteByMissionId(id);
+ }
+ return removeById(id);
}
-
}
--
Gitblit v1.9.3