zengh
2021-01-10 40c23616ca88b8d7224dbf3c6c8a12052f96389d
客户列表接口修改
5 files modified
35 ■■■■■ changed files
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml 26 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -111,7 +111,7 @@
                    strArrays += "'" + split[i] + "',";
                }
                String substring = strArrays.substring(0, strArrays.length() - 1);
                equipment.setDeviceNumber(substring);
                equipment.setDeviceName(substring);
                pages = equipmentService.selectEquipmentPage(equipment.getDeviceName(), equipment.getAddvcd(), equipment.getDtype(), equipment.getDevicestate());
            }
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.java
@@ -60,4 +60,5 @@
     */
    List<EquipmentVOS> selectList(String deviceType);
    EquipmentVOS selectInfo(Equipment equipment);
    List<Map<String, Object>> selectInfos(String deviceNumber);
}
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -175,4 +175,30 @@
        </if>
    </select>
    <select id="selectInfos" resultType="java.util.HashMap">
       SELECT
   dept.id,
   dept.deviceName,
   dept.deviceNumber,
   dept.deviceType,
   dept.ownership,
   dept.ownerId,
   dept.devicestate,
   dept.stime,
   ST_ASTEXT ( dept.coordinate ) AS coordinate,
   dept.dtype,
   dept.parent_id,
   dept.jd,
   dept.wd,
   dept.street AS streeName,
   u.yname,
   d.addvnm,
   dept.addvcd
FROM
   sys_equipment dept
   LEFT JOIN sys_suser u ON u.ynumber = dept.ownerId
   LEFT JOIN sys_district d ON d.addvcds = dept.addvcd
   LEFT JOIN sys_street s ON s.id = dept.street  WHERE  dept.deviceNumber=#{deviceNumber}
    </select>
</mapper>
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -57,6 +57,7 @@
    List<EquipmentVOS> lazyList(Long parentId, Map<String, Object> param);
    EquipmentVOS selectInfo(Equipment equipment);
    List<Map<String, Object>> selectInfos(String deviceNumber);
    /**
     * 设备列表
src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
@@ -87,6 +87,11 @@
    }
    @Override
    public List<Map<String, Object>>  selectInfos(String deviceNumber) {
        return baseMapper.selectInfos(deviceNumber);
    }
    @Override
    public List<EquipmentVOS> selectList(String deviceType) {
        return baseMapper.selectList(deviceType);
    }