2021与蓝度共同重构项目,服务端
liuhaonan
2022-04-21 04194d1dc7a81b31121722cca64380714da04a07
首页
已修改4个文件
32 ■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
@@ -4,15 +4,18 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
/**
 * led广告屏主表
 *
 * @TableName pole_lightemit
 */
@TableName(value ="pole_lightemit")
@TableName(value = "pole_lightemit")
@Data
public class PoleLightemitEntity implements Serializable {
    /**
@@ -82,11 +85,15 @@
    /**
     * 绑定灯杆ID
     */
    @TableField(exist = false)
    private Long streetlightId;
    @JsonIgnore
    @TableField(exist = false)
    private Long poleId;
    /**
     *
     *
     */
    private LocalDateTime createTime;
@@ -99,10 +106,17 @@
    @TableField(exist = false)
    private Boolean isOpen;
 /*
    /*
     * 灯杆名称
     */
    @TableField(exist = false)
    private String streetlightName;
    /*
     * 灯杆名称
     */
    @JsonIgnore
    @TableField(exist = false)
    private String poleName;
}
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -194,6 +194,12 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, isOnLine);
        poleLightemitEntityList.forEach(
                led->{
                    led.setStreetlightId(led.getPoleId());
                    led.setStreetlightName(led.getPoleName());
                }
        );
        CommonPage commonPage = CommonPage.restPage(poleLightemitEntityList);
        int size = poleLightemitEntityList.size();
ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java
@@ -44,7 +44,7 @@
//        int total=(i1*3600+i2*60);
//        BigDecimal energySaving = BigDecimal.valueOf(((100-v1.getBrightness())/100)*totalTime/24);
//        BigDecimal energySaving =BigDecimal.valueOf((100-v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
        BigDecimal energySaving =new BigDecimal(100).subtract(BigDecimal.valueOf(v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
        BigDecimal energySaving =new BigDecimal(100).subtract(BigDecimal.valueOf(v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24),2);
        System.out.println(energySaving);
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -356,7 +356,7 @@
        BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
        BigDecimal totalTime = (hour.add(min));
        BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
        BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24),2);
        System.out.println(energySaving);
        return energySaving;
    }