bug修复

liuhaonan

2022-03-14 b2c291bf6fef5f485330131354a3aea6aa58882c

bug修复

 dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java

@@ -85,9 +85,6 @@
    @TableField(exist = false)
    private Long streetlightId;

    @TableField(exist = false)
    private String poleName;

    /**
     * 
     */

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java

@@ -257,7 +257,7 @@
                                bind -> {
                                    if (bind.getDeviceCode() != null && led.getLightemitControlCode().equals(bind.getDeviceCode())) {
                                        led.setStreetlightId(bind.getPoleId());
                                        led.setPoleName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
                                        led.setStreetlightName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
                                    }
                                }
                        );

 ximon-admin/src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@
    password: Sandu.520.ifzdm # Redis服务器连接密码（默认为空）
    timeout: 300ms # 连接超时时间（毫秒）
server:
  port: 8080
  port: 20017
sandu:
  jwt:
    header: Authorization
@@ -36,4 +36,7 @@
  quartz:
    enable: true

listenter:
  isOpen: false



 ximon-admin/src/test/java/com/sandu/ximon/admin/tests/LedSFileControllerTests.java

@@ -1,8 +1,6 @@
package com.sandu.ximon.admin.tests;

import com.sandu.ximon.admin.base.BaseTest;
import com.sun.activation.registries.MailcapFile;
import org.junit.Test;

/**
 * @Author liuhaonan
@@ -10,8 +8,8 @@
 * @Version 1.0
 */
public class LedSFileControllerTests extends BaseTest {
    @Test
    public void testAdd() throws Exception {
        checkPost("/v1/xixun/file/add",new MailcapFile("aaa.jpg"));
    }
//    @Test
//    public void testAdd() throws Exception {
//        checkPost("/v1/xixun/file/add",new MailcapFile("aaa.jpg"));
//    }
}