fix

zhanzhiqin

2022-05-27 651222961dfc3566e9ab4fdca18de57c674ad701

fix

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

@@ -85,22 +85,23 @@
    private Long userId;

    /**
     * 绑定灯杆ID
     */

    @TableField(exist = false)
    private Long streetlightId;
    @JsonIgnore
    @TableField(exist = false)
    private Long poleId;

    /**
     *
     * 创建时间
     */
    private LocalDateTime createTime;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

    /**
     * 以下参数不存在数据库表
     */

    /**
     * 绑定灯杆ID
     */

    @TableField(exist = false)
    private Long streetlightId;

    /**
     * led屏幕开关
@@ -111,17 +112,10 @@
    @TableField(exist = false)
    private boolean isOnLine;

    /*
    /**
     * 灯杆名称
     */
    @TableField(exist = false)
    private String streetlightName;

    /*
     * 灯杆名称
     */
    @JsonIgnore
    @TableField(exist = false)
    private String poleName;

}

 dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml

@@ -37,8 +37,8 @@

    <select id="listLed" resultType="com.sandu.ximon.dao.domain.PoleLightemitEntity">
        SELECT
        t1.*, t2.pole_id,
        t3.pole_name , t3.id
        t1.*, t2.pole_id as streetlight_id,
        t3.pole_name  as streetlight_name, t3.id
        FROM
        pole_lightemit t1
        LEFT JOIN pole_binding t2 ON t1.lightemit_control_code = t2.device_code

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

@@ -191,8 +191,8 @@
            map.put("lightemitName", bean.getLightemitName());
            map.put("lightemitControlCode", bean.getLightemitControlCode());
            map.put("isOnLine", bean.isOnLine());
            map.put("streetlightId", bean.getPoleId());
            map.put("streetlightName", bean.getPoleName());
            map.put("streetlightId", bean.getStreetlightId());
            map.put("streetlightName", bean.getStreetlightName());
            mapList.add(map);
        }
        return ResponseUtil.success(mapList);

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

@@ -18,6 +18,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
@@ -239,18 +240,10 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, order, seq, isOnLine);
        poleLightemitEntityList.forEach(led -> {
            led.setStreetlightId(led.getPoleId());
            led.setStreetlightName(led.getPoleName());
        });

        CommonPage commonPage = CommonPage.restPage(poleLightemitEntityList);
        int size = poleLightemitEntityList.size();
        commonPage.setTotal((long) size);
        commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
        if (size % baseConditionVO.getPageSize() == 0) {
            commonPage.setTotalPage(size / baseConditionVO.getPageSize());
        }

        CommonPage commonPage = ListPagingUtils.pages(poleLightemitEntityList, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        return ResponseUtil.success(commonPage);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java

@@ -65,7 +65,7 @@
     * @param isOnLine
     * @return
     */
    public List<PoleLightemitEntity> listLed(String keyword,Integer order,Integer seq, boolean isOnLine) {
    public List<PoleLightemitEntity> listLed(String keyword, Integer order, Integer seq, boolean isOnLine) {
        List<PoleLightemitEntity> poleLightemitEntityList;
        //排序字段
        String orderByResult = "id";
@@ -105,9 +105,9 @@

        //超管
        if (SecurityUtils.getClientId() == null) {
            poleLightemitEntityList = poleLightemitDao.listLed(keyword, null,orderBy);
            poleLightemitEntityList = poleLightemitDao.listLed(keyword, null, orderBy);
        } else {
            poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(),orderBy);
            poleLightemitEntityList = poleLightemitDao.listLed(keyword, SecurityUtils.getUserId(), orderBy);
        }

        List<PoleLightemitEntity> temp = new ArrayList<>();
@@ -216,12 +216,12 @@
        boolean save = this.save(poleLightemit);
        // 绑定灯杆

        if (save && poleLightemit.getPoleId() != null) {
        if (save && poleLightemit.getStreetlightId() != null) {
            PoleBindingParam poleBindingParam = new PoleBindingParam();
            poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
            poleBindingParam.setDeviceType(1);
            poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
            poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
            poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
        }

        /**
@@ -252,7 +252,7 @@
        boolean b = this.updateById(poleLightemit);
        // 绑定灯杆

        if (b && poleLightemit.getPoleId() != null) {
        if (b && poleLightemit.getStreetlightId() != null) {
            //先删除绑定关系
            poleBindingService.unBindPole(null, poleLightemit.getLightemitControlCode());
            //再绑定
@@ -260,7 +260,7 @@
            poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
            poleBindingParam.setDeviceType(10);
            poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
            poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
            poleBindingService.bindPole(poleLightemit.getStreetlightId(), poleBindingParam);
        }

        /**