功能完善

liuhaonan

2021-12-09 2eebce8ec8841d701614f0bee65c601ce335b9f9

功能完善

 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;


}

 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;

}

 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 {


 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;
}

 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> {

}

 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> {
}

 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>

 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>

 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());
    }

}

 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
    }
}

 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;

}

 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;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/security/SecurityUtils.java

@@ -111,6 +111,10 @@
        }
    }

    /**
     * èŽ·å–客户账号的id
     * @return
     */
    public static Long getClientId() {
        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
        if (AdministratorEnums.CUSTOMER.getCode().equals(administratorIdentity)) {

 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);

    }


}

 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> {

}

 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);
    }



}

 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));
    }
}

 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;



}