From d877cf557db5452093087fabb4479a10497ee218 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 二月 2022 18:25:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 96 insertions(+), 12 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 b4222f2..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
@@ -1,33 +1,117 @@
package com.sandu.ximon.admin.service;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.param.LampPsotPrerm;
+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.LightAdjust;
import com.sandu.ximon.dao.mapper.LampMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import javax.print.attribute.standard.PrinterURI;
+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 void addLampMission(LampPsotPrerm lampPsotPrerm){
- LampMission lampMission=new LampMission();
- lampMission.setUserName(SecurityUtils.getUsername());
- lampMission.setWeeks(lampPsotPrerm.getWeeks());
- lampMission.setInitial(lampPsotPrerm.getInitial());
- lampMission.setOffTime(lampPsotPrerm.getOffTime());
- lampMission.setOnTime(lampPsotPrerm.getOnTime());
- if(lampPsotPrerm.getAdjusts()!=null){
- lampMission.setAdjusts(lampPsotPrerm.getAdjusts());
+ 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());
+ 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();
+ lightAdjust.setId(lampMission.getId());
+ lightAdjust.setMissionId(lampMission.getId());
+ lightAdjust.setAdjustTime(adjust.getAdjustTime());
+ lightAdjust.setLuminance(adjust.getLuminance());
+ missions.add(lightAdjust);
+ }
+ b = lightAdjustService.saveBatch(missions);
+
+ // lampMission.setAdjusts(MissionParam.getAdjusts());
}
- save(lampMission);
+
+ if (MissionParam.getAdjusts() != null) {
+ return b;
+ } else {
+ return b1;
+ }
+ }
+
+
+ public boolean updateLampMission(Long id, MissionParam MissionParam) {
+ LampMission byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("鏈壘鍒拌鐏潌");
+ }
+ 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());
+ 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);
+ }
+
+ if (MissionParam.getAdjusts() != null) {
+ return b;
+ } else {
+ return b1;
+ }
+
}
+ public boolean deleteMission(Long id) {
+ LampMission byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("鏈壘鍒拌鐏潌");
+ }
+ boolean removeById = removeById(id);
+ if(removeById){
+ return lightAdjustService.deleteByMissionId(id);
+ }
+ return removeById(id);
+ }
+
}
--
Gitblit v1.9.3