From b73b4a8ef0567c834d26b6bdb4801b3f5b01fdf6 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 三月 2022 13:49:08 +0800
Subject: [PATCH] 功能完善
---
/dev/null | 18 ------------------
ximon-admin/src/main/resources/application.yml | 3 +++
ximon-admin/pom.xml | 5 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/InitAmqpListener.java | 23 +++++++++++++++--------
ximon-admin/src/main/resources/application-test.yml | 4 ++++
5 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java
deleted file mode 100644
index f5e5894..0000000
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.sandu.ximon.dao.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sandu.common.mybatis.JsonIntegerArrayTypeHandler;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Data
-public class LampMission implements Serializable {
-
- @TableId(type = IdType.AUTO)
- private Long id;
-
- private Long userId;
-
- /*浠诲姟鎵ц澶╂暟*/
- @TableField(typeHandler = JsonIntegerArrayTypeHandler.class)
- private Integer[] weeks;
-
- //浜害
- private Double initial;
-
- /** 寮�鐏椂闂� */
- // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
- private LocalDateTime onTime;
-
-
- /** 鍏崇伅鏃堕棿 */
- // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
- private LocalDateTime offTime;
-
- /**
- * 浜害璋冭妭
- */
- // private List<LightAdjust> adjusts;
-
-
-}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightAdjust.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LightAdjust.java
deleted file mode 100644
index ffa4cae..0000000
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightAdjust.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.sandu.ximon.dao.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class LightAdjust {
-
-
- @TableId(type = IdType.AUTO)
- private Long id;
-
- private Long missionId;
-
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
- private LocalDateTime adjustTime;
-
- private double luminance;
-}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LampMissionMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LampMissionMapper.java
deleted file mode 100644
index 66d212c..0000000
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LampMissionMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.sandu.ximon.dao.mapper;
-
-import com.sandu.common.domain.BaseMapper;
-import com.sandu.ximon.dao.domain.LampMission;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface LampMissionMapper extends BaseMapper<LampMission> {
-}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightAdjustMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightAdjustMapper.java
deleted file mode 100644
index c8b2eb1..0000000
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightAdjustMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.sandu.ximon.dao.mapper;
-
-import com.sandu.common.domain.BaseMapper;
-import com.sandu.ximon.dao.domain.LightAdjust;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface LightAdjustMapper extends BaseMapper<LightAdjust> {
-}
diff --git a/dao/src/main/resources/mapper/LampCountMapper.xml b/dao/src/main/resources/mapper/LampCountMapper.xml
deleted file mode 100644
index bb4ab6b..0000000
--- a/dao/src/main/resources/mapper/LampCountMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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.LampCountMapper">
- <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LampCount">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="count" column="count" jdbcType="INTEGER"/>
- </resultMap>
-</mapper>
\ No newline at end of file
diff --git a/dao/src/main/resources/mapper/LampMissionMapper.xml b/dao/src/main/resources/mapper/LampMissionMapper.xml
deleted file mode 100644
index fbea2ae..0000000
--- a/dao/src/main/resources/mapper/LampMissionMapper.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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.LampMissionMapper">
- <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LampMission">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="userId" column="user_id" jdbcType="BIGINT"/>
- <result property="weeks" column="weeks" typeHandler="com.sandu.common.mybatis.JsonStringArrayTypeHandler"/>
- <result property="initial" column="initial" jdbcType="DOUBLE"/>
- <result property="onTime" column="on_time" jdbcType="TIMESTAMP"/>
- <result property="offTime" column="off_time" jdbcType="TIMESTAMP"/>
- <!-- <collection property="adjusts" resultMap="com.sandu.ximon.dao.mapper.LightAdjustMapper.BaseResultMap"/>-->
- </resultMap>
-</mapper>
\ No newline at end of file
diff --git a/dao/src/main/resources/mapper/LightAdjustMapper.xml b/dao/src/main/resources/mapper/LightAdjustMapper.xml
deleted file mode 100644
index f0b4456..0000000
--- a/dao/src/main/resources/mapper/LightAdjustMapper.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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.LightAdjustMapper">
- <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightAdjust">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <id property="missionId" column="mission_id" jdbcType="BIGINT"/>
- <result property="adjustTime" column="adjust_time" jdbcType="TIMESTAMP"/>
- <result property="luminance" column="luminance" jdbcType="DOUBLE"/>
- </resultMap>
-</mapper>
\ No newline at end of file
diff --git a/ximon-admin/pom.xml b/ximon-admin/pom.xml
index a6f69ac..41af58b 100644
--- a/ximon-admin/pom.xml
+++ b/ximon-admin/pom.xml
@@ -52,6 +52,11 @@
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.13.1</version>
</dependency>
+ <dependency>
+ <groupId>com.alipay.sdk</groupId>
+ <artifactId>alipay-sdk-java</artifactId>
+ <version>4.17.9.ALL</version>
+ </dependency>
<!--闃块噷浜戠墿鑱旂綉 -->
</dependencies>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/InitAmqpListener.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/InitAmqpListener.java
index ce8a8ad..51a5ae4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/InitAmqpListener.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/InitAmqpListener.java
@@ -1,6 +1,8 @@
package com.sandu.ximon.admin.manager.iot.amqp;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -10,15 +12,20 @@
* @date 2021/12/2 17:45
*/
@Component
-@AllArgsConstructor
+//@AllArgsConstructor
public class InitAmqpListener {
- private final MqttMainBoardConfig mqttMainBoardConfig;
+ @Autowired
+ private MqttMainBoardConfig mqttMainBoardConfig;
+ @Value("${listenter.isOpen}")
+ private boolean isOpen;
-// @PostConstruct
-// public void initListener() throws Exception {
-// new AmqpClient(
-// mqttMainBoardConfig
-// ).execute();
-// }
+ @PostConstruct
+ public void initListener() throws Exception {
+ if (isOpen) {
+ new AmqpClient(
+ mqttMainBoardConfig
+ ).execute();
+ }
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/MissionParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/MissionParam.java
deleted file mode 100644
index c3452ea..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/MissionParam.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.sandu.ximon.admin.param;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sandu.ximon.dao.domain.LightAdjust;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Data
-public class MissionParam implements Serializable {
-
-
-
-
- @NotEmpty
- private Integer[] weeks;
-
- //浜害
- @NotNull
- private Double initial;
-
- /** 寮�鐏椂闂� */
- @NotNull
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
- //@JsonFormat(pattern = " HH:mm")
- private LocalDateTime onTime;
-
-
- /** 鍏崇伅鏃堕棿 */
- @NotNull
- //@JsonFormat(pattern = " HH:mm")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
- //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
- private LocalDateTime offTime;
-
- /**
- * 浜害璋冭妭
- */
- private List<LightAdjust> adjusts;
-
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/CountSet.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/CountSet.java
deleted file mode 100644
index 9f8da02..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/CountSet.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.sandu.ximon.admin.security;
-
-import com.sandu.ximon.admin.service.LampCountService;
-import com.sandu.ximon.dao.domain.LampCount;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-@Component
-@Slf4j
-@AllArgsConstructor
-@EnableScheduling
-@Service
-public class CountSet {
- private final LampCountService lampCountService;
-
- public String aVoid() {
- //LampCount one = getOne(Wrappers.lambdaQuery(LampCount.class));//
- LampCount one= lampCountService.list().get(0);
- int count=one.getCount();
- String number =null;
- DateFormat df = new SimpleDateFormat("yy");
- DateFormat df1 = new SimpleDateFormat("MM");
- DateFormat df2 = new SimpleDateFormat("dd");
- String formattedDate = df.format(Calendar.getInstance().getTime());
- String formattedDate1 = df1.format(Calendar.getInstance().getTime());
- String formattedDate2 = df2.format(Calendar.getInstance().getTime());
- if(count<10){
- number="000"+count;
- }else if(count>10&&count<100){
- number="00"+count;
- }else if(count>100&&count<1000){
- number="0"+count;
- }
- // formattedDate+formattedDate1+formattedDate2+count
- System.out.println(formattedDate+formattedDate1+formattedDate2+number);
-
- count++;
- one.setCount(count);
- lampCountService.updateById(one);
-
- return formattedDate+formattedDate1+formattedDate2+number;
-
- }
- @Scheduled(cron = "0 0 0 * * ?")
- public void reSetCount(){
- //LampCount one = getOne(Wrappers.lambdaQuery(LampCount.class));
- LampCount one= lampCountService.list().get(0);
- one.setCount(4);
- lampCountService.updateById(one);
- }
-
-
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampCountService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampCountService.java
deleted file mode 100644
index dcc239c..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampCountService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-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.LampCount;
-import com.sandu.ximon.dao.mapper.LampCountMapper;
-import lombok.Data;
-import org.springframework.stereotype.Service;
-
-/**
- * 鐏潌璁℃暟浣跨敤
- */
-@Service
-@Data
-/**
- * 宸插純鐢�
- */
-public class LampCountService extends BaseServiceImpl<LampCountMapper, LampCount> {
-
- /* public LampCount findCount(){
- LampCount one = getOne(Wrappers.lambdaQuery(LampCount.class));
- return one;
- }*/
-}
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
deleted file mode 100644
index 064cd59..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java
+++ /dev/null
@@ -1,117 +0,0 @@
-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.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 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 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());
- }
-
- 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);
- }
-
-
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
deleted file mode 100644
index b4b4183..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package com.sandu.ximon.admin.service;
-
-import com.aliyuncs.iot.model.v20180120.BatchGetDeviceStateResponse;
-import com.aliyuncs.iot.model.v20180120.QueryDeviceDetailResponse;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sandu.common.execption.BusinessException;
-import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
-import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
-import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.A1TernaryCodeReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightResetReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.EmptyRequestInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1DeviceMacRespInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1TernaryCodeRespInnerFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A1OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A2OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
-import com.sandu.ximon.admin.param.LampPostParam;
-import com.sandu.ximon.admin.security.CountSet;
-import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.domain.LampCount;
-import com.sandu.ximon.dao.domain.LampPost;
-import com.sandu.ximon.dao.enums.AdministratorEnums;
-import com.sandu.ximon.dao.enums.LampPostTypeEnums;
-import com.sandu.ximon.dao.mapper.ClientMapper;
-import com.sandu.ximon.dao.mapper.LampPostMapper;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 宸插純鐢�
- */
-@Service
-@Slf4j
-@AllArgsConstructor
-public class LampPostService extends BaseServiceImpl<LampPostMapper, LampPost> {
- private final CountSet countSet;
- private final LampCountService lampCountService;
- private final ClientMapper clientMapper;
- private final LampPostMapper lampPostMapper;
-
- public boolean addLamp(LampPostParam lampPostParam) {
- LampPost lampPost = new LampPost();
- // lampPost.setId(snowflake.nextId());
- Long userId = SecurityUtils.getUserId();
- if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getClientId())){
- lampPost.setUserId(userId);
- }
- boolean save=true;
- lampPost.setLampId(countSet.aVoid());
- lampPost.setName(lampPostParam.getName());
- lampPost.setAddress(lampPostParam.getAddress());
- if (lampPostParam.getBelongsClient() != null) {
- Long clientId = clientMapper.findClientIdByName(lampPostParam.getBelongsClient());
- lampPost.setBelongsClient(lampPostParam.getBelongsClient());
- lampPost.setClientId(clientId);
- }
- lampPost.setState(1);
- /* if (lampPostParam.getMacCode() == null) {
- lampPost.setMacCode("铏氭嫙鐏潌");
- } else {
- lampPost.setMacCode(lampPostParam.getMacCode());
- }*/
-
- if(LampPostTypeEnums.ENTITY_LIGHT_POLE.getCode().equals(lampPostParam.getDeviceType())){
- String baseMac = "baseDevice";
- A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac, a1Frame);
- if(commonFrame == null){
- throw new BusinessException("璇诲彇璁惧鍞竴ID澶辫触");
- }
- A1DeviceMacRespInnerFrame a1DeviceMacRespInnerFrame = new A1DeviceMacRespInnerFrame().transformFrame(commonFrame.getPayload());
- log.info(commonFrame.toString());
- String uniqueMac = a1DeviceMacRespInnerFrame.getMac();
- uniqueMac = uniqueMac.toLowerCase();
- log.info("鍞竴鐮亄}",uniqueMac);
-
- // 2 浠庨樋閲屾敞鍐�
- MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);
-
- // 3 鑾峰彇璁惧璇︽儏
- QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
- if(deviceDetail == null){
- throw new BusinessException("娉ㄥ唽澶辫触");
- }
- log.info(deviceDetail.toString());
-
- // 4 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey()))
- .orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
- A1TernaryCodeRespInnerFrame responseInnerFrame = productKeyResp.getResponseInnerFrame();
- if(!MainBoardInvokeSyncService.getInstance().getProductKey().equals(responseInnerFrame.getTernaryCode())){
- throw new BusinessException("璁惧閰嶇疆ProductKey澶辫触");
- }
-
- // 5 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
- .orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
- A1TernaryCodeRespInnerFrame deviceNameFrame = responseCommonFrame.getResponseInnerFrame();
- if(!uniqueMac.equals(deviceNameFrame.getTernaryCode())){
- throw new BusinessException("璁惧閰嶇疆鍚嶅け璐�");
- }
-
- // 6 閰嶇疆Mac鈶�
- WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
- .orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build(),
- A1TernaryCodeRespInnerFrame.class);
- A1TernaryCodeRespInnerFrame deviceSecretFrame = wrapResponseCommonFrame.getResponseInnerFrame();
- if (!deviceDetail.getDeviceSecret().equals(deviceSecretFrame.getTernaryCode())) {
- throw new BusinessException("璁惧瀵嗛挜澶辫触");
- }
-
-
- // 7 閲嶅惎璁惧 骞朵娇鐢ㄦ柊鐨凪ac
- CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(baseMac,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
- if ("00".equals(rebootFrame.getPayload())) {
- lampPost.setMacCode(uniqueMac);
-
- save= save(lampPost);
-
- System.out.println("閲嶅惎鎴愬姛");
- }
- }/*else if(LampPostTypeEnums.VIRTUAL_LIGHT_POLE.getCode().equals(lampPostParam.getDeviceType())){lampPost.setMacCode(uniqueMac);
-
- }*/
-
- save= save(lampPost);
-
-
- //boolean save = save(lampPost);
-
- if (!save) {
- LampCount lampCount = lampCountService.list().get(0);
- lampCount.setCount(lampCount.getCount() - 1);
- lampCountService.updateById(lampCount);
- }
-
- return save;
-
- }
-
- public boolean updateLamp(Long id, LampPostParam lampPostParam) {
- LampPost lampPost = new LampPost();
- LampPost byId = getById(id);
- if (byId == null) {
- throw new BusinessException("鏈壘鍒拌鐏潌");
- }
- lampPost.setId(id);
- lampPost.setName(lampPostParam.getName());
- lampPost.setAddress(lampPostParam.getAddress());
- if (lampPostParam.getBelongsClient() != null) {
- Long clientId = clientMapper.findClientIdByName(lampPostParam.getBelongsClient());
- lampPost.setBelongsClient(lampPostParam.getBelongsClient());
- lampPost.setClientId(clientId);
- }
- /* if (lampPostParam.getMacCode() == null) {
- lampPost.setMacCode("铏氭嫙鐏潌");
- } else {
- lampPost.setMacCode(lampPostParam.getMacCode());
- }*/
- return updateById(lampPost);
- }
-
-
- /**
- * 鍒犻櫎鐏潌
- * @param id
- * @return
- */
- public boolean deleteLampPost(Long id){
- LampPost byId = getById(id);
- if (byId == null) {
- throw new BusinessException("鏈壘鍒拌鐏潌");
- }
- return removeById(id);
- }
-
-
- /**
- * @param group
- * @param Id 缂栬緫鍒嗙粍--閫夋嫨鐏潌
- */
-
- public void setGroup(String group, List<Long> Id) {
- // List<LampPost> update=new ArrayList<>();
- for (Long id : Id
- ) {
- lampPostMapper.serGroup(group, id);
-
- }
-
- // return updateBatchById(update);
- }
-
- public List<LampPost> listLamp() {
- List<LampPost> list = lampPostMapper.listLamp();
- // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class));
- return list;
-
- }
-
- public List<LampPost> queryStates() {
- // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
- List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class));
- List<String> MacCodes = new ArrayList<>();
-
- for (LampPost post : list) {
- MacCodes.add(post.getMacCode());
- }
- List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(MacCodes);
- for (LampPost post : list) {
- for (BatchGetDeviceStateResponse.DeviceStatus deviceStatus : deviceStatuses) {
- if(post.getMacCode().equals(deviceStatus.getDeviceName())){
- post.setOnLineState(deviceStatus.getStatus());
- }
- }
- // MacCodes.add(post.getMacCode());
- }
-
-
- return list;
- }
-
- public boolean LightReset(Long id){
- LampPost byId = getById(id);
- String deviceName = byId.getMacCode();
- if (byId == null) {
- throw new BusinessException("鏈壘鍒拌鐏潌");
- }
- if(byId.getMacCode().isEmpty()){
- throw new BusinessException("璇ョ伅鏉哅ca涓虹┖");
- }
- IRequestFrame build = FrameBuilder.builderA5()
- .orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode())
- .innerFrame(new A5LightResetReqInnerFrame())
- .build();
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName, build);
- System.out.println(commonFrame.toString());
- CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
- if ("00".equals(rebootFrame.getPayload())) {
- System.out.println("閲嶅惎鎴愬姛");
- }
-
- CommonFrame result = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(deviceName,
- FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
- .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
-
- boolean b=false;
- if ("00".equals(result.getPayload())) {
- byId.setMacCode(null);
- b = updateById(byId);
- System.out.println("閲嶅惎鎴愬姛");
- }
- return b;
- }
-
-
-
-
-
-
-}
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
deleted file mode 100644
index 053b5a1..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightAdjustService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-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;
-import org.springframework.stereotype.Service;
-
-/**
- * 璺伅瀹氭椂浠诲姟绫�
- */
-@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/resources/application-test.yml b/ximon-admin/src/main/resources/application-test.yml
index a509e4c..38eff74 100644
--- a/ximon-admin/src/main/resources/application-test.yml
+++ b/ximon-admin/src/main/resources/application-test.yml
@@ -36,4 +36,8 @@
quartz:
enable: true
+listenter:
+ isOpen: false
+
+
diff --git a/ximon-admin/src/main/resources/application.yml b/ximon-admin/src/main/resources/application.yml
index b1e9486..d1e6dc2 100644
--- a/ximon-admin/src/main/resources/application.yml
+++ b/ximon-admin/src/main/resources/application.yml
@@ -47,5 +47,8 @@
apkUrl: http://47.106.172.9:443/apk/
lcdUrl: http://47.106.172.9:443/download/lcd/
+server-conf:
+ ip: 47.106.172.9 # 47.106.172.9/101.132.131.91
+
--
Gitblit v1.9.3