From 2eebce8ec8841d701614f0bee65c601ce335b9f9 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 09 十二月 2021 15:36:48 +0800
Subject: [PATCH] 功能完善
---
dao/src/main/java/com/sandu/ximon/dao/mapper/LEDMapper.java | 11 +
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgram.java | 43 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 50 ++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDService.java | 11 +
dao/src/main/resources/mapper/LEDMapper.xml | 19 ++
dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java | 5
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightAdjustService.java | 5
ximon-admin/src/main/java/com/sandu/ximon/admin/service/SingleLampDataService.java | 18 ++
dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampFault.java | 44 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java | 81 ++++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java | 8
dao/src/main/java/com/sandu/ximon/dao/domain/LED.java | 37 +++-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampMissionController.java | 1
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 66 ++++++++
dao/src/main/java/com/sandu/ximon/dao/mapper/LEDProgramMapper.java | 9 +
dao/src/main/resources/mapper/LEDProgramMapper.xml | 17 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java | 29 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java | 4
18 files changed, 418 insertions(+), 40 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LED.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LED.java
index cb79ca8..3749730 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LED.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LED.java
@@ -2,12 +2,15 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
@Data
+
+@TableName(value = "led")
public class LED implements Serializable {
@TableId(type = IdType.AUTO)
@@ -15,25 +18,39 @@
private Long userId;
- /*绉嶇被*/
- private String kind;
+ /**
+ * 绉嶇被 0:N 1:S
+ */
+ private Integer kind;
- /*鍨嬪彿*/
- private String size;
+ /*鏉垮崱鍙�*/
+ private String cardNo;
/*鍚嶇О*/
- private String name;
+ // private String name;
- /*鏈哄櫒鐮�*/
- private String macId;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0:鍦ㄧ嚎 1:绂荤嚎
+ */
+ private Integer state;
- /*鐘舵��*/
- private String state;
+ /*鎵�灞炵伅鏉�*/
+ private String blongsLamp;
+
+ /*IP鍦板潃*/
+ private String ip;
+
+ /*澶囨敞*/
+ private String remark;
/*鐏潌ID*/
- private Long lampId;
+ private String lampId;
+ /*鍒涘缓鏃堕棿*/
private LocalDateTime createTime;
+ /*鏈�杩戜氦浜掓椂闂�*/
+ private LocalDateTime updateTime;
+
}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgram.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgram.java
new file mode 100644
index 0000000..ef139d6
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgram.java
@@ -0,0 +1,43 @@
+package com.sandu.ximon.dao.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * LED鑺傜洰鍒楄〃
+ */
+@Data
+@TableName(value = "led_program")
+public class LEDProgram implements Serializable {
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ private Long userId;
+
+ /*鑺傜洰鍚嶇О*/
+ private String name;
+
+ /*澶у皬*/
+ private Double size;
+
+ /*灏哄*/
+ private String pixel;
+
+ /**
+ * 閫傜敤鍨嬪彿 0:N 1:S
+ */
+ private Integer kind;
+
+
+ private String programUel;
+
+
+ private LocalDateTime createTime;
+
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java
index 4a84001..b33f057 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampData.java
@@ -7,6 +7,11 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+
+/**
+ * 鍗曠伅鏁版嵁
+ */
+
@Data
public class SingleLampData implements Serializable {
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampFault.java b/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampFault.java
new file mode 100644
index 0000000..63ecc16
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/SingleLampFault.java
@@ -0,0 +1,44 @@
+package com.sandu.ximon.dao.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 鍗曠伅鏁呴殰 ---------------------/澶ф鍙笉瑕�
+ */
+@Data
+public class SingleLampFault implements Serializable {
+
+ private Long id;
+
+ private Long userId;
+
+ private String lampName;
+
+ /*甯傜數鐢垫祦*/
+ private Double mainsCurrent;
+
+ /*甯傜數鐢靛帇*/
+ private Double mainsVoltage;
+
+ /*璁惧娓╁害*/
+ private Double temperature;
+
+ /*鍔熺巼鍥犳暟*/
+ private Double powerFactor;
+
+ /*鏈夊姛鍔熺巼*/
+ private Integer activePower;
+
+ /*鏃犲姛鍔熺巼*/
+
+ private Integer reactivePower;
+
+ /*鐏潌浜害*/
+ private Double lightPoleBrightness;
+
+ /*鏇存柊鏃堕棿*/
+ private LocalDateTime updateTime;
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LEDMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LEDMapper.java
new file mode 100644
index 0000000..ea07bbd
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LEDMapper.java
@@ -0,0 +1,11 @@
+package com.sandu.ximon.dao.mapper;
+
+import com.sandu.common.domain.BaseMapper;
+import com.sandu.ximon.dao.domain.LED;
+import com.sandu.ximon.dao.domain.SingleLampData;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface LEDMapper extends BaseMapper<LED> {
+
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LEDProgramMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LEDProgramMapper.java
new file mode 100644
index 0000000..7649c5b
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LEDProgramMapper.java
@@ -0,0 +1,9 @@
+package com.sandu.ximon.dao.mapper;
+
+import com.sandu.common.domain.BaseMapper;
+import com.sandu.ximon.dao.domain.LEDProgram;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface LEDProgramMapper extends BaseMapper<LEDProgram> {
+}
diff --git a/dao/src/main/resources/mapper/LEDMapper.xml b/dao/src/main/resources/mapper/LEDMapper.xml
new file mode 100644
index 0000000..69d64d4
--- /dev/null
+++ b/dao/src/main/resources/mapper/LEDMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sandu.ximon.dao.mapper.LEDMapper">
+
+ <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LED">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <id property="userId" column="user_id" jdbcType="BIGINT"/>
+ <result property="kind" column="kind" jdbcType="INTEGER"/>
+ <result property="cardNo" column="card_no" jdbcType="VARCHAR"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="lampId" column="lamp_id" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/dao/src/main/resources/mapper/LEDProgramMapper.xml b/dao/src/main/resources/mapper/LEDProgramMapper.xml
new file mode 100644
index 0000000..b13c2d0
--- /dev/null
+++ b/dao/src/main/resources/mapper/LEDProgramMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sandu.ximon.dao.mapper.LEDProgramMapper">
+
+ <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LEDProgram">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <id property="userId" column="user_id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="size" column="size" jdbcType="DOUBLE"/>
+ <result property="pixel" column="pixel" jdbcType="VARCHAR"/>
+ <result property="kind" column="kind" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+</mapper>
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
new file mode 100644
index 0000000..c681f0a
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -0,0 +1,50 @@
+package com.sandu.ximon.admin.controller;
+
+import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
+import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.param.GroupParam;
+import com.sandu.ximon.admin.param.LEDProgramParam;
+import com.sandu.ximon.admin.param.LampPostParam;
+import com.sandu.ximon.admin.service.LEDProgramService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/v1/LEDProgram")
+public class LEDProgramController {
+ private final LEDProgramService ledProgramService;
+
+ @GetMapping("/add")
+ public ResponseVO<Object> addLEDProgram(@RequestBody LEDProgramParam ledProgramParam) {
+ return ResponseUtil.success(ledProgramService.addProgram(ledProgramParam));
+ }
+
+ @GetMapping("/update")
+ public ResponseVO<Object> updateLEDProgram( @RequestBody LEDProgramParam ledProgramParam) {
+ return ResponseUtil.success(ledProgramService.updateProgram(ledProgramParam));
+ }
+
+
+/* @PostMapping("/setGroup")
+ public ResponseVO<Object> setGroup(@RequestBody GroupParam groupParam){
+ lampPostService.setGroup(groupParam.getGroup(), groupParam.getId());
+ return ResponseUtil.success("鍒嗙粍璁剧疆鎴愬姛");
+ }*/
+
+ @GetMapping("/delete/{id}")
+ public ResponseVO<Object> deleteLEDProgram(@PathVariable Long id) {
+ return ResponseUtil.success(ledProgramService.deleteProgram(id));
+ }
+
+
+
+ @PostMapping("/list")
+ public ResponseVO<Object> listProgram() {
+ //List<LampPost> list = lampPostService.list();
+ return ResponseUtil.success(ledProgramService.list());
+ //return ResponseUtil.success(lampPostService.listLamp());
+ }
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampMissionController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampMissionController.java
index 0456b07..8cf4d88 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampMissionController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampMissionController.java
@@ -35,5 +35,6 @@
//List<LampPost> list = lampPostService.list();
// return ResponseUtil.success(list);
return ResponseUtil.success(lampMissionService.list());
+ // todo
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java
new file mode 100644
index 0000000..f6aad09
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java
@@ -0,0 +1,29 @@
+package com.sandu.ximon.admin.param;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class LEDProgramParam {
+
+
+
+ private Long id;
+
+ @NotNull
+ private String name;
+
+ @NotNull
+ private Integer kind;
+
+ /*澶у皬*/
+ private Double size;
+
+ /*灏哄*/
+ private String pixel;
+
+
+ private String programUrl;
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java
index 55fc06e..2b89ffb 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java
@@ -4,6 +4,10 @@
@Data
public class ReceiveParam {
- Long id;
- String name;
+
+ private Long id;
+
+ private String name;
+
+ private Integer kind;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
index 73f2063..fe93d63 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java
@@ -111,6 +111,10 @@
}
}
+ /**
+ * 鑾峰彇瀹㈡埛璐﹀彿鐨刬d
+ * @return
+ */
public static Long getClientId() {
Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
if (AdministratorEnums.CUSTOMER.getCode().equals(administratorIdentity)) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
new file mode 100644
index 0000000..7b3b92c
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -0,0 +1,66 @@
+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.LEDProgramParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.domain.LEDProgram;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.mapper.LEDProgramMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
+
+ private final LEDProgramMapper ledProgramMapper;
+
+ public boolean addProgram(LEDProgramParam receiveParam) {
+
+ LEDProgram led = new LEDProgram();
+ if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getClientId())) {
+ led.setUserId(SecurityUtils.getUserId());
+ }
+ led.setName(receiveParam.getName());
+ led.setKind(receiveParam.getKind());
+ return save(led);
+ }
+
+
+ public boolean updateProgram(LEDProgramParam receiveParam) {
+
+ LEDProgram byId = getById(receiveParam.getId());
+ if (byId == null) {
+ throw new BusinessException("鏈壘鍒拌鑺傜洰");
+ }
+
+ LEDProgram led = new LEDProgram();
+ led.setId(receiveParam.getId());
+ if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getClientId())) {
+ led.setUserId(SecurityUtils.getUserId());
+ }
+ led.setName(receiveParam.getName());
+ led.setKind(receiveParam.getKind());
+ if (receiveParam.getPixel() != null) {
+ led.setPixel(receiveParam.getPixel());
+ }
+ if (receiveParam.getSize() != null) {
+ led.setSize(receiveParam.getSize());
+ }
+ return updateById(led);
+ }
+
+
+ public boolean deleteProgram(Long id) {
+ LEDProgram byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("鏈壘鍒拌鑺傜洰");
+ }
+
+ return removeById(id);
+
+ }
+
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDService.java
new file mode 100644
index 0000000..1e866ce
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDService.java
@@ -0,0 +1,11 @@
+package com.sandu.ximon.admin.service;
+
+import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.dao.domain.LED;
+import com.sandu.ximon.dao.mapper.LEDMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LEDService extends BaseServiceImpl<LEDMapper, LED> {
+
+}
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 839450e..833956b 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,13 +2,10 @@
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;
@@ -20,70 +17,98 @@
@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(!AdministratorEnums.ADMIN.getCode().equals(administratorIdentity) ){
- 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 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);
}
-
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightAdjustService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightAdjustService.java
index 6098a62..120fd40 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightAdjustService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightAdjustService.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.dao.domain.LightAdjust;
import com.sandu.ximon.dao.mapper.LightAdjustMapper;
@@ -7,4 +8,8 @@
@Service
public class LightAdjustService extends BaseServiceImpl<LightAdjustMapper, LightAdjust> {
+
+ public boolean deleteByMissionId(Long mission) {
+ return remove(Wrappers.lambdaQuery(LightAdjust.class).eq(LightAdjust::getMissionId, mission));
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/SingleLampDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/SingleLampDataService.java
new file mode 100644
index 0000000..3daaf74
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/SingleLampDataService.java
@@ -0,0 +1,18 @@
+package com.sandu.ximon.admin.service;
+
+import com.sandu.common.domain.BaseMapper;
+import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.dao.domain.SingleLampData;
+import com.sandu.ximon.dao.mapper.SingleLampDataMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class SingleLampDataService extends BaseServiceImpl<SingleLampDataMapper, SingleLampData> {
+
+ private final SingleLampDataMapper singleLampDataMapper;
+
+
+
+}
--
Gitblit v1.9.3