Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/device/DeviceManageEndpoint.java

@@ -375,11 +375,15 @@ public class DeviceManageEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping("findDmDeviceDict")
    @GetMapping("findDmDeviceDictName")
    @ApiOperation("查询设备名称以及型号")
    public ObjEnvelop findDmDeviceDict(){
    public ObjEnvelop findDmDeviceDictName(){
            return ObjEnvelop.getSuccess("查询成功",deviceManageService.findDmDeviceDict()) ;
            try{
                return ObjEnvelop.getSuccess("查询成功",deviceManageService.findDmDeviceDictName()) ;
            }catch (Exception e) {
                return failedObjEnvelopException2(e);
            }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/device/DeviceManageService.java

@@ -33,9 +33,9 @@ public class DeviceManageService extends BaseJpaService<DeviceDetail,DeviceDetai
    @Autowired
    private DeviceDao deviceDao;
    public JSONObject findDmDeviceDict() {
        String deviceNameSql = "select deviceName from wlyy_devices";
        String deviceModelSql = "select deviceModel from wlyy_devices";
    public JSONObject findDmDeviceDictName() {
        String deviceNameSql = "select name, id from dm_device";
        String deviceModelSql = "select model, id from dm_device";
        List<Map<String, Object>> deviceName = jdbcTemplate.queryForList(deviceNameSql);
        List<Map<String, Object>> deviceModel = jdbcTemplate.queryForList(deviceModelSql);